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

Added framer sub-directory to core/net/mac

Browse Source
This commit is contained in:
Simon Duquennoy 2017-05-16 18:20:34 +02:00
parent 3eefb4e10f
commit a980593bd6
40 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/net/llsec802154.h
View File

@ -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

2
core/net/mac/frame802154.c → core/net/mac/framer/frame802154.c
View File

@ -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 <string.h>

0
core/net/mac/frame802154.h → core/net/mac/framer/frame802154.h
View File

2
core/net/mac/frame802154e-ie.c → core/net/mac/framer/frame802154e-ie.c
View File

@ -38,7 +38,7 @@
*/
#include <string.h>
#include "net/mac/frame802154e-ie.h"
#include "net/mac/framer/frame802154e-ie.h"
#define DEBUG DEBUG_NONE
#include "net/net-debug.h"

0
core/net/mac/frame802154e-ie.h → core/net/mac/framer/frame802154e-ie.h
View File

4
core/net/mac/framer-802154.c → core/net/mac/framer/framer-802154.c
View File

@ -36,8 +36,8 @@
* Joakim Eriksson <joakime@sics.se>
*/
#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"

2
core/net/mac/framer-802154.h → core/net/mac/framer/framer-802154.h
View File

@ -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;

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

@ -36,7 +36,7 @@
* Joakim Eriksson <joakime@sics.se>
*/
#include "net/mac/framer-nullmac.h"
#include "net/mac/framer/framer-nullmac.h"
#include "net/packetbuf.h"
#define DEBUG 0

2
core/net/mac/framer-nullmac.h → core/net/mac/framer/framer-nullmac.h
View File

@ -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;

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

2
core/net/mac/nullrdc.c
View File

@ -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

4
core/net/mac/tsch/tsch-packet.c
View File

@ -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"

4
core/net/mac/tsch/tsch-packet.h
View File

@ -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 *******/

2
core/net/mac/tsch/tsch-schedule.c
View File

@ -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 <string.h>

4
core/net/mac/tsch/tsch-security.c
View File

@ -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"

4
core/net/mac/tsch/tsch-security.h
View File

@ -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 *******/

2
core/net/mac/tsch/tsch-slot-operation.c
View File

@ -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"

2
core/net/mac/tsch/tsch.c
View File

@ -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"

2
core/net/netstack.h
View File

@ -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"
/**

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

@ -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

2
drivers/platform/cc2538dk/contiki-main.c
View File

@ -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"

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

@ -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

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

@ -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)

2
drivers/platform/jn516x/dev/micromac-radio.c
View File

@ -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"

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

@ -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/

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

@ -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

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

@ -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

2
drivers/platform/openmote-cc2538/contiki-main.c
View File

@ -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"

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

@ -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

2
drivers/platform/sky/contiki-sky-main.c
View File

@ -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

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

@ -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

2
drivers/platform/srf06-cc26xx/contiki-main.c
View File

@ -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"

2
drivers/platform/wismote/Makefile.wismote
View File

@ -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

2
drivers/platform/wismote/contiki-wismote-main.c
View File

@ -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"

2
drivers/platform/z1/Makefile.z1
View File

@ -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

2
drivers/platform/z1/contiki-z1-main.c
View File

@ -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"

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

@ -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)

2
drivers/platform/zoul/contiki-main.c
View File

@ -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"

4
examples/ipv6/slip-radio/no-framer.c
View File

@ -35,8 +35,8 @@
* Niclas Finne <nfi@sics.se>
* Joakim Eriksson <joakime@sics.se>
*/
#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 <string.h>

2
regression-tests/13-ieee802154/code/test-panid-handling.c
View File

@ -31,7 +31,7 @@
#include "contiki.h"
#include "unit-test.h"
#include "net/mac/frame802154.h"
#include "net/mac/framer/frame802154.h"
#include <stdio.h>