diff --git a/core/net/llsec802154.h b/core/net/llsec802154.h index bd7bb79c3..1b814c4c1 100644 --- a/core/net/llsec802154.h +++ b/core/net/llsec802154.h @@ -53,7 +53,7 @@ #ifndef LLSEC802154_H_ #define LLSEC802154_H_ -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "net/ip/uip.h" #ifdef LLSEC802154_CONF_ENABLED diff --git a/core/net/mac/frame802154.c b/core/net/mac/framer/frame802154.c similarity index 99% rename from core/net/mac/frame802154.c rename to core/net/mac/framer/frame802154.c index 3b4cbb0c6..53b8a6fde 100644 --- a/core/net/mac/frame802154.c +++ b/core/net/mac/framer/frame802154.c @@ -64,7 +64,7 @@ */ #include "sys/cc.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "net/llsec802154.h" #include "net/linkaddr.h" #include diff --git a/core/net/mac/frame802154.h b/core/net/mac/framer/frame802154.h similarity index 100% rename from core/net/mac/frame802154.h rename to core/net/mac/framer/frame802154.h diff --git a/core/net/mac/frame802154e-ie.c b/core/net/mac/framer/frame802154e-ie.c similarity index 99% rename from core/net/mac/frame802154e-ie.c rename to core/net/mac/framer/frame802154e-ie.c index db0118889..8a06291ab 100644 --- a/core/net/mac/frame802154e-ie.c +++ b/core/net/mac/framer/frame802154e-ie.c @@ -38,7 +38,7 @@ */ #include -#include "net/mac/frame802154e-ie.h" +#include "net/mac/framer/frame802154e-ie.h" #define DEBUG DEBUG_NONE #include "net/net-debug.h" diff --git a/core/net/mac/frame802154e-ie.h b/core/net/mac/framer/frame802154e-ie.h similarity index 100% rename from core/net/mac/frame802154e-ie.h rename to core/net/mac/framer/frame802154e-ie.h diff --git a/core/net/mac/framer-802154.c b/core/net/mac/framer/framer-802154.c similarity index 99% rename from core/net/mac/framer-802154.c rename to core/net/mac/framer/framer-802154.c index 675384939..4276ba04d 100644 --- a/core/net/mac/framer-802154.c +++ b/core/net/mac/framer/framer-802154.c @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#include "net/mac/framer-802154.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/framer-802154.h" +#include "net/mac/framer/frame802154.h" #include "net/llsec802154.h" #include "net/packetbuf.h" #include "lib/random.h" diff --git a/core/net/mac/framer-802154.h b/core/net/mac/framer/framer-802154.h similarity index 98% rename from core/net/mac/framer-802154.h rename to core/net/mac/framer/framer-802154.h index fe4fced80..9999ca650 100644 --- a/core/net/mac/framer-802154.h +++ b/core/net/mac/framer/framer-802154.h @@ -39,7 +39,7 @@ #ifndef FRAMER_802154_H_ #define FRAMER_802154_H_ -#include "net/mac/framer.h" +#include "net/mac/framer/framer.h" extern const struct framer framer_802154; diff --git a/core/net/mac/framer-nullmac.c b/core/net/mac/framer/framer-nullmac.c similarity index 98% rename from core/net/mac/framer-nullmac.c rename to core/net/mac/framer/framer-nullmac.c index cc79051f1..353d36273 100644 --- a/core/net/mac/framer-nullmac.c +++ b/core/net/mac/framer/framer-nullmac.c @@ -36,7 +36,7 @@ * Joakim Eriksson */ -#include "net/mac/framer-nullmac.h" +#include "net/mac/framer/framer-nullmac.h" #include "net/packetbuf.h" #define DEBUG 0 diff --git a/core/net/mac/framer-nullmac.h b/core/net/mac/framer/framer-nullmac.h similarity index 98% rename from core/net/mac/framer-nullmac.h rename to core/net/mac/framer/framer-nullmac.h index b745393db..421f06471 100644 --- a/core/net/mac/framer-nullmac.h +++ b/core/net/mac/framer/framer-nullmac.h @@ -39,7 +39,7 @@ #ifndef FRAMER_NULLMAC_H_ #define FRAMER_NULLMAC_H_ -#include "net/mac/framer.h" +#include "net/mac/framer/framer.h" extern const struct framer framer_nullmac; diff --git a/core/net/mac/framer.h b/core/net/mac/framer/framer.h similarity index 100% rename from core/net/mac/framer.h rename to core/net/mac/framer/framer.h diff --git a/core/net/mac/nullrdc.c b/core/net/mac/nullrdc.c index aca98b654..56c524000 100644 --- a/core/net/mac/nullrdc.c +++ b/core/net/mac/nullrdc.c @@ -103,7 +103,7 @@ #endif /* NULLRDC_CONF_SEND_802154_ACK */ #if NULLRDC_SEND_802154_ACK -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #endif /* NULLRDC_SEND_802154_ACK */ #define ACK_LEN 3 diff --git a/core/net/mac/tsch/tsch-packet.c b/core/net/mac/tsch/tsch-packet.c index 875717b6d..da605d11c 100644 --- a/core/net/mac/tsch/tsch-packet.c +++ b/core/net/mac/tsch/tsch-packet.c @@ -46,8 +46,8 @@ #include "net/mac/tsch/tsch-schedule.h" #include "net/mac/tsch/tsch-security.h" #include "net/mac/tsch/tsch-log.h" -#include "net/mac/frame802154.h" -#include "net/mac/framer-802154.h" +#include "net/mac/framer/frame802154.h" +#include "net/mac/framer/framer-802154.h" #include "net/netstack.h" #include "lib/ccm-star.h" #include "lib/aes-128.h" diff --git a/core/net/mac/tsch/tsch-packet.h b/core/net/mac/tsch/tsch-packet.h index 4707b2543..63ea6d9ba 100644 --- a/core/net/mac/tsch/tsch-packet.h +++ b/core/net/mac/tsch/tsch-packet.h @@ -38,8 +38,8 @@ #include "contiki.h" #include "net/packetbuf.h" #include "net/mac/tsch/tsch-private.h" -#include "net/mac/frame802154.h" -#include "net/mac/frame802154e-ie.h" +#include "net/mac/framer/frame802154.h" +#include "net/mac/framer/frame802154e-ie.h" /******** Configuration *******/ diff --git a/core/net/mac/tsch/tsch-schedule.c b/core/net/mac/tsch/tsch-schedule.c index 0bb1355ae..e55a1e5af 100644 --- a/core/net/mac/tsch/tsch-schedule.c +++ b/core/net/mac/tsch/tsch-schedule.c @@ -50,7 +50,7 @@ #include "net/mac/tsch/tsch-packet.h" #include "net/mac/tsch/tsch-schedule.h" #include "net/mac/tsch/tsch-log.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "sys/process.h" #include "sys/rtimer.h" #include diff --git a/core/net/mac/tsch/tsch-security.c b/core/net/mac/tsch/tsch-security.c index d7df867f0..6d06450cf 100644 --- a/core/net/mac/tsch/tsch-security.c +++ b/core/net/mac/tsch/tsch-security.c @@ -44,8 +44,8 @@ #include "net/mac/tsch/tsch-schedule.h" #include "net/mac/tsch/tsch-security.h" #include "net/mac/tsch/tsch-log.h" -#include "net/mac/frame802154.h" -#include "net/mac/framer-802154.h" +#include "net/mac/framer/frame802154.h" +#include "net/mac/framer/framer-802154.h" #include "net/netstack.h" #include "net/packetbuf.h" #include "lib/ccm-star.h" diff --git a/core/net/mac/tsch/tsch-security.h b/core/net/mac/tsch/tsch-security.h index 50ab27173..b1e1d6f76 100644 --- a/core/net/mac/tsch/tsch-security.h +++ b/core/net/mac/tsch/tsch-security.h @@ -38,8 +38,8 @@ #include "contiki.h" #include "net/mac/tsch/tsch-asn.h" #include "net/mac/tsch/tsch-private.h" -#include "net/mac/frame802154.h" -#include "net/mac/frame802154e-ie.h" +#include "net/mac/framer/frame802154.h" +#include "net/mac/framer/frame802154e-ie.h" #include "net/llsec802154.h" /******** Configuration *******/ diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/core/net/mac/tsch/tsch-slot-operation.c index de7890731..653d665ad 100644 --- a/core/net/mac/tsch/tsch-slot-operation.c +++ b/core/net/mac/tsch/tsch-slot-operation.c @@ -45,7 +45,7 @@ #include "net/netstack.h" #include "net/packetbuf.h" #include "net/queuebuf.h" -#include "net/mac/framer-802154.h" +#include "net/mac/framer/framer-802154.h" #include "net/mac/tsch/tsch.h" #include "net/mac/tsch/tsch-slot-operation.h" #include "net/mac/tsch/tsch-queue.h" diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c index 852572f27..b1a2776b1 100644 --- a/core/net/mac/tsch/tsch.c +++ b/core/net/mac/tsch/tsch.c @@ -46,7 +46,7 @@ #include "net/packetbuf.h" #include "net/queuebuf.h" #include "net/nbr-table.h" -#include "net/mac/framer-802154.h" +#include "net/mac/framer/framer-802154.h" #include "net/mac/tsch/tsch.h" #include "net/mac/tsch/tsch-slot-operation.h" #include "net/mac/tsch/tsch-queue.h" diff --git a/core/net/netstack.h b/core/net/netstack.h index 188313441..3011138f1 100644 --- a/core/net/netstack.h +++ b/core/net/netstack.h @@ -85,7 +85,7 @@ #include "net/mac/mac.h" #include "net/mac/rdc.h" -#include "net/mac/framer.h" +#include "net/mac/framer/framer.h" #include "dev/radio.h" /** diff --git a/drivers/platform/cc2538dk/Makefile.cc2538dk b/drivers/platform/cc2538dk/Makefile.cc2538dk index 0650f29e9..0bb5794fc 100644 --- a/drivers/platform/cc2538dk/Makefile.cc2538dk +++ b/drivers/platform/cc2538dk/Makefile.cc2538dk @@ -19,7 +19,7 @@ CLEAN += *.cc2538dk CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538 include $(CONTIKI_CPU)/Makefile.cc2538 -MODULES += core/net core/net/mac +MODULES += core/net core/net/mac core/net/mac/framer PYTHON = python BSL_FLAGS += -e -w -v diff --git a/drivers/platform/cc2538dk/contiki-main.c b/drivers/platform/cc2538dk/contiki-main.c index ebb1e0e5f..119c2b336 100644 --- a/drivers/platform/cc2538dk/contiki-main.c +++ b/drivers/platform/cc2538dk/contiki-main.c @@ -62,7 +62,7 @@ #include "net/queuebuf.h" #include "net/ip/tcpip.h" #include "net/ip/uip.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "soc.h" #include "cpu.h" #include "reg.h" diff --git a/drivers/platform/cooja/Makefile.cooja b/drivers/platform/cooja/Makefile.cooja index d759b3e5d..b8ee9528d 100644 --- a/drivers/platform/cooja/Makefile.cooja +++ b/drivers/platform/cooja/Makefile.cooja @@ -74,8 +74,7 @@ CONTIKI_CPU=$(CONTIKI)/drivers/cpu/x86 CFLAGSNO = $(EXTRA_CC_ARGS) -Wall -g -I/usr/local/include -DCLASSNAME=$(CLASSNAME) CFLAGS += $(CFLAGSNO) -MODULES += core/net core/net/mac \ - core/net/ip64-addr +MODULES += core/net core/net/mac core/net/mac/framer core/net/ip64-addr ## Copied from Makefile.include, since Cooja overrides CFLAGS et al HAS_STACK = 0 diff --git a/drivers/platform/jn516x/Makefile.jn516x b/drivers/platform/jn516x/Makefile.jn516x index dd8e3fe21..fda8da217 100644 --- a/drivers/platform/jn516x/Makefile.jn516x +++ b/drivers/platform/jn516x/Makefile.jn516x @@ -143,8 +143,7 @@ endif CLEAN += *.jn516x CLEAN += *.jn516x.bin -MODULES += core/net \ - core/net/mac +MODULES += core/net core/net/mac core/net/mac/framer CONTIKI_TARGET_SOURCEFILES += $(ARCH) CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) diff --git a/drivers/platform/jn516x/dev/micromac-radio.c b/drivers/platform/jn516x/dev/micromac-radio.c index fb9fb1ec9..ed5c5881e 100644 --- a/drivers/platform/jn516x/dev/micromac-radio.c +++ b/drivers/platform/jn516x/dev/micromac-radio.c @@ -46,7 +46,7 @@ #include "sys/rtimer.h" #include "net/packetbuf.h" #include "net/netstack.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "lib/crc16.h" #include "lib/ringbufindex.h" diff --git a/drivers/platform/native/Makefile.native b/drivers/platform/native/Makefile.native index 7adfe22fc..328f0ca6d 100644 --- a/drivers/platform/native/Makefile.native +++ b/drivers/platform/native/Makefile.native @@ -42,4 +42,4 @@ CURSES_LIBS ?= -lncurses TARGET_LIBFILES += $(CURSES_LIBS) -MODULES+=core/net core/net/mac core/net/ip64-addr/ +MODULES+=core/net core/net/mac core/net/mac/framer core/net/ip64-addr/ diff --git a/drivers/platform/nrf52dk/Makefile.nrf52dk b/drivers/platform/nrf52dk/Makefile.nrf52dk index ddd867b24..2ec3e7db2 100644 --- a/drivers/platform/nrf52dk/Makefile.nrf52dk +++ b/drivers/platform/nrf52dk/Makefile.nrf52dk @@ -28,4 +28,4 @@ SMALL ?= 0 CONTIKI_CPU=$(CONTIKI)/drivers/cpu/nrf52832 include $(CONTIKI_CPU)/Makefile.nrf52832 -MODULES += core/net core/net/mac +MODULES += core/net core/net/mac core/net/mac/framer diff --git a/drivers/platform/openmote-cc2538/Makefile.openmote-cc2538 b/drivers/platform/openmote-cc2538/Makefile.openmote-cc2538 index 749df5a29..f9ee674f4 100644 --- a/drivers/platform/openmote-cc2538/Makefile.openmote-cc2538 +++ b/drivers/platform/openmote-cc2538/Makefile.openmote-cc2538 @@ -26,7 +26,7 @@ CLEAN += *.openmote-cc2538 CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538 include $(CONTIKI_CPU)/Makefile.cc2538 -MODULES += core/net core/net/mac +MODULES += core/net core/net/mac core/net/mac/framer PYTHON = python BSL_FLAGS += -e --bootloader-invert-lines -w -v -b 450000 diff --git a/drivers/platform/openmote-cc2538/contiki-main.c b/drivers/platform/openmote-cc2538/contiki-main.c index a15533cb9..28c6248f7 100644 --- a/drivers/platform/openmote-cc2538/contiki-main.c +++ b/drivers/platform/openmote-cc2538/contiki-main.c @@ -65,7 +65,7 @@ #include "net/queuebuf.h" #include "net/ip/tcpip.h" #include "net/ip/uip.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "soc.h" #include "cpu.h" #include "reg.h" diff --git a/drivers/platform/sky/Makefile.sky b/drivers/platform/sky/Makefile.sky index 0bf6c9743..67af65633 100644 --- a/drivers/platform/sky/Makefile.sky +++ b/drivers/platform/sky/Makefile.sky @@ -6,6 +6,5 @@ CONTIKI_TARGET_SOURCEFILES += contiki-sky-platform.c \ include $(CONTIKI)/drivers/platform/sky/Makefile.common -MODULES += core/net/mac \ - core/net \ +MODULES += core/net/mac core/net/mac/framer core/net \ drivers/dev/cc2420 drivers/dev/sht11 drivers/dev/ds2411 diff --git a/drivers/platform/sky/contiki-sky-main.c b/drivers/platform/sky/contiki-sky-main.c index f24e3a57e..2bc75e5b9 100644 --- a/drivers/platform/sky/contiki-sky-main.c +++ b/drivers/platform/sky/contiki-sky-main.c @@ -41,7 +41,7 @@ #include "dev/xmem.h" #include "lib/random.h" #include "net/netstack.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "net/queuebuf.h" #if NETSTACK_CONF_WITH_IPV6 diff --git a/drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx b/drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx index 5d27c2b30..761a4c14c 100644 --- a/drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx +++ b/drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx @@ -32,4 +32,4 @@ SMALL ?= 0 CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc26xx-cc13xx include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY) -MODULES += core/net core/net/mac +MODULES += core/net core/net/mac core/net/mac/framer diff --git a/drivers/platform/srf06-cc26xx/contiki-main.c b/drivers/platform/srf06-cc26xx/contiki-main.c index e2c32fb4e..bb9e50518 100644 --- a/drivers/platform/srf06-cc26xx/contiki-main.c +++ b/drivers/platform/srf06-cc26xx/contiki-main.c @@ -66,7 +66,7 @@ #include "lib/sensors.h" #include "button-sensor.h" #include "dev/serial-line.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "net/queuebuf.h" #include "driverlib/driverlib_release.h" diff --git a/drivers/platform/wismote/Makefile.wismote b/drivers/platform/wismote/Makefile.wismote index 58cc439ce..9ae237d05 100644 --- a/drivers/platform/wismote/Makefile.wismote +++ b/drivers/platform/wismote/Makefile.wismote @@ -46,5 +46,5 @@ endif %.upload-clean: %.hex msp430flasher -n msp430x5437 -w $< -v -z [VCC] -MODULES += core/net core/net/mac \ +MODULES += core/net core/net/mac core/net/mac/framer \ drivers/dev/cc2520 drivers/dev/sht11 diff --git a/drivers/platform/wismote/contiki-wismote-main.c b/drivers/platform/wismote/contiki-wismote-main.c index 565a13f9a..e8ef46617 100644 --- a/drivers/platform/wismote/contiki-wismote-main.c +++ b/drivers/platform/wismote/contiki-wismote-main.c @@ -43,7 +43,7 @@ #include "lib/random.h" #include "net/netstack.h" #include "net/queuebuf.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #if NETSTACK_CONF_WITH_IPV6 #include "net/ipv6/uip-ds6.h" diff --git a/drivers/platform/z1/Makefile.z1 b/drivers/platform/z1/Makefile.z1 index 19f41e0d3..6b387bf53 100644 --- a/drivers/platform/z1/Makefile.z1 +++ b/drivers/platform/z1/Makefile.z1 @@ -10,5 +10,5 @@ include $(CONTIKI)/drivers/platform/z1/Makefile.z1sp endif MODULES += core/net \ - core/net/mac \ + core/net/mac core/net/mac/framer \ drivers/dev/cc2420 diff --git a/drivers/platform/z1/contiki-z1-main.c b/drivers/platform/z1/contiki-z1-main.c index 4160bb97e..83e6a31b8 100644 --- a/drivers/platform/z1/contiki-z1-main.c +++ b/drivers/platform/z1/contiki-z1-main.c @@ -42,7 +42,7 @@ #include "dev/xmem.h" #include "lib/random.h" #include "net/netstack.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "net/queuebuf.h" #include "dev/adxl345.h" #include "sys/clock.h" diff --git a/drivers/platform/zoul/Makefile.zoul b/drivers/platform/zoul/Makefile.zoul index dcd1bf24b..95b35bf92 100644 --- a/drivers/platform/zoul/Makefile.zoul +++ b/drivers/platform/zoul/Makefile.zoul @@ -45,7 +45,7 @@ CLEAN += *.zoul CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538 include $(CONTIKI_CPU)/Makefile.cc2538 -MODULES += core/net core/net/mac core/net/ip \ +MODULES += core/net core/net/mac core/net/mac/framer core/net/ip \ drivers/dev/cc1200 ifeq ($(WITH_IP64),1) diff --git a/drivers/platform/zoul/contiki-main.c b/drivers/platform/zoul/contiki-main.c index 9a56a3243..75cc13d66 100644 --- a/drivers/platform/zoul/contiki-main.c +++ b/drivers/platform/zoul/contiki-main.c @@ -64,7 +64,7 @@ #include "net/queuebuf.h" #include "net/ip/tcpip.h" #include "net/ip/uip.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include "soc.h" #include "cpu.h" #include "reg.h" diff --git a/examples/ipv6/slip-radio/no-framer.c b/examples/ipv6/slip-radio/no-framer.c index 5758ea809..8d0ba9af4 100644 --- a/examples/ipv6/slip-radio/no-framer.c +++ b/examples/ipv6/slip-radio/no-framer.c @@ -35,8 +35,8 @@ * Niclas Finne * Joakim Eriksson */ -#include "net/mac/framer.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/framer.h" +#include "net/mac/framer/frame802154.h" #include "net/packetbuf.h" #include diff --git a/regression-tests/13-ieee802154/code/test-panid-handling.c b/regression-tests/13-ieee802154/code/test-panid-handling.c index 56647921a..b69334a84 100644 --- a/regression-tests/13-ieee802154/code/test-panid-handling.c +++ b/regression-tests/13-ieee802154/code/test-panid-handling.c @@ -31,7 +31,7 @@ #include "contiki.h" #include "unit-test.h" -#include "net/mac/frame802154.h" +#include "net/mac/framer/frame802154.h" #include