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

removed NETSTACK_CONF_MAC_OTHER

This commit is contained in:
Joakim Eriksson 2017-10-07 20:12:51 +02:00
parent 5d87cd1b5f
commit 40f189a3a3
7 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,9 +24,6 @@ CLEAN += *.nrf52dk
### Unless the example dictates otherwise, build with code size optimisations switched off ### Unless the example dictates otherwise, build with code size optimisations switched off
SMALL ?= 0 SMALL ?= 0
# Custom MAC layer for BLE (ble_ipsp_mac_driver)
MAKE_MAC = MAKE_MAC_OTHER
### Define the CPU directory and pull in the correct CPU makefile. ### Define the CPU directory and pull in the correct CPU makefile.
CONTIKI_CPU=$(CONTIKI)/arch/cpu/nrf52832 CONTIKI_CPU=$(CONTIKI)/arch/cpu/nrf52832
include $(CONTIKI_CPU)/Makefile.nrf52832 include $(CONTIKI_CPU)/Makefile.nrf52832

4
arch/platform/nrf52dk/contiki-conf.h
View File

@ -56,8 +56,8 @@
* @{ * @{
*/ */
/* Selected in netstack.h because our Makefile sets MAKE_MAC = MAKE_MAC_OTHER */ /* Select the BLE mac driver */
#define NETSTACK_CONF_OTHER_MAC ble_ipsp_mac_driver #define NETSTACK_CONF_MAC ble_ipsp_mac_driver
/* 6LoWPAN */ /* 6LoWPAN */
#define SICSLOWPAN_CONF_MAC_MAX_PAYLOAD 1280 #define SICSLOWPAN_CONF_MAC_MAX_PAYLOAD 1280

13
examples/ipv6/slip-radio/slip-net.c
View File

@ -94,10 +94,21 @@ slipnet_input(void)
/* printf("SUT: %u\n", uip_len); */ /* printf("SUT: %u\n", uip_len); */
slip_send_packet(uip_buf, uip_len); slip_send_packet(uip_buf, uip_len);
} }
static uint8_t
slipnet_output(const linkaddr_t *localdest)
{
/* do nothing... */
return 1;
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const struct network_driver slipnet_driver = { const struct network_driver slipnet_driver = {
"slipnet", "slipnet",
slipnet_init, slipnet_init,
slipnet_input slipnet_input,
/* output is likely never called - or at least not used as no IP packets
should be produced in slip-radio */
slipnet_output
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

3
examples/sensniff/Makefile
View File

@ -15,9 +15,6 @@ endif
### add more source files to the build or define make variables. ### add more source files to the build or define make variables.
-include $(TARGET)/Makefile.$(TARGET) -include $(TARGET)/Makefile.$(TARGET)
# Custom MAC layer for sensniff (sensniff_mac_driver)
MAKE_MAC = MAKE_MAC_OTHER
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
CONTIKI = ../.. CONTIKI = ../..

5
examples/sensniff/project-conf.h
View File

@ -32,8 +32,9 @@
#ifndef PROJECT_CONF_H_ #ifndef PROJECT_CONF_H_
#define PROJECT_CONF_H_ #define PROJECT_CONF_H_
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Selected in netstack.h because our Makefile sets MAKE_MAC = MAKE_MAC_OTHER */ /* Configure the sensniff_mac_driver for netstack.h */
#define NETSTACK_CONF_OTHER_MAC sensniff_mac_driver #undef NETSTACK_CONF_MAC
#define NETSTACK_CONF_MAC sensniff_mac_driver
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Include platform-specific header */ /* Include platform-specific header */
#include "target-conf.h" #include "target-conf.h"

3
tests/16-6tisch/code/Makefile
View File

@ -10,6 +10,5 @@ CFLAGS += -DSIXP_MSG_API_TEST=1
endif endif
CONTIKI = ../../.. CONTIKI = ../../..
# MAC layer is test_mac_driver
MAKE_MAC = MAKE_MAC_OTHER
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

6
tests/16-6tisch/code/project-conf.h
View File

@ -65,8 +65,8 @@
#undef IEEE802154_CONF_PANID #undef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0xabcd #define IEEE802154_CONF_PANID 0xabcd
/* Custom MAC layer, enabled via MAKE_MAC = MAKE_MAC_OTHER in the Makefile */ /* Custom MAC layer */
#undef NETSTACK_CONF_OTHER_MAC #undef NETSTACK_CONF_MAC
#define NETSTACK_CONF_OTHER_MAC test_mac_driver #define NETSTACK_CONF_MAC test_mac_driver
#endif /* __PROJECT_CONF_H__ */ #endif /* __PROJECT_CONF_H__ */