From 0b805e4763af31e1f39803aaf93344bf2fd914ec Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Thu, 28 Nov 2013 14:04:34 +0100 Subject: [PATCH] Moved the cc2420 driver into a separate dev/cc2420 module --- apps/collect-view/collect-view-sky.c | 2 +- apps/collect-view/collect-view-z1.c | 2 +- apps/shell/shell-sky.c | 2 +- core/net/ipv4/uaodv.c | 2 +- cpu/avr/cc2420_spi.c | 2 +- cpu/msp430/cc2420-arch-sfd.c | 2 +- cpu/msp430/cc2420-arch.c | 2 +- {core/dev => dev/cc2420}/cc2420-aes.c | 4 ++-- {core/dev => dev/cc2420}/cc2420-aes.h | 0 {core/dev => dev/cc2420}/cc2420.c | 4 ++-- {core/dev => dev/cc2420}/cc2420.h | 2 +- {core/dev => dev/cc2420}/cc2420_const.h | 0 examples/ipv6/slip-radio/slip-radio-cc2420.c | 2 +- examples/sky-shell-exec/sky-shell-exec.c | 2 +- examples/sky/radio-test.c | 2 +- examples/sky/rssi-scanner.c | 4 ++-- examples/sky/sky-collect.c | 2 +- examples/z1/ipv6/z1-websense/z1-websense.c | 2 +- examples/z1/rssi_scanner/rssi-scanner.c | 4 ++-- platform/exp5438/cc2420-arch.c | 2 +- platform/exp5438/contiki-exp5438-main.c | 2 +- platform/micaz/dev/cc2420-arch.c | 2 +- platform/micaz/init-net.c | 2 +- platform/sky/contiki-sky-main.c | 2 +- platform/sky/dev/radio-sensor.c | 2 +- platform/z1/contiki-z1-main.c | 2 +- platform/z1/dev/cc2420-arch.c | 2 +- platform/z1/dev/radio-sensor.c | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) rename {core/dev => dev/cc2420}/cc2420-aes.c (98%) rename {core/dev => dev/cc2420}/cc2420-aes.h (100%) rename {core/dev => dev/cc2420}/cc2420.c (99%) rename {core/dev => dev/cc2420}/cc2420.h (99%) rename {core/dev => dev/cc2420}/cc2420_const.h (100%) diff --git a/apps/collect-view/collect-view-sky.c b/apps/collect-view/collect-view-sky.c index 0963b4725..1cb3dfa0b 100644 --- a/apps/collect-view/collect-view-sky.c +++ b/apps/collect-view/collect-view-sky.c @@ -1,5 +1,5 @@ #include "collect-view.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" #include "dev/light-sensor.h" #include "dev/battery-sensor.h" diff --git a/apps/collect-view/collect-view-z1.c b/apps/collect-view/collect-view-z1.c index 124ae00d5..b750eea57 100644 --- a/apps/collect-view/collect-view-z1.c +++ b/apps/collect-view/collect-view-z1.c @@ -1,5 +1,5 @@ #include "collect-view.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" #include "dev/i2cmaster.h" #include "dev/tmp102.h" diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c index 5230d9910..084961ae5 100644 --- a/apps/shell/shell-sky.c +++ b/apps/shell/shell-sky.c @@ -44,7 +44,7 @@ #include "net/rime.h" #include "net/netstack.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" #include "dev/sht11.h" #include "dev/light-sensor.h" diff --git a/core/net/ipv4/uaodv.c b/core/net/ipv4/uaodv.c index 1365da2c9..230709a61 100644 --- a/core/net/ipv4/uaodv.c +++ b/core/net/ipv4/uaodv.c @@ -48,7 +48,7 @@ #include "lib/assert.h" #ifdef CC2420_RADIO -#include "dev/cc2420.h" +#include "cc2420.h" #define RSSI_THRESHOLD -39 /* accept -39 ... xx */ #endif diff --git a/cpu/avr/cc2420_spi.c b/cpu/avr/cc2420_spi.c index bb9f86845..00156839f 100644 --- a/cpu/avr/cc2420_spi.c +++ b/cpu/avr/cc2420_spi.c @@ -34,7 +34,7 @@ #include "contiki-net.h" #include "dev/spi.h" -#include "dev/cc2420.h" +#include "cc2420.h" void __cc2420_arch_init(void) diff --git a/cpu/msp430/cc2420-arch-sfd.c b/cpu/msp430/cc2420-arch-sfd.c index a71015b9e..49c979ce2 100644 --- a/cpu/msp430/cc2420-arch-sfd.c +++ b/cpu/msp430/cc2420-arch-sfd.c @@ -30,7 +30,7 @@ #include "contiki.h" #include "dev/spi.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "isr_compat.h" extern volatile uint8_t cc2420_sfd_counter; diff --git a/cpu/msp430/cc2420-arch.c b/cpu/msp430/cc2420-arch.c index 7b429e0c0..7da8892a9 100644 --- a/cpu/msp430/cc2420-arch.c +++ b/cpu/msp430/cc2420-arch.c @@ -32,7 +32,7 @@ #include "contiki-net.h" #include "dev/spi.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "isr_compat.h" #ifdef CC2420_CONF_SFD_TIMESTAMPS diff --git a/core/dev/cc2420-aes.c b/dev/cc2420/cc2420-aes.c similarity index 98% rename from core/dev/cc2420-aes.c rename to dev/cc2420/cc2420-aes.c index 9e464c4af..3f0ad199c 100644 --- a/core/dev/cc2420-aes.c +++ b/dev/cc2420/cc2420-aes.c @@ -38,8 +38,8 @@ */ #include "contiki.h" -#include "dev/cc2420.h" -#include "dev/cc2420-aes.h" +#include "cc2420.h" +#include "cc2420-aes.h" #include "dev/spi.h" #define KEYLEN 16 diff --git a/core/dev/cc2420-aes.h b/dev/cc2420/cc2420-aes.h similarity index 100% rename from core/dev/cc2420-aes.h rename to dev/cc2420/cc2420-aes.h diff --git a/core/dev/cc2420.c b/dev/cc2420/cc2420.c similarity index 99% rename from core/dev/cc2420.c rename to dev/cc2420/cc2420.c index 63b0bbe9a..f3f1cc7cf 100644 --- a/core/dev/cc2420.c +++ b/dev/cc2420/cc2420.c @@ -43,8 +43,8 @@ #include "dev/leds.h" #include "dev/spi.h" -#include "dev/cc2420.h" -#include "dev/cc2420_const.h" +#include "cc2420.h" +#include "cc2420_const.h" #include "net/packetbuf.h" #include "net/rime/rimestats.h" diff --git a/core/dev/cc2420.h b/dev/cc2420/cc2420.h similarity index 99% rename from core/dev/cc2420.h rename to dev/cc2420/cc2420.h index 9fd09d88b..0aaacae27 100644 --- a/core/dev/cc2420.h +++ b/dev/cc2420/cc2420.h @@ -44,7 +44,7 @@ #include "contiki.h" #include "dev/spi.h" #include "dev/radio.h" -#include "dev/cc2420_const.h" +#include "cc2420_const.h" int cc2420_init(void); diff --git a/core/dev/cc2420_const.h b/dev/cc2420/cc2420_const.h similarity index 100% rename from core/dev/cc2420_const.h rename to dev/cc2420/cc2420_const.h diff --git a/examples/ipv6/slip-radio/slip-radio-cc2420.c b/examples/ipv6/slip-radio/slip-radio-cc2420.c index 7d7676e1f..f49e3c4e9 100644 --- a/examples/ipv6/slip-radio/slip-radio-cc2420.c +++ b/examples/ipv6/slip-radio/slip-radio-cc2420.c @@ -32,7 +32,7 @@ */ #include "contiki.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "cmd.h" #include diff --git a/examples/sky-shell-exec/sky-shell-exec.c b/examples/sky-shell-exec/sky-shell-exec.c index f1059f33a..dbafed346 100644 --- a/examples/sky-shell-exec/sky-shell-exec.c +++ b/examples/sky-shell-exec/sky-shell-exec.c @@ -37,7 +37,7 @@ #include "dev/watchdog.h" #include "net/rime.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" #include "dev/light.h" #include "dev/sht11.h" diff --git a/examples/sky/radio-test.c b/examples/sky/radio-test.c index 9d13ec447..4a8e05f66 100644 --- a/examples/sky/radio-test.c +++ b/examples/sky/radio-test.c @@ -47,7 +47,7 @@ #include "net/rime.h" #include "dev/leds.h" #include "dev/button-sensor.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include #include diff --git a/examples/sky/rssi-scanner.c b/examples/sky/rssi-scanner.c index bbc8b00f0..d3139f9c4 100644 --- a/examples/sky/rssi-scanner.c +++ b/examples/sky/rssi-scanner.c @@ -43,8 +43,8 @@ #include "net/netstack.h" #include "dev/leds.h" -#include "dev/cc2420.h" -#include "dev/cc2420_const.h" +#include "cc2420.h" +#include "cc2420_const.h" #include "dev/spi.h" #include diff --git a/examples/sky/sky-collect.c b/examples/sky/sky-collect.c index 5bcd1af8b..26d00a121 100644 --- a/examples/sky/sky-collect.c +++ b/examples/sky/sky-collect.c @@ -48,7 +48,7 @@ #include "dev/light-sensor.h" #include "dev/sht11-sensor.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include #include #include "contiki-net.h" diff --git a/examples/z1/ipv6/z1-websense/z1-websense.c b/examples/z1/ipv6/z1-websense/z1-websense.c index 0de72e69f..5e8bedb1e 100644 --- a/examples/z1/ipv6/z1-websense/z1-websense.c +++ b/examples/z1/ipv6/z1-websense/z1-websense.c @@ -43,7 +43,7 @@ #include "webserver-nogui.h" #include "dev/temperature-sensor.h" #include "dev/battery-sensor.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" #include diff --git a/examples/z1/rssi_scanner/rssi-scanner.c b/examples/z1/rssi_scanner/rssi-scanner.c index 77353a298..7cb1419c6 100644 --- a/examples/z1/rssi_scanner/rssi-scanner.c +++ b/examples/z1/rssi_scanner/rssi-scanner.c @@ -43,8 +43,8 @@ #include "net/netstack.h" #include "dev/leds.h" -#include "dev/cc2420.h" -#include "dev/cc2420_const.h" +#include "cc2420.h" +#include "cc2420_const.h" #include "dev/spi.h" #include diff --git a/platform/exp5438/cc2420-arch.c b/platform/exp5438/cc2420-arch.c index b1c586b16..d50878c78 100644 --- a/platform/exp5438/cc2420-arch.c +++ b/platform/exp5438/cc2420-arch.c @@ -33,7 +33,7 @@ #include "contiki-net.h" #include "dev/spi.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" #include "isr_compat.h" diff --git a/platform/exp5438/contiki-exp5438-main.c b/platform/exp5438/contiki-exp5438-main.c index ef532c1ab..62b6ebd6e 100644 --- a/platform/exp5438/contiki-exp5438-main.c +++ b/platform/exp5438/contiki-exp5438-main.c @@ -34,7 +34,7 @@ #include #include "dev/button-sensor.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/flash.h" #include "dev/leds.h" #include "dev/serial-line.h" diff --git a/platform/micaz/dev/cc2420-arch.c b/platform/micaz/dev/cc2420-arch.c index 7b8ae9be5..9a55e015d 100644 --- a/platform/micaz/dev/cc2420-arch.c +++ b/platform/micaz/dev/cc2420-arch.c @@ -38,7 +38,7 @@ #include "contiki-net.h" #include "dev/spi.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" void diff --git a/platform/micaz/init-net.c b/platform/micaz/init-net.c index ed1fadd7f..bb656c37c 100644 --- a/platform/micaz/init-net.c +++ b/platform/micaz/init-net.c @@ -43,7 +43,7 @@ #include #include "contiki.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/rs232.h" #include "dev/slip.h" #include "dev/leds.h" diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c index 9fea4e698..58e74770b 100644 --- a/platform/sky/contiki-sky-main.c +++ b/platform/sky/contiki-sky-main.c @@ -31,7 +31,7 @@ #include #include #include "contiki.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/ds2411.h" #include "dev/leds.h" #include "dev/serial-line.h" diff --git a/platform/sky/dev/radio-sensor.c b/platform/sky/dev/radio-sensor.c index 54cbfc7f1..cf2b60ec4 100644 --- a/platform/sky/dev/radio-sensor.c +++ b/platform/sky/dev/radio-sensor.c @@ -31,7 +31,7 @@ */ #include "lib/sensors.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/radio-sensor.h" const struct sensors_sensor radio_sensor; diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index c00a3b398..c619fa3f6 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -33,7 +33,7 @@ #include #include "contiki.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/leds.h" #include "dev/serial-line.h" #include "dev/slip.h" diff --git a/platform/z1/dev/cc2420-arch.c b/platform/z1/dev/cc2420-arch.c index 35994c12d..bc345e29f 100644 --- a/platform/z1/dev/cc2420-arch.c +++ b/platform/z1/dev/cc2420-arch.c @@ -31,7 +31,7 @@ #include "contiki.h" #include "contiki-net.h" #include "dev/spi.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "isr_compat.h" #ifndef CONF_SFD_TIMESTAMPS diff --git a/platform/z1/dev/radio-sensor.c b/platform/z1/dev/radio-sensor.c index 54cbfc7f1..cf2b60ec4 100644 --- a/platform/z1/dev/radio-sensor.c +++ b/platform/z1/dev/radio-sensor.c @@ -31,7 +31,7 @@ */ #include "lib/sensors.h" -#include "dev/cc2420.h" +#include "cc2420.h" #include "dev/radio-sensor.h" const struct sensors_sensor radio_sensor;