Browse Source

drivers/cc110x: moved includes

let the driver follow the same structure than other drivers
for now: keeping 'private' includes in a local include folder
cc430
Hauke Petersen 7 years ago
parent
commit
aee4e564c0
  1. 3
      drivers/Makefile.include
  2. 6
      drivers/cc110x/cc110x-netdev2.c
  3. 8
      drivers/cc110x/cc110x-rxtx.c
  4. 6
      drivers/cc110x/cc110x-spi.c
  5. 10
      drivers/cc110x/cc110x.c
  6. 2
      drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c
  7. 0
      drivers/cc110x/include/cc110x-defaultsettings.h
  8. 0
      drivers/cc110x/include/cc110x-defines.h
  9. 0
      drivers/cc110x/include/cc110x-interface.h
  10. 0
      drivers/cc110x/include/cc110x-internal.h
  11. 0
      drivers/cc110x/include/cc110x-netdev2.h
  12. 0
      drivers/cc110x/include/cc110x-spi.h
  13. 2
      drivers/cc110x/include/gnrc_netdev2_cc110x.h
  14. 2
      drivers/include/cc110x.h

3
drivers/Makefile.include

@ -4,6 +4,9 @@ endif
ifneq (,$(filter at86rf2xx,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/drivers/at86rf2xx/include
endif
ifneq (,$(filter cc110x,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/drivers/cc110x/include
endif
ifneq (,$(filter kw2xrf,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/drivers/kw2xrf/include
endif

6
drivers/cc110x/cc110x-netdev2.c

@ -24,9 +24,9 @@
#include <errno.h>
#include "cc110x.h"
#include "cc110x/cc110x-netdev2.h"
#include "cc110x/cc110x-internal.h"
#include "cc110x/cc110x-interface.h"
#include "cc110x-netdev2.h"
#include "cc110x-internal.h"
#include "cc110x-interface.h"
#include "net/eui64.h"
#include "periph/cpuid.h"

8
drivers/cc110x/cc110x-rxtx.c

@ -24,10 +24,10 @@
#include <string.h>
#include "cc110x.h"
#include "cc110x/cc110x-spi.h"
#include "cc110x/cc110x-internal.h"
#include "cc110x/cc110x-interface.h"
#include "cc110x/cc110x-defines.h"
#include "cc110x-spi.h"
#include "cc110x-internal.h"
#include "cc110x-interface.h"
#include "cc110x-defines.h"
#include "periph/gpio.h"
#include "irq.h"

6
drivers/cc110x/cc110x-spi.c

@ -25,9 +25,9 @@
#include <stdio.h>
#include "cc110x.h"
#include "cc110x/cc110x-spi.h"
#include "cc110x/cc110x-internal.h"
#include "cc110x/cc110x-defines.h"
#include "cc110x-spi.h"
#include "cc110x-internal.h"
#include "cc110x-defines.h"
#include "periph/gpio.h"
#include "periph/spi.h"

10
drivers/cc110x/cc110x.c

@ -29,11 +29,11 @@
#include "log.h"
#include "cc110x.h"
#include "cc110x/cc110x-defaultsettings.h"
#include "cc110x/cc110x-defines.h"
#include "cc110x/cc110x-interface.h"
#include "cc110x/cc110x-internal.h"
#include "cc110x/cc110x-spi.h"
#include "cc110x-defaultsettings.h"
#include "cc110x-defines.h"
#include "cc110x-interface.h"
#include "cc110x-internal.h"
#include "cc110x-spi.h"
#define ENABLE_DEBUG (0)
#include "debug.h"

2
drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c

@ -13,7 +13,7 @@
#include "net/netdev2.h"
#include "net/gnrc.h"
#include "cc110x.h"
#include "cc110x/cc110x-netdev2.h"
#include "cc110x-netdev2.h"
#include "net/gnrc/gnrc_netdev2.h"
#include "od.h"

0
drivers/include/cc110x/cc110x-defaultsettings.h → drivers/cc110x/include/cc110x-defaultsettings.h

0
drivers/include/cc110x/cc110x-defines.h → drivers/cc110x/include/cc110x-defines.h

0
drivers/include/cc110x/cc110x-interface.h → drivers/cc110x/include/cc110x-interface.h

0
drivers/include/cc110x/cc110x-internal.h → drivers/cc110x/include/cc110x-internal.h

0
drivers/include/cc110x/cc110x-netdev2.h → drivers/cc110x/include/cc110x-netdev2.h

0
drivers/include/cc110x/cc110x-spi.h → drivers/cc110x/include/cc110x-spi.h

2
drivers/include/cc110x/gnrc_netdev2_cc110x.h → drivers/cc110x/include/gnrc_netdev2_cc110x.h

@ -17,7 +17,7 @@
*/
#include "net/gnrc/gnrc_netdev2.h"
#include "cc110x/cc110x-netdev2.h"
#include "cc110x-netdev2.h"
#ifndef GNRC_CC110X_H
#define GNRC_CC110X_H

2
drivers/include/cc110x.h

@ -26,7 +26,7 @@ extern "C" {
#include "periph/spi.h"
#include "periph/gpio.h"
#include "cc110x/cc110x-internal.h"
#include "cc110x-internal.h"
/**
* @brief Struct for holding cc110x IO parameters

Loading…
Cancel
Save