Skip to content

Commit

Permalink
sys/auto_init: unified logging for saul&netif
Browse files Browse the repository at this point in the history
  • Loading branch information
@haukepetersen
haukepetersen committed Jan 20, 2017
1 parent a5bdf0a commit a631cc8
Show file tree
Hide file tree
Showing 23 changed files with 95 additions and 107 deletions.
9 changes: 4 additions & 5 deletions sys/auto_init/netif/auto_init_at86rf2xx.c
View file
Expand Up @@ -19,6 +19,7 @@

#ifdef MODULE_AT86RF2XX

#include "log.h"
#include "board.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/netdev2/ieee802154.h"
Expand All @@ -27,9 +28,6 @@
#include "at86rf2xx.h"
#include "at86rf2xx_params.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief Define stack parameters for the MAC layer thread
* @{
Expand All @@ -51,13 +49,14 @@ void auto_init_at86rf2xx(void)
const at86rf2xx_params_t *p = &at86rf2xx_params[i];
int res;

DEBUG("Initializing AT86RF2xx radio at SPI_%i\n", p->spi);
LOG_DEBUG("[auto_init_netif] initializing at86rf2xx #%u\n", i);

at86rf2xx_setup(&at86rf2xx_devs[i], (at86rf2xx_params_t*) p);
res = gnrc_netdev2_ieee802154_init(&gnrc_adpt[i],
(netdev2_ieee802154_t *)&at86rf2xx_devs[i]);

if (res < 0) {
DEBUG("Error initializing AT86RF2xx radio device!\n");
LOG_ERROR("[auto_init_netif] error initializing at86rf2xx radio #%u\n", i);
}
else {
gnrc_netdev2_init(_at86rf2xx_stacks[i],
Expand Down
15 changes: 8 additions & 7 deletions sys/auto_init/netif/auto_init_cc110x.c
View file
Expand Up @@ -19,6 +19,8 @@

#ifdef MODULE_CC110X

#include "log.h"
#include "debug.h"
#include "board.h"
#include "net/gnrc/netdev2.h"
#include "gnrc_netdev2_cc110x.h"
Expand All @@ -27,9 +29,6 @@
#include "cc110x.h"
#include "cc110x_params.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief Define stack parameters for the MAC layer thread
* @{
Expand All @@ -48,19 +47,21 @@ static gnrc_netdev2_t _gnrc_netdev2_devs[CC110X_NUM];

void auto_init_cc110x(void)
{
for (int i = 0; i < CC110X_NUM; i++) {
for (unsigned i = 0; i < CC110X_NUM; i++) {
const cc110x_params_t *p = &cc110x_params[i];
DEBUG("Initializing CC110X radio at SPI_%i\n", p->spi);

LOG_DEBUG("[auto_init_netif] initializing cc110x #%u\n", i);

int res = netdev2_cc110x_setup(&cc110x_devs[i], p);
if (res < 0) {
DEBUG("Error initializing CC110X radio device!\n");
LOG_ERROR("[auto_init_netif] error initializing cc110x #%u\n", i);
}
else {
gnrc_netdev2_cc110x_init(&_gnrc_netdev2_devs[i], &cc110x_devs[i]);
res = gnrc_netdev2_init(_stacks[i], CC110X_MAC_STACKSIZE,
CC110X_MAC_PRIO, "cc110x", &_gnrc_netdev2_devs[i]);
if (res < 0) {
DEBUG("Error starting gnrc_cc110x thread for CC110X!\n");
LOG_ERROR("[auto_init_netif] error starting gnrc_cc110x thread\n");
}
}
}
Expand Down
8 changes: 3 additions & 5 deletions sys/auto_init/netif/auto_init_cc2420.c
View file
Expand Up @@ -21,6 +21,7 @@

#ifdef MODULE_CC2420

#include "log.h"
#include "board.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/netdev2/ieee802154.h"
Expand All @@ -29,9 +30,6 @@
#include "cc2420.h"
#include "cc2420_params.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief MAC layer stack parameters
* @{
Expand Down Expand Up @@ -59,14 +57,14 @@ static char _cc2420_stacks[CC2420_NUMOF][CC2420_MAC_STACKSIZE];
void auto_init_cc2420(void)
{
for (unsigned i = 0; i < CC2420_NUMOF; i++) {
DEBUG("Initializing CC2420 radios #%u\n", i);
LOG_DEBUG("[auto_init_netif] initializing cc2420 #%u\n", i);

cc2420_setup(&cc2420_devs[i], &cc2420_params[i]);
int res = gnrc_netdev2_ieee802154_init(&gnrc_adpt[i],
(netdev2_ieee802154_t *)&cc2420_devs[i]);

if (res < 0) {
DEBUG("Error initializing CC2420 radio device!\n");
LOG_ERROR("[auto_init_netif] error initializing cc2420 #%u\n", i);
}
else {
gnrc_netdev2_init(_cc2420_stacks[i],
Expand Down
9 changes: 4 additions & 5 deletions sys/auto_init/netif/auto_init_cc2538_rf.c
View file
Expand Up @@ -19,14 +19,12 @@

#ifdef MODULE_CC2538_RF

#include "log.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/netdev2/ieee802154.h"

#include "cc2538_rf.h"

#define ENABLE_DEBUG 0
#include "debug.h"

/**
* @brief Define stack parameters for the MAC layer thread
* @{
Expand All @@ -44,13 +42,14 @@ void auto_init_cc2538_rf(void)
{
int res;

DEBUG("Initializing CC2538 radio...\n");
LOG_DEBUG("[auto_init_netif] initializing cc2538 radio\n");

cc2538_setup(&cc2538_rf_dev);
res = gnrc_netdev2_ieee802154_init(&gnrc_adpt,
(netdev2_ieee802154_t *)&cc2538_rf_dev);

if (res < 0) {
DEBUG("Error initializing CC2538 radio device!\n");
LOG_ERROR("[auto_init_netif] error initializing cc2538 radio\n");
}
else {
gnrc_netdev2_init(_cc2538_rf_stack,
Expand Down
9 changes: 4 additions & 5 deletions sys/auto_init/netif/auto_init_enc28j60.c
View file
Expand Up @@ -21,14 +21,12 @@

#ifdef MODULE_ENC28J60

#include "log.h"
#include "enc28j60.h"
#include "enc28j60_params.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/netdev2/eth.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief Define stack parameters for the MAC layer thread
* @{
Expand Down Expand Up @@ -60,8 +58,9 @@ static char stack[ENC28J60_NUM][ENC28J60_MAC_STACKSIZE];

void auto_init_enc28j60(void)
{
for (int i = 0; i < ENC28J60_NUM; i++) {
DEBUG("auto_init_enc28j60(): initializing device [%i]...\n", i);
for (unsigned i = 0; i < ENC28J60_NUM; i++) {
LOG_DEBUG("[auto_init_netif] initializing enc28j60 #%u\n", i);

/* setup netdev2 device */
enc28j60_setup(&dev[i], &enc28j60_params[i]);
/* initialize netdev2 <-> gnrc adapter state */
Expand Down
6 changes: 3 additions & 3 deletions sys/auto_init/netif/auto_init_encx24j600.c
View file
Expand Up @@ -19,9 +19,8 @@

#ifdef MODULE_ENCX24J600

#define ENABLE_DEBUG (0)
#include "log.h"
#include "debug.h"

#include "encx24j600.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/netdev2/eth.h"
Expand All @@ -45,7 +44,8 @@ static gnrc_netdev2_t _gnrc_encx24j600;

void auto_init_encx24j600(void)
{
DEBUG("auto_init_encx24j600(): initializing device...\n");
LOG_DEBUG("[auto_init_netif] initializing encx24j600 #0\n");

/* setup netdev2 device */
encx24j600_params_t p;
p.spi = ENCX24J600_SPI;
Expand Down
7 changes: 3 additions & 4 deletions sys/auto_init/netif/auto_init_ethos.c
View file
Expand Up @@ -19,14 +19,13 @@

#ifdef MODULE_ETHOS

#include "log.h"
#include "debug.h"
#include "ethos.h"
#include "periph/uart.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/netdev2/eth.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief global ethos object, used by uart_stdio
*/
Expand All @@ -51,7 +50,7 @@ static uint8_t _inbuf[2048];

void auto_init_ethos(void)
{
DEBUG("auto_init_ethos(): initializing device...\n");
LOG_DEBUG("[auto_init_netif] initializing ethos #0\n");

/* setup netdev2 device */
ethos_params_t p;
Expand Down
11 changes: 5 additions & 6 deletions sys/auto_init/netif/auto_init_kw2xrf.c
View file
Expand Up @@ -21,6 +21,7 @@

#ifdef MODULE_KW2XRF

#include "log.h"
#include "board.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/nomac.h"
Expand All @@ -29,9 +30,6 @@
#include "kw2xrf.h"
#include "kw2xrf_params.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief Define stack parameters for the MAC layer thread
* @{
Expand All @@ -48,18 +46,19 @@ static char _nomac_stacks[KW2XRF_NUM][KW2XRF_MAC_STACKSIZE];

void auto_init_kw2xrf(void)
{
for (int i = 0; i < KW2XRF_NUM; i++) {
for (unsigned i = 0; i < KW2XRF_NUM; i++) {
const kw2xrf_params_t *p = &kw2xrf_params[i];

DEBUG("Initializing KW2xrf radio at SPI_%i\n", p->spi);
LOG_DEBUG("[auto_init_netif] initializing kw2xrf #%u\n", i);

int res = kw2xrf_init(&kw2xrf_devs[i],
p->spi,
p->spi_speed,
p->cs_pin,
p->int_pin);

if (res < 0) {
DEBUG("Error initializing KW2xrf radio device!\n");
LOG_ERROR("[auto_init_netif] initializing kw2xrf #%u\n", i);
}
else {
gnrc_nomac_init(_nomac_stacks[i],
Expand Down
10 changes: 6 additions & 4 deletions sys/auto_init/netif/auto_init_netdev2_tap.c
View file
Expand Up @@ -19,9 +19,8 @@

#ifdef MODULE_NETDEV2_TAP

#define ENABLE_DEBUG (0)
#include "log.h"
#include "debug.h"

#include "netdev2_tap_params.h"
#include "net/gnrc/netdev2/eth.h"

Expand All @@ -34,9 +33,12 @@ static gnrc_netdev2_t _gnrc_netdev2_tap[NETDEV2_TAP_MAX];

void auto_init_netdev2_tap(void)
{
for (int i = 0; i < NETDEV2_TAP_MAX; i++) {
for (unsigned i = 0; i < NETDEV2_TAP_MAX; i++) {
const netdev2_tap_params_t *p = &netdev2_tap_params[i];
DEBUG("Initializing netdev2_tap on TAP %s\n", *(p->tap_name));

LOG_DEBUG("[auto_init_netif] initializing netdev2_tap #%u on TAP %s\n",
i, *(p->tap_name));

netdev2_tap_setup(&netdev2_tap[i], p);
gnrc_netdev2_eth_init(&_gnrc_netdev2_tap[i], (netdev2_t*)&netdev2_tap[i]);

Expand Down
12 changes: 6 additions & 6 deletions sys/auto_init/netif/auto_init_slip.c
View file
Expand Up @@ -19,6 +19,7 @@

#ifdef MODULE_GNRC_SLIP

#include "log.h"
#include "board.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/nomac.h"
Expand All @@ -27,9 +28,6 @@
#include "net/gnrc/slip.h"
#include "slip_params.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

#define SLIP_NUM (sizeof(gnrc_slip_params)/sizeof(gnrc_slip_params_t))

static gnrc_slip_dev_t slip_devs[SLIP_NUM];
Expand All @@ -50,15 +48,17 @@ static char _slip_stacks[SLIP_NUM][SLIP_STACKSIZE];

void auto_init_slip(void)
{
for (unsigned int i = 0; i < SLIP_NUM; i++) {
for (unsigned i = 0; i < SLIP_NUM; i++) {
const gnrc_slip_params_t *p = &gnrc_slip_params[i];
DEBUG("Initializing SLIP radio at UART_%d\n", p->uart);

LOG_DEBUG("[auto_init_netif] initializing slip #%u\n", i);

kernel_pid_t res = gnrc_slip_init(&slip_devs[i], p->uart, p->baudrate,
_slip_stacks[i], SLIP_STACKSIZE,
SLIP_PRIO);

if (res <= KERNEL_PID_UNDEF) {
DEBUG("Error initializing SLIP radio device!\n");
LOG_ERROR("[auto_init_netif] error initializing slip #%u\n", i);
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions sys/auto_init/netif/auto_init_w5100.c
View file
Expand Up @@ -19,14 +19,12 @@

#ifdef MODULE_W5100

#include "log.h"
#include "w5100.h"
#include "w5100_params.h"
#include "net/gnrc/netdev2.h"
#include "net/gnrc/netdev2/eth.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief Define stack parameters for the MAC layer thread
* @{
Expand Down Expand Up @@ -56,8 +54,9 @@ static char stack[W5100_NUM][MAC_STACKSIZE];

void auto_init_w5100(void)
{
for (int i = 0; i < W5100_NUM; i++) {
DEBUG("auto_init_w5100(): initializing device [%i]...\n", i);
for (unsigned i = 0; i < W5100_NUM; i++) {
LOG_DEBUG("[auto_init_netif] initializing w5100 #%u\n", i);

/* setup netdev2 device */
w5100_setup(&dev[i], &w5100_params[i]);
/* initialize netdev2 <-> gnrc adapter state */
Expand Down
8 changes: 3 additions & 5 deletions sys/auto_init/netif/auto_init_xbee.c
View file
Expand Up @@ -21,13 +21,11 @@

#ifdef MODULE_XBEE

#include "log.h"
#include "board.h"
#include "net/gnrc/netdev2/xbee_adpt.h"
#include "xbee_params.h"

#define ENABLE_DEBUG (0)
#include "debug.h"

/**
* @brief Calculate the number of configured XBee devices
*/
Expand All @@ -50,8 +48,8 @@ static char stacks[XBEE_NUM][XBEE_MAC_STACKSIZE];

void auto_init_xbee(void)
{
for (size_t i = 0; i < XBEE_NUM; i++) {
DEBUG("Initializing XBee radio #%u\n", i);
for (unsigned i = 0; i < XBEE_NUM; i++) {
LOG_DEBUG("[auto_init_netif] initializing xbee #%u\n", i);

xbee_setup(&xbee_devs[i], &xbee_params[i]);
gnrc_netdev2_xbee_init(&gnrc_adpt[i], &xbee_devs[i]);
Expand Down

0 comments on commit a631cc8

Please sign in to comment.