diff --git a/sys/auto_init/netif/auto_init_at86rf2xx.c b/sys/auto_init/netif/auto_init_at86rf2xx.c index da048a393f58a4996d8a9a869c10acb6cfc49124..e0b757767a84f5c24a3e49a4453f772c301f8903 100644 --- a/sys/auto_init/netif/auto_init_at86rf2xx.c +++ b/sys/auto_init/netif/auto_init_at86rf2xx.c @@ -35,7 +35,9 @@ * @{ */ #define AT86RF2XX_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT) -#define AT86RF2XX_MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#ifndef AT86RF2XX_MAC_PRIO +#define AT86RF2XX_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif #define AT86RF2XX_NUM (sizeof(at86rf2xx_params) / sizeof(at86rf2xx_params[0])) diff --git a/sys/auto_init/netif/auto_init_cc110x.c b/sys/auto_init/netif/auto_init_cc110x.c index 2ab1b6adc4b94276569300d840dbf1d8f0ab3f01..85fa847a84aa0ed959c64c342073d987e87e4321 100644 --- a/sys/auto_init/netif/auto_init_cc110x.c +++ b/sys/auto_init/netif/auto_init_cc110x.c @@ -35,7 +35,9 @@ * @{ */ #define CC110X_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT + DEBUG_EXTRA_STACKSIZE) -#define CC110X_MAC_PRIO (THREAD_PRIORITY_MAIN - 3) +#ifndef CC110X_MAC_PRIO +#define CC110X_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif #define CC110X_NUM (sizeof(cc110x_params)/sizeof(cc110x_params[0])) diff --git a/sys/auto_init/netif/auto_init_cc2420.c b/sys/auto_init/netif/auto_init_cc2420.c index 78f8de38786a7e74febbf31623ee5d9e35fb71bc..559a4b865846a8be7331f4e0b374c3fa50b413e8 100644 --- a/sys/auto_init/netif/auto_init_cc2420.c +++ b/sys/auto_init/netif/auto_init_cc2420.c @@ -37,7 +37,9 @@ * @{ */ #define CC2420_MAC_STACKSIZE (THREAD_STACKSIZE_MAIN) -#define CC2420_MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#ifndef CC2420_MAC_PRIO +#define CC2420_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif /** @} */ /** diff --git a/sys/auto_init/netif/auto_init_cc2538_rf.c b/sys/auto_init/netif/auto_init_cc2538_rf.c index 0ae9bfe7b5b6f9aeac5c330f8a82f5c2f04285f9..bb91ec132edb619751243bab0a0366f3536e89be 100644 --- a/sys/auto_init/netif/auto_init_cc2538_rf.c +++ b/sys/auto_init/netif/auto_init_cc2538_rf.c @@ -32,7 +32,9 @@ * @{ */ #define CC2538_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT) -#define CC2538_MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#ifndef CC2538_MAC_PRIO +#define CC2538_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif static cc2538_rf_t cc2538_rf_dev; static gnrc_netdev2_t gnrc_adpt; diff --git a/sys/auto_init/netif/auto_init_enc28j60.c b/sys/auto_init/netif/auto_init_enc28j60.c index f9f5fa227843349e83457ca80798836120afe963..355fd3513ceea65d6afa198eedca0b7cd31b0b30 100644 --- a/sys/auto_init/netif/auto_init_enc28j60.c +++ b/sys/auto_init/netif/auto_init_enc28j60.c @@ -33,8 +33,10 @@ * @brief Define stack parameters for the MAC layer thread * @{ */ -#define MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT) -#define MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#define ENC28J60_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT) +#ifndef ENC28J60_MAC_PRIO +#define ENC28J60_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif /*** @} */ /** @@ -53,7 +55,7 @@ static gnrc_netdev2_t gnrc_adpt[ENC28J60_NUM]; /** * @brief Stacks for the MAC layer threads */ -static char stack[MAC_STACKSIZE][ENC28J60_NUM]; +static char stack[ENC28J60_MAC_STACKSIZE][ENC28J60_NUM]; void auto_init_enc28j60(void) @@ -65,7 +67,7 @@ void auto_init_enc28j60(void) /* initialize netdev2 <-> gnrc adapter state */ gnrc_netdev2_eth_init(&gnrc_adpt[i], (netdev2_t *)&dev[i]); /* start gnrc netdev2 thread */ - gnrc_netdev2_init(stack[i], MAC_STACKSIZE, MAC_PRIO, + gnrc_netdev2_init(stack[i], ENC28J60_MAC_STACKSIZE, ENC28J60_MAC_PRIO, "gnrc_enc28j60", &gnrc_adpt[i]); } } diff --git a/sys/auto_init/netif/auto_init_encx24j600.c b/sys/auto_init/netif/auto_init_encx24j600.c index 22604b4bd3ef16596edb97ab85688ba3b6570119..1ff38baf8ad2725bbd7b91c61b05061b10e07516 100644 --- a/sys/auto_init/netif/auto_init_encx24j600.c +++ b/sys/auto_init/netif/auto_init_encx24j600.c @@ -23,6 +23,7 @@ #include "debug.h" #include "encx24j600.h" +#include "net/gnrc/netdev2.h" #include "net/gnrc/netdev2/eth.h" static encx24j600_t encx24j600; @@ -31,13 +32,15 @@ static encx24j600_t encx24j600; * @brief Define stack parameters for the MAC layer thread * @{ */ -#define MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT + DEBUG_EXTRA_STACKSIZE) -#define MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#define ENCX24J600_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT + DEBUG_EXTRA_STACKSIZE) +#ifndef ENCX24J600_MAC_PRIO +#define ENCX24J600_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif /** * @brief Stacks for the MAC layer threads */ -static char _netdev2_eth_stack[MAC_STACKSIZE]; +static char _netdev2_eth_stack[ENCX24J600_MAC_STACKSIZE]; static gnrc_netdev2_t _gnrc_encx24j600; void auto_init_encx24j600(void) @@ -54,8 +57,9 @@ void auto_init_encx24j600(void) gnrc_netdev2_eth_init(&_gnrc_encx24j600, (netdev2_t*)&encx24j600); /* start gnrc netdev2 thread */ - gnrc_netdev2_init(_netdev2_eth_stack, MAC_STACKSIZE, - MAC_PRIO, "gnrc_encx24j600", &_gnrc_encx24j600); + gnrc_netdev2_init(_netdev2_eth_stack, ENCX24J600_MAC_STACKSIZE, + ENCX24J600_MAC_PRIO, "gnrc_encx24j600", + &_gnrc_encx24j600); } #else diff --git a/sys/auto_init/netif/auto_init_ethos.c b/sys/auto_init/netif/auto_init_ethos.c index 85cdceb8be237b18cc59338adc5841ceec8b0d14..5f9bc9ca7b83a0b99aec39de4be5f84030569535 100644 --- a/sys/auto_init/netif/auto_init_ethos.c +++ b/sys/auto_init/netif/auto_init_ethos.c @@ -21,6 +21,7 @@ #include "ethos.h" #include "periph/uart.h" +#include "net/gnrc/netdev2.h" #include "net/gnrc/netdev2/eth.h" #define ENABLE_DEBUG (0) @@ -35,13 +36,15 @@ ethos_t ethos; * @brief Define stack parameters for the MAC layer thread * @{ */ -#define MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT + DEBUG_EXTRA_STACKSIZE) -#define MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#define ETHOS_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT + DEBUG_EXTRA_STACKSIZE) +#ifndef ETHOS_MAC_PRIO +#define ETHOS_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif /** * @brief Stacks for the MAC layer threads */ -static char _netdev2_eth_stack[MAC_STACKSIZE]; +static char _netdev2_eth_stack[ETHOS_MAC_STACKSIZE]; static gnrc_netdev2_t _gnrc_ethos; static uint8_t _inbuf[2048]; @@ -62,8 +65,8 @@ void auto_init_ethos(void) gnrc_netdev2_eth_init(&_gnrc_ethos, (netdev2_t*)ðos); /* start gnrc netdev2 thread */ - gnrc_netdev2_init(_netdev2_eth_stack, MAC_STACKSIZE, - MAC_PRIO, "gnrc_ethos", &_gnrc_ethos); + gnrc_netdev2_init(_netdev2_eth_stack, ETHOS_MAC_STACKSIZE, ETHOS_MAC_PRIO, + "gnrc_ethos", &_gnrc_ethos); } #else diff --git a/sys/auto_init/netif/auto_init_kw2xrf.c b/sys/auto_init/netif/auto_init_kw2xrf.c index d9218a2d92f19b263e8c3a3120c6b13d618ca6b6..71def82c502b91f4a96e4353b8f0960fdad09633 100644 --- a/sys/auto_init/netif/auto_init_kw2xrf.c +++ b/sys/auto_init/netif/auto_init_kw2xrf.c @@ -22,6 +22,7 @@ #ifdef MODULE_KW2XRF #include "board.h" +#include "net/gnrc/netdev2.h" #include "net/gnrc/nomac.h" #include "net/gnrc.h" @@ -36,7 +37,9 @@ * @{ */ #define KW2XRF_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT) -#define KW2XRF_MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#ifndef KW2XRF_MAC_PRIO +#define KW2XRF_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif #define KW2XRF_NUM (sizeof(kw2xrf_params)/sizeof(kw2xrf_params[0])) diff --git a/sys/auto_init/netif/auto_init_netdev2_tap.c b/sys/auto_init/netif/auto_init_netdev2_tap.c index 69180dd4ffbcb9dd4a1a1156a4a45c6805cc974a..9058ac04f505811c93a4d279caefa9630dc41175 100644 --- a/sys/auto_init/netif/auto_init_netdev2_tap.c +++ b/sys/auto_init/netif/auto_init_netdev2_tap.c @@ -23,6 +23,7 @@ #include "debug.h" #include "netdev2_tap.h" +#include "net/gnrc/netdev2.h" #include "net/gnrc/netdev2/eth.h" extern netdev2_tap_t netdev2_tap; @@ -32,7 +33,9 @@ extern netdev2_tap_t netdev2_tap; * @{ */ #define TAP_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT + DEBUG_EXTRA_STACKSIZE) -#define TAP_MAC_PRIO (THREAD_PRIORITY_MAIN - 3) +#ifndef TAP_MAC_PRIO +#define TAP_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif /** * @brief Stacks for the MAC layer threads diff --git a/sys/auto_init/netif/auto_init_slip.c b/sys/auto_init/netif/auto_init_slip.c index bb7c75fc65f006ed0e85241adeec88f9cea64f38..2da643e597f54d91d6987bf0b4cba8db48182d5c 100644 --- a/sys/auto_init/netif/auto_init_slip.c +++ b/sys/auto_init/netif/auto_init_slip.c @@ -20,6 +20,7 @@ #ifdef MODULE_GNRC_SLIP #include "board.h" +#include "net/gnrc/netdev2.h" #include "net/gnrc/nomac.h" #include "net/gnrc.h" @@ -38,7 +39,9 @@ static gnrc_slip_dev_t slip_devs[SLIP_NUM]; * @{ */ #define SLIP_STACKSIZE (THREAD_STACKSIZE_DEFAULT) -#define SLIP_PRIO (THREAD_PRIORITY_MAIN - 4) +#ifndef SLIP_PRIO +#define SLIP_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif /** * @brief Stacks for the MAC layer threads diff --git a/sys/auto_init/netif/auto_init_xbee.c b/sys/auto_init/netif/auto_init_xbee.c index 73c15dc3b0a6ffc7e9b9cf334a0f7efda6ead54a..a50adc1d8a860f9bbd9c9d789e85bbc606b53cc7 100644 --- a/sys/auto_init/netif/auto_init_xbee.c +++ b/sys/auto_init/netif/auto_init_xbee.c @@ -20,6 +20,7 @@ #ifdef MODULE_XBEE #include "board.h" +#include "net/gnrc/netdev2.h" #include "net/gnrc/nomac.h" #include "net/gnrc.h" @@ -38,7 +39,9 @@ static xbee_t xbee_devs[XBEE_NUM]; * @{ */ #define XBEE_MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT) -#define XBEE_MAC_PRIO (THREAD_PRIORITY_MAIN - 4) +#ifndef XBEE_MAC_PRIO +#define XBEE_MAC_PRIO (GNRC_NETDEV2_MAC_PRIO) +#endif /** * @brief Stacks for the MAC layer threads diff --git a/sys/include/net/gnrc/netdev2.h b/sys/include/net/gnrc/netdev2.h index 7c7020dd1fcf379ba71f68a792151a85ae5e3868..32d02f38447ceb39c1f928e6801c597f39587e4b 100644 --- a/sys/include/net/gnrc/netdev2.h +++ b/sys/include/net/gnrc/netdev2.h @@ -37,6 +37,10 @@ extern "C" { #endif +#ifndef GNRC_NETDEV2_MAC_PRIO +#define GNRC_NETDEV2_MAC_PRIO (THREAD_PRIORITY_MAIN - 5) +#endif + /** * @brief Type for @ref msg_t if device fired an event */