giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

All MAC layers as distinct modules

Browse Source
This commit is contained in:
Simon Duquennoy 2017-05-17 22:00:16 +02:00
parent 880e69f770
commit f79aa2174e
16 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/net/mac/csma-output.c → core/net/mac/csma/csma-output.c
View File

@ -39,7 +39,7 @@
* Simon Duquennoy <simon.duquennoy@ri.se>
*/
#include "net/mac/csma.h"
#include "net/mac/csma/csma.h"
#include "net/packetbuf.h"
#include "net/queuebuf.h"
#include "dev/watchdog.h"

0
core/net/mac/csma-output.h → core/net/mac/csma/csma-output.h
View File

4
core/net/mac/csma.c → core/net/mac/csma/csma.c
View File

@ -38,8 +38,8 @@
* Simon Duquennoy <simon.duquennoy@ri.se>
*/
#include "net/mac/csma.h"
#include "net/mac/csma-output.h"
#include "net/mac/csma/csma.h"
#include "net/mac/csma/csma-output.h"
#include "net/mac/mac-sequence.h"
#include "net/packetbuf.h"
#include "net/netstack.h"

0
core/net/mac/csma.h → core/net/mac/csma/csma.h
View File

2
core/net/mac/nullmac.c → core/net/mac/nullmac/nullmac.c
View File

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se>
*/
#include "net/mac/nullmac.h"
#include "net/mac/nullmac/nullmac.h"
#include "net/netstack.h"
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"

0
core/net/mac/nullmac.h → core/net/mac/nullmac/nullmac.h
View File

2
drivers/cpu/nrf52832/ble/ble-mac.c
View File

@ -44,7 +44,7 @@
#include "nrf_soc.h"
#include "iot_defines.h"
#include "net/mac/nullmac.h"
#include "net/mac/nullmac/nullmac.h"
#include "net/netstack.h"
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"

3
drivers/platform/cc2538dk/Makefile.cc2538dk
View File

@ -19,7 +19,8 @@ CLEAN += *.cc2538dk
CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net core/net/mac core/net/mac/framer
MODULES += core/net core/net/mac core/net/mac/framer \
core/net/mac/csma core/net/mac/nullmac
PYTHON = python
BSL_FLAGS += -e -w -v

3
drivers/platform/cooja/Makefile.cooja
View File

@ -74,7 +74,8 @@ 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/mac/framer core/net/ip64-addr
MODULES += core/net core/net/mac core/net/mac/framer core/net/ip64-addr \
core/net/mac/csma core/net/mac/nullmac
## Copied from Makefile.include, since Cooja overrides CFLAGS et al
HAS_STACK = 0

3
drivers/platform/jn516x/Makefile.jn516x
View File

@ -143,7 +143,8 @@ endif
CLEAN += *.jn516x
CLEAN += *.jn516x.bin
MODULES += core/net core/net/mac core/net/mac/framer
MODULES += core/net core/net/mac core/net/mac/framer \
core/net/mac/csma core/net/mac/nullmac
CONTIKI_TARGET_SOURCEFILES += $(ARCH)
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)

3
drivers/platform/native/Makefile.native
View File

@ -42,4 +42,5 @@ CURSES_LIBS ?= -lncurses
TARGET_LIBFILES += $(CURSES_LIBS)
MODULES+=core/net core/net/mac core/net/mac/framer core/net/ip64-addr/
MODULES+=core/net core/net/mac core/net/mac/framer core/net/ip64-addr/ \
core/net/mac/csma core/net/mac/nullmac

3
drivers/platform/nrf52dk/Makefile.nrf52dk
View File

@ -28,4 +28,5 @@ SMALL ?= 0
CONTIKI_CPU=$(CONTIKI)/drivers/cpu/nrf52832
include $(CONTIKI_CPU)/Makefile.nrf52832
MODULES += core/net core/net/mac core/net/mac/framer
MODULES += core/net core/net/mac core/net/mac/framer \
core/net/mac/csma core/net/mac/nullmac

3
drivers/platform/openmote-cc2538/Makefile.openmote-cc2538
View File

@ -26,7 +26,8 @@ CLEAN += *.openmote-cc2538
CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net core/net/mac core/net/mac/framer
MODULES += core/net core/net/mac core/net/mac/framer \
core/net/mac/csma core/net/mac/nullmac
PYTHON = python
BSL_FLAGS += -e --bootloader-invert-lines -w -v -b 450000

1
drivers/platform/sky/Makefile.sky
View File

@ -7,4 +7,5 @@ CONTIKI_TARGET_SOURCEFILES += contiki-sky-platform.c \
include $(CONTIKI)/drivers/platform/sky/Makefile.common
MODULES += core/net/mac core/net/mac/framer core/net \
core/net/mac/csma core/net/mac/nullmac \
drivers/dev/cc2420 drivers/dev/sht11 drivers/dev/ds2411

3
drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx
View File

@ -32,4 +32,5 @@ SMALL ?= 0
CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc26xx-cc13xx
include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
MODULES += core/net core/net/mac core/net/mac/framer
MODULES += core/net core/net/mac core/net/mac/framer \
core/net/mac/csma core/net/mac/nullmac

3
drivers/platform/zoul/Makefile.zoul
View File

@ -45,7 +45,8 @@ CLEAN += *.zoul
CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net core/net/mac core/net/mac/framer core/net/ip \
MODULES += core/net core/net/mac core/net/mac/framer \
core/net/mac/csma core/net/mac/nullmac \
drivers/dev/cc1200
ifeq ($(WITH_IP64),1)