riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3457 from authmillenon/gnrc/api/rename-netconf

Browse Source 
gnrc: rename ng_netconf to ng_netopt
This commit is contained in:
Oleg Hahm 2015-07-28 18:21:09 +02:00
commit 03b7c7349a
19 changed files with 373 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cpu/nrf51/radio/nrfmin/nrfmin.c
View File

@ -211,52 +211,52 @@ static void _switch_to_rx(void)
*/ */
int _get_state(uint8_t *val, size_t max_len) int _get_state(uint8_t *val, size_t max_len)
{ {
ng_netconf_state_t state; ng_netopt_state_t state;
if (max_len < sizeof(ng_netconf_state_t)) { if (max_len < sizeof(ng_netopt_state_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
switch (_state) { switch (_state) {
case STATE_OFF: case STATE_OFF:
state = NETCONF_STATE_OFF; state = NG_NETOPT_STATE_OFF;
break; break;
case STATE_IDLE: case STATE_IDLE:
state = NETCONF_STATE_SLEEP; state = NG_NETOPT_STATE_SLEEP;
break; break;
case STATE_RX: case STATE_RX:
state = NETCONF_STATE_IDLE; state = NG_NETOPT_STATE_IDLE;
break; break;
case STATE_TX: case STATE_TX:
state = NETCONF_STATE_TX; state = NG_NETOPT_STATE_TX;
break; break;
default: default:
return -ECANCELED; return -ECANCELED;
} }
memcpy(val, &state, sizeof(ng_netconf_state_t)); memcpy(val, &state, sizeof(ng_netopt_state_t));
return sizeof(ng_netconf_state_t); return sizeof(ng_netopt_state_t);
} }
int _set_state(uint8_t *val, size_t len) int _set_state(uint8_t *val, size_t len)
{ {
ng_netconf_state_t state; ng_netopt_state_t state;
if (len != sizeof(ng_netconf_state_t)) { if (len != sizeof(ng_netopt_state_t)) {
return -EINVAL; return -EINVAL;
} }
/* get target state */ /* get target state */
memcpy(&state, val, len); memcpy(&state, val, len);
/* switch to target state */ /* switch to target state */
switch (state) { switch (state) {
case NETCONF_STATE_SLEEP: case NG_NETOPT_STATE_SLEEP:
_switch_to_idle(); _switch_to_idle();
break; break;
case NETCONF_STATE_IDLE: case NG_NETOPT_STATE_IDLE:
_switch_to_rx(); _switch_to_rx();
break; break;
default: default:
return -ENOTSUP; return -ENOTSUP;
} }
return sizeof(ng_netconf_state_t); return sizeof(ng_netopt_state_t);
} }
int _get_address(uint8_t *val, size_t max_len) int _get_address(uint8_t *val, size_t max_len)
@ -662,42 +662,40 @@ int _rem_event_cb(ng_netdev_t *dev, ng_netdev_event_cb_t cb)
return -ENOENT; return -ENOENT;
} }
int _get(ng_netdev_t *dev, ng_netconf_opt_t opt, int _get(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t max_len)
void *value, size_t max_len)
{ {
(void)dev; (void)dev;
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
return _get_address(value, max_len); return _get_address(value, max_len);
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
return _get_channel(value, max_len); return _get_channel(value, max_len);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
return _get_pan(value, max_len); return _get_pan(value, max_len);
case NETCONF_OPT_TX_POWER: case NG_NETOPT_TX_POWER:
return _get_txpower(value, max_len); return _get_txpower(value, max_len);
case NETCONF_OPT_STATE: case NG_NETOPT_STATE:
return _get_state(value, max_len); return _get_state(value, max_len);
default: default:
return -ENOTSUP; return -ENOTSUP;
} }
} }
int _set(ng_netdev_t *dev, ng_netconf_opt_t opt, int _set(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t value_len)
void *value, size_t value_len)
{ {
(void)dev; (void)dev;
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
return _set_address(value, value_len); return _set_address(value, value_len);
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
return _set_channel(value, value_len); return _set_channel(value, value_len);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
return _set_pan(value, value_len); return _set_pan(value, value_len);
case NETCONF_OPT_TX_POWER: case NG_NETOPT_TX_POWER:
return _set_txpower(value, value_len); return _set_txpower(value, value_len);
case NETCONF_OPT_STATE: case NG_NETOPT_STATE:
return _set_state(value, value_len); return _set_state(value, value_len);
default: default:
return -ENOTSUP; return -ENOTSUP;

2
drivers/include/kw2xrf.h
View File

@ -109,7 +109,7 @@ typedef struct {
kernel_pid_t mac_pid; /**< The driver's thread's PID */ kernel_pid_t mac_pid; /**< The driver's thread's PID */
/* driver specific fields */ /* driver specific fields */
uint8_t buf[KW2XRF_MAX_PKT_LENGTH]; /**< Buffer for incoming or outgoing packets */ uint8_t buf[KW2XRF_MAX_PKT_LENGTH]; /**< Buffer for incoming or outgoing packets */
ng_netconf_state_t state; /**< Variable to keep radio driver's state */ ng_netopt_state_t state; /**< Variable to keep radio driver's state */
uint8_t seq_nr; /**< Next packets sequence number */ uint8_t seq_nr; /**< Next packets sequence number */
uint16_t radio_pan; /**< The PAN the radio device is using */ uint16_t radio_pan; /**< The PAN the radio device is using */
uint8_t radio_channel; /**< The channel the radio device is using */ uint8_t radio_channel; /**< The channel the radio device is using */

118
drivers/kw2xrf/kw2xrf.c
View File

@ -184,32 +184,32 @@ void kw2xrf_set_sequence(kw2xrf_t *dev, kw2xrf_physeq_t seq)
/* Progrmm new sequence */ /* Progrmm new sequence */
switch (seq) { switch (seq) {
case XCVSEQ_IDLE: case XCVSEQ_IDLE:
dev->state = NETCONF_STATE_SLEEP; dev->state = NG_NETOPT_STATE_SLEEP;
break; break;
case XCVSEQ_RECEIVE: case XCVSEQ_RECEIVE:
dev->state = NETCONF_STATE_IDLE; dev->state = NG_NETOPT_STATE_IDLE;
break; break;
case XCVSEQ_TRANSMIT: case XCVSEQ_TRANSMIT:
dev->state = NETCONF_STATE_TX; dev->state = NG_NETOPT_STATE_TX;
break; break;
case XCVSEQ_CCA: case XCVSEQ_CCA:
dev->state = NETCONF_STATE_TX; dev->state = NG_NETOPT_STATE_TX;
break; break;
case XCVSEQ_TX_RX: case XCVSEQ_TX_RX:
dev->state = NETCONF_STATE_TX; dev->state = NG_NETOPT_STATE_TX;
break; break;
case XCVSEQ_CONTINUOUS_CCA: case XCVSEQ_CONTINUOUS_CCA:
dev->state = NETCONF_STATE_TX; dev->state = NG_NETOPT_STATE_TX;
break; break;
default: default:
DEBUG("kw2xrf: undefined state assigned to phy\n"); DEBUG("kw2xrf: undefined state assigned to phy\n");
dev->state = NETCONF_STATE_IDLE; dev->state = NG_NETOPT_STATE_IDLE;
} }
/* Mapping of TX-sequences depending on AUTOACK flag */ /* Mapping of TX-sequences depending on AUTOACK flag */
@ -352,7 +352,7 @@ int kw2xrf_on(kw2xrf_t *dev)
/* abort any ongoing sequence */ /* abort any ongoing sequence */
kw2xrf_set_sequence(dev, XCVSEQ_IDLE); kw2xrf_set_sequence(dev, XCVSEQ_IDLE);
dev->state = NETCONF_STATE_SLEEP; dev->state = NG_NETOPT_STATE_SLEEP;
return 0; return 0;
} }
@ -508,7 +508,7 @@ uint64_t kw2xrf_get_addr_long(kw2xrf_t *dev)
return addr; return addr;
} }
int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t max_len) int kw2xrf_get(ng_netdev_t *netdev, ng_netopt_t opt, void *value, size_t max_len)
{ {
kw2xrf_t *dev = (kw2xrf_t *)netdev; kw2xrf_t *dev = (kw2xrf_t *)netdev;
@ -517,7 +517,7 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -525,7 +525,7 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
*((uint16_t *)value) = ((dev->addr_short[0] << 8) | dev->addr_short[1]); *((uint16_t *)value) = ((dev->addr_short[0] << 8) | dev->addr_short[1]);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
if (max_len < sizeof(uint64_t)) { if (max_len < sizeof(uint64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -533,7 +533,7 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
*((uint64_t *)value) = kw2xrf_get_addr_long(dev); *((uint64_t *)value) = kw2xrf_get_addr_long(dev);
return sizeof(uint64_t); return sizeof(uint64_t);
case NETCONF_OPT_ADDR_LEN: case NG_NETOPT_ADDR_LEN:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -541,7 +541,7 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
*((uint16_t *)value) = 2; *((uint16_t *)value) = 2;
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -555,7 +555,7 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -563,21 +563,21 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
*((uint16_t *)value) = dev->radio_pan; *((uint16_t *)value) = dev->radio_pan;
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
return kw2xrf_get_channel(dev, (uint8_t *)value, max_len); return kw2xrf_get_channel(dev, (uint8_t *)value, max_len);
case NETCONF_OPT_PROTO: case NG_NETOPT_PROTO:
return kw2xrf_get_proto(dev, (uint8_t *)value, max_len); return kw2xrf_get_proto(dev, (uint8_t *)value, max_len);
case NETCONF_OPT_STATE: case NG_NETOPT_STATE:
if (max_len < sizeof(ng_netconf_state_t)) { if (max_len < sizeof(ng_netopt_state_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*(ng_netconf_state_t *)value = *(ng_netconf_state_t *) & (dev->state); *(ng_netopt_state_t *)value = *(ng_netopt_state_t *) & (dev->state);
return 0; return 0;
case NETCONF_OPT_TX_POWER: case NG_NETOPT_TX_POWER:
if (max_len < 1) { if (max_len < 1) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -585,7 +585,7 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
*(int16_t *)value = dev->tx_power; *(int16_t *)value = dev->tx_power;
return 0; return 0;
case NETCONF_OPT_MAX_PACKET_SIZE: case NG_NETOPT_MAX_PACKET_SIZE:
if (max_len < sizeof(int16_t)) { if (max_len < sizeof(int16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -593,21 +593,21 @@ int kw2xrf_get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t ma
*((uint16_t *)value) = KW2XRF_MAX_PKT_LENGTH; *((uint16_t *)value) = KW2XRF_MAX_PKT_LENGTH;
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_PRELOADING: case NG_NETOPT_PRELOADING:
*((ng_netconf_enable_t *)value) = !!(dev->option & KW2XRF_OPT_PRELOADING); *((ng_netopt_enable_t *)value) = !!(dev->option & KW2XRF_OPT_PRELOADING);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_AUTOACK: case NG_NETOPT_AUTOACK:
*((ng_netconf_enable_t *)value) = !!(dev->option & KW2XRF_OPT_AUTOACK); *((ng_netopt_enable_t *)value) = !!(dev->option & KW2XRF_OPT_AUTOACK);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_PROMISCUOUSMODE: case NG_NETOPT_PROMISCUOUSMODE:
*((ng_netconf_enable_t *)value) = !!(dev->option & KW2XRF_OPT_PROMISCUOUS); *((ng_netopt_enable_t *)value) = !!(dev->option & KW2XRF_OPT_PROMISCUOUS);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RAWMODE: case NG_NETOPT_RAWMODE:
*((ng_netconf_enable_t *)value) = !!(dev->option & KW2XRF_OPT_RAWDUMP); *((ng_netopt_enable_t *)value) = !!(dev->option & KW2XRF_OPT_RAWDUMP);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
default: default:
return -ENOTSUP; return -ENOTSUP;
@ -696,7 +696,7 @@ void kw2xrf_set_option(kw2xrf_t *dev, uint16_t option, bool state)
} }
} }
int kw2xrf_set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t value_len) int kw2xrf_set(ng_netdev_t *netdev, ng_netopt_t opt, void *value, size_t value_len)
{ {
kw2xrf_t *dev = (kw2xrf_t *)netdev; kw2xrf_t *dev = (kw2xrf_t *)netdev;
@ -705,24 +705,24 @@ int kw2xrf_set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t va
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
return kw2xrf_set_channel(dev, (uint8_t *)value, value_len); return kw2xrf_set_channel(dev, (uint8_t *)value, value_len);
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
if (value_len > sizeof(uint16_t)) { if (value_len > sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
return kw2xrf_set_addr(dev, *((uint16_t *)value)); return kw2xrf_set_addr(dev, *((uint16_t *)value));
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
if (value_len > sizeof(uint64_t)) { if (value_len > sizeof(uint64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
return kw2xrf_set_addr_long(dev, *((uint64_t *)value)); return kw2xrf_set_addr_long(dev, *((uint64_t *)value));
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
if (value_len > sizeof(uint16_t)) { if (value_len > sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -741,14 +741,14 @@ int kw2xrf_set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t va
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
if (value_len > sizeof(uint16_t)) { if (value_len > sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
return kw2xrf_set_pan(dev, *((uint16_t *)value)); return kw2xrf_set_pan(dev, *((uint16_t *)value));
case NETCONF_OPT_TX_POWER: case NG_NETOPT_TX_POWER:
if (value_len < sizeof(uint16_t)) { if (value_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -756,48 +756,48 @@ int kw2xrf_set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, size_t va
kw2xrf_set_tx_power(dev, (int8_t *)value, value_len); kw2xrf_set_tx_power(dev, (int8_t *)value, value_len);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_PROTO: case NG_NETOPT_PROTO:
return kw2xrf_set_proto(dev, (uint8_t *)value, value_len); return kw2xrf_set_proto(dev, (uint8_t *)value, value_len);
case NETCONF_OPT_AUTOACK: case NG_NETOPT_AUTOACK:
/* Set up HW generated automatic ACK after Receive */ /* Set up HW generated automatic ACK after Receive */
kw2xrf_set_option(dev, KW2XRF_OPT_AUTOACK, kw2xrf_set_option(dev, KW2XRF_OPT_AUTOACK,
((bool *)value)[0]); ((bool *)value)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_PROMISCUOUSMODE: case NG_NETOPT_PROMISCUOUSMODE:
kw2xrf_set_option(dev, KW2XRF_OPT_PROMISCUOUS, kw2xrf_set_option(dev, KW2XRF_OPT_PROMISCUOUS,
((bool *)value)[0]); ((bool *)value)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RAWMODE: case NG_NETOPT_RAWMODE:
kw2xrf_set_option(dev, KW2XRF_OPT_RAWDUMP, kw2xrf_set_option(dev, KW2XRF_OPT_RAWDUMP,
((bool *)value)[0]); ((bool *)value)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_PRELOADING: case NG_NETOPT_PRELOADING:
kw2xrf_set_option(dev, KW2XRF_OPT_PRELOADING, kw2xrf_set_option(dev, KW2XRF_OPT_PRELOADING,
((bool *)value)[0]); ((bool *)value)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_AUTOCCA: case NG_NETOPT_AUTOCCA:
kw2xrf_set_option(dev, KW2XRF_OPT_CSMA, kw2xrf_set_option(dev, KW2XRF_OPT_CSMA,
((bool *)value)[0]); ((bool *)value)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_STATE: case NG_NETOPT_STATE:
if (*((ng_netconf_state_t *)value) == NETCONF_STATE_TX) { if (*((ng_netopt_state_t *)value) == NG_NETOPT_STATE_TX) {
DEBUG("kw2xrf: Sending now.\n"); DEBUG("kw2xrf: Sending now.\n");
kw2xrf_set_sequence(dev, XCVSEQ_TRANSMIT); kw2xrf_set_sequence(dev, XCVSEQ_TRANSMIT);
return sizeof(ng_netconf_state_t); return sizeof(ng_netopt_state_t);
} }
else if (*((ng_netconf_state_t *)value) == NETCONF_STATE_SLEEP) { else if (*((ng_netopt_state_t *)value) == NG_NETOPT_STATE_SLEEP) {
kw2xrf_set_sequence(dev, XCVSEQ_IDLE); kw2xrf_set_sequence(dev, XCVSEQ_IDLE);
return sizeof(ng_netconf_state_t); return sizeof(ng_netopt_state_t);
} }
else if (*((ng_netconf_state_t *)value) == NETCONF_STATE_IDLE) { else if (*((ng_netopt_state_t *)value) == NG_NETOPT_STATE_IDLE) {
kw2xrf_set_sequence(dev, XCVSEQ_RECEIVE); kw2xrf_set_sequence(dev, XCVSEQ_RECEIVE);
return sizeof(ng_netconf_state_t); return sizeof(ng_netopt_state_t);
} }
/* TODO: Implement Off state here, when LPM functions are implemented */ /* TODO: Implement Off state here, when LPM functions are implemented */
@ -1188,7 +1188,7 @@ int kw2xrf_send(ng_netdev_t *netdev, ng_pktsnip_t *pkt)
DEBUG("kw2xrf: packet with size %i loaded to tx_buf\n", dev->buf[0]); DEBUG("kw2xrf: packet with size %i loaded to tx_buf\n", dev->buf[0]);
kw2xrf_write_fifo(dev->buf, dev->buf[0]); kw2xrf_write_fifo(dev->buf, dev->buf[0]);
if ((dev->option & KW2XRF_OPT_PRELOADING) == NETCONF_DISABLE) { if ((dev->option & KW2XRF_OPT_PRELOADING) == NG_NETOPT_DISABLE) {
DEBUG("kw2xrf: Sending now.\n"); DEBUG("kw2xrf: Sending now.\n");
kw2xrf_set_sequence(dev, XCVSEQ_TRANSMIT); kw2xrf_set_sequence(dev, XCVSEQ_TRANSMIT);
} }

172
drivers/ng_at86rf2xx/ng_at86rf2xx_netdev.c
View File

@ -318,47 +318,46 @@ static void _receive_data(ng_at86rf2xx_t *dev)
dev->event_cb(NETDEV_EVENT_RX_COMPLETE, payload); dev->event_cb(NETDEV_EVENT_RX_COMPLETE, payload);
} }
static int _set_state(ng_at86rf2xx_t *dev, ng_netconf_state_t state) static int _set_state(ng_at86rf2xx_t *dev, ng_netopt_state_t state)
{ {
switch (state) { switch (state) {
case NETCONF_STATE_SLEEP: case NG_NETOPT_STATE_SLEEP:
ng_at86rf2xx_set_state(dev, NG_AT86RF2XX_STATE_TRX_OFF); ng_at86rf2xx_set_state(dev, NG_AT86RF2XX_STATE_TRX_OFF);
break; break;
case NETCONF_STATE_IDLE: case NG_NETOPT_STATE_IDLE:
ng_at86rf2xx_set_state(dev, NG_AT86RF2XX_STATE_RX_AACK_ON); ng_at86rf2xx_set_state(dev, NG_AT86RF2XX_STATE_RX_AACK_ON);
break; break;
case NETCONF_STATE_TX: case NG_NETOPT_STATE_TX:
if (dev->options & NG_AT86RF2XX_OPT_PRELOADING) { if (dev->options & NG_AT86RF2XX_OPT_PRELOADING) {
ng_at86rf2xx_tx_exec(dev); ng_at86rf2xx_tx_exec(dev);
} }
break; break;
case NETCONF_STATE_RESET: case NG_NETOPT_STATE_RESET:
ng_at86rf2xx_reset(dev); ng_at86rf2xx_reset(dev);
break; break;
default: default:
return -ENOTSUP; return -ENOTSUP;
} }
return sizeof(ng_netconf_state_t); return sizeof(ng_netopt_state_t);
} }
ng_netconf_state_t _get_state(ng_at86rf2xx_t *dev) ng_netopt_state_t _get_state(ng_at86rf2xx_t *dev)
{ {
switch (ng_at86rf2xx_get_status(dev)) { switch (ng_at86rf2xx_get_status(dev)) {
case NG_AT86RF2XX_STATE_SLEEP: case NG_AT86RF2XX_STATE_SLEEP:
return NETCONF_STATE_SLEEP; return NG_NETOPT_STATE_SLEEP;
case NG_AT86RF2XX_STATE_BUSY_RX_AACK: case NG_AT86RF2XX_STATE_BUSY_RX_AACK:
return NETCONF_STATE_RX; return NG_NETOPT_STATE_RX;
case NG_AT86RF2XX_STATE_BUSY_TX_ARET: case NG_AT86RF2XX_STATE_BUSY_TX_ARET:
case NG_AT86RF2XX_STATE_TX_ARET_ON: case NG_AT86RF2XX_STATE_TX_ARET_ON:
return NETCONF_STATE_TX; return NG_NETOPT_STATE_TX;
case NG_AT86RF2XX_STATE_RX_AACK_ON: case NG_AT86RF2XX_STATE_RX_AACK_ON:
default: default:
return NETCONF_STATE_IDLE; return NG_NETOPT_STATE_IDLE;
} }
} }
static int _get(ng_netdev_t *device, ng_netconf_opt_t opt, static int _get(ng_netdev_t *device, ng_netopt_t opt, void *val, size_t max_len)
void *val, size_t max_len)
{ {
if (device == NULL) { if (device == NULL) {
return -ENODEV; return -ENODEV;
@ -367,28 +366,28 @@ static int _get(ng_netdev_t *device, ng_netconf_opt_t opt,
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint16_t *)val) = ng_at86rf2xx_get_addr_short(dev); *((uint16_t *)val) = ng_at86rf2xx_get_addr_short(dev);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
if (max_len < sizeof(uint64_t)) { if (max_len < sizeof(uint64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint64_t *)val) = ng_at86rf2xx_get_addr_long(dev); *((uint64_t *)val) = ng_at86rf2xx_get_addr_long(dev);
return sizeof(uint64_t); return sizeof(uint64_t);
case NETCONF_OPT_ADDR_LEN: case NG_NETOPT_ADDR_LEN:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint16_t *)val) = 2; *((uint16_t *)val) = 2;
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -400,14 +399,14 @@ static int _get(ng_netdev_t *device, ng_netconf_opt_t opt,
} }
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint16_t *)val) = dev->pan; *((uint16_t *)val) = dev->pan;
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_IPV6_IID: case NG_NETOPT_IPV6_IID:
if (max_len < sizeof(eui64_t)) { if (max_len < sizeof(eui64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -421,14 +420,14 @@ static int _get(ng_netdev_t *device, ng_netconf_opt_t opt,
} }
return sizeof(eui64_t); return sizeof(eui64_t);
case NETCONF_OPT_PROTO: case NG_NETOPT_PROTO:
if (max_len < sizeof(ng_nettype_t)) { if (max_len < sizeof(ng_nettype_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((ng_nettype_t *)val) = dev->proto; *((ng_nettype_t *)val) = dev->proto;
return sizeof(ng_nettype_t); return sizeof(ng_nettype_t);
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -436,98 +435,98 @@ static int _get(ng_netdev_t *device, ng_netconf_opt_t opt,
((uint8_t *)val)[0] = ng_at86rf2xx_get_chan(dev); ((uint8_t *)val)[0] = ng_at86rf2xx_get_chan(dev);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_TX_POWER: case NG_NETOPT_TX_POWER:
if (max_len < sizeof(int16_t)) { if (max_len < sizeof(int16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint16_t *)val) = ng_at86rf2xx_get_txpower(dev); *((uint16_t *)val) = ng_at86rf2xx_get_txpower(dev);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_MAX_PACKET_SIZE: case NG_NETOPT_MAX_PACKET_SIZE:
if (max_len < sizeof(int16_t)) { if (max_len < sizeof(int16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint16_t *)val) = NG_AT86RF2XX_MAX_PKT_LENGTH - _MAX_MHR_OVERHEAD; *((uint16_t *)val) = NG_AT86RF2XX_MAX_PKT_LENGTH - _MAX_MHR_OVERHEAD;
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_STATE: case NG_NETOPT_STATE:
if (max_len < sizeof(ng_netconf_state_t)) { if (max_len < sizeof(ng_netopt_state_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((ng_netconf_state_t*)val) = _get_state(dev); *((ng_netopt_state_t*)val) = _get_state(dev);
break; break;
case NETCONF_OPT_PRELOADING: case NG_NETOPT_PRELOADING:
if (dev->options & NG_AT86RF2XX_OPT_PRELOADING) { if (dev->options & NG_AT86RF2XX_OPT_PRELOADING) {
*((ng_netconf_enable_t *)val) = NETCONF_ENABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_ENABLE;
} }
else { else {
*((ng_netconf_enable_t *)val) = NETCONF_DISABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_DISABLE;
} }
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_AUTOACK: case NG_NETOPT_AUTOACK:
if (dev->options & NG_AT86RF2XX_OPT_AUTOACK) { if (dev->options & NG_AT86RF2XX_OPT_AUTOACK) {
*((ng_netconf_enable_t *)val) = NETCONF_ENABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_ENABLE;
} }
else { else {
*((ng_netconf_enable_t *)val) = NETCONF_DISABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_DISABLE;
} }
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RETRANS: case NG_NETOPT_RETRANS:
if (max_len < sizeof(uint8_t)) { if (max_len < sizeof(uint8_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint8_t *)val) = ng_at86rf2xx_get_max_retries(dev); *((uint8_t *)val) = ng_at86rf2xx_get_max_retries(dev);
return sizeof(uint8_t); return sizeof(uint8_t);
case NETCONF_OPT_PROMISCUOUSMODE: case NG_NETOPT_PROMISCUOUSMODE:
if (dev->options & NG_AT86RF2XX_OPT_PROMISCUOUS) { if (dev->options & NG_AT86RF2XX_OPT_PROMISCUOUS) {
*((ng_netconf_enable_t *)val) = NETCONF_ENABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_ENABLE;
} }
else { else {
*((ng_netconf_enable_t *)val) = NETCONF_DISABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_DISABLE;
} }
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RAWMODE: case NG_NETOPT_RAWMODE:
if (dev->options & NG_AT86RF2XX_OPT_RAWDUMP) { if (dev->options & NG_AT86RF2XX_OPT_RAWDUMP) {
*((ng_netconf_enable_t *)val) = NETCONF_ENABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_ENABLE;
} }
else { else {
*((ng_netconf_enable_t *)val) = NETCONF_DISABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_DISABLE;
} }
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_IS_CHANNEL_CLR: case NG_NETOPT_IS_CHANNEL_CLR:
if (ng_at86rf2xx_cca(dev)) { if (ng_at86rf2xx_cca(dev)) {
*((ng_netconf_enable_t *)val) = NETCONF_ENABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_ENABLE;
} }
else { else {
*((ng_netconf_enable_t *)val) = NETCONF_DISABLE; *((ng_netopt_enable_t *)val) = NG_NETOPT_DISABLE;
} }
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RX_START_IRQ: case NG_NETOPT_RX_START_IRQ:
*((ng_netconf_enable_t *)val) = *((ng_netopt_enable_t *)val) =
!!(dev->options & NG_AT86RF2XX_OPT_TELL_RX_START); !!(dev->options & NG_AT86RF2XX_OPT_TELL_RX_START);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RX_END_IRQ: case NG_NETOPT_RX_END_IRQ:
*((ng_netconf_enable_t *)val) = *((ng_netopt_enable_t *)val) =
!!(dev->options & NG_AT86RF2XX_OPT_TELL_RX_END); !!(dev->options & NG_AT86RF2XX_OPT_TELL_RX_END);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_TX_START_IRQ: case NG_NETOPT_TX_START_IRQ:
*((ng_netconf_enable_t *)val) = *((ng_netopt_enable_t *)val) =
!!(dev->options & NG_AT86RF2XX_OPT_TELL_TX_START); !!(dev->options & NG_AT86RF2XX_OPT_TELL_TX_START);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_TX_END_IRQ: case NG_NETOPT_TX_END_IRQ:
*((ng_netconf_enable_t *)val) = *((ng_netopt_enable_t *)val) =
!!(dev->options & NG_AT86RF2XX_OPT_TELL_TX_END); !!(dev->options & NG_AT86RF2XX_OPT_TELL_TX_END);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
default: default:
return -ENOTSUP; return -ENOTSUP;
@ -536,8 +535,7 @@ static int _get(ng_netdev_t *device, ng_netconf_opt_t opt,
return 0; return 0;
} }
static int _set(ng_netdev_t *device, ng_netconf_opt_t opt, static int _set(ng_netdev_t *device, ng_netopt_t opt, void *val, size_t len)
void *val, size_t len)
{ {
ng_at86rf2xx_t *dev = (ng_at86rf2xx_t *) device; ng_at86rf2xx_t *dev = (ng_at86rf2xx_t *) device;
@ -546,21 +544,21 @@ static int _set(ng_netdev_t *device, ng_netconf_opt_t opt,
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
if (len > sizeof(uint16_t)) { if (len > sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
ng_at86rf2xx_set_addr_short(dev, *((uint16_t*)val)); ng_at86rf2xx_set_addr_short(dev, *((uint16_t*)val));
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
if (len > sizeof(uint64_t)) { if (len > sizeof(uint64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
ng_at86rf2xx_set_addr_long(dev, *((uint64_t*)val)); ng_at86rf2xx_set_addr_long(dev, *((uint64_t*)val));
return sizeof(uint64_t); return sizeof(uint64_t);
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
if (len > sizeof(uint16_t)) { if (len > sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -577,14 +575,14 @@ static int _set(ng_netdev_t *device, ng_netconf_opt_t opt,
} }
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
if (len > sizeof(uint16_t)) { if (len > sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
ng_at86rf2xx_set_pan(dev, *((uint16_t *)val)); ng_at86rf2xx_set_pan(dev, *((uint16_t *)val));
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
if (len != sizeof(uint16_t)) { if (len != sizeof(uint16_t)) {
return -EINVAL; return -EINVAL;
} }
@ -596,65 +594,65 @@ static int _set(ng_netdev_t *device, ng_netconf_opt_t opt,
ng_at86rf2xx_set_chan(dev, chan); ng_at86rf2xx_set_chan(dev, chan);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_TX_POWER: case NG_NETOPT_TX_POWER:
if (len > sizeof(int16_t)) { if (len > sizeof(int16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
ng_at86rf2xx_set_txpower(dev, *((int16_t *)val)); ng_at86rf2xx_set_txpower(dev, *((int16_t *)val));
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_STATE: case NG_NETOPT_STATE:
if (len > sizeof(ng_netconf_state_t)) { if (len > sizeof(ng_netopt_state_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
return _set_state(dev, *((ng_netconf_state_t *)val)); return _set_state(dev, *((ng_netopt_state_t *)val));
case NETCONF_OPT_AUTOACK: case NG_NETOPT_AUTOACK:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_AUTOACK, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_AUTOACK,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RETRANS: case NG_NETOPT_RETRANS:
if (len > sizeof(uint8_t)) { if (len > sizeof(uint8_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
ng_at86rf2xx_set_max_retries(dev, *((uint8_t *)val)); ng_at86rf2xx_set_max_retries(dev, *((uint8_t *)val));
return sizeof(uint8_t); return sizeof(uint8_t);
case NETCONF_OPT_PRELOADING: case NG_NETOPT_PRELOADING:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_PRELOADING, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_PRELOADING,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_PROMISCUOUSMODE: case NG_NETOPT_PROMISCUOUSMODE:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_PROMISCUOUS, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_PROMISCUOUS,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RAWMODE: case NG_NETOPT_RAWMODE:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_RAWDUMP, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_RAWDUMP,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RX_START_IRQ: case NG_NETOPT_RX_START_IRQ:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_RX_START, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_RX_START,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_RX_END_IRQ: case NG_NETOPT_RX_END_IRQ:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_RX_END, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_RX_END,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_TX_START_IRQ: case NG_NETOPT_TX_START_IRQ:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_TX_START, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_TX_START,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
case NETCONF_OPT_TX_END_IRQ: case NG_NETOPT_TX_END_IRQ:
ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_TX_END, ng_at86rf2xx_set_option(dev, NG_AT86RF2XX_OPT_TELL_TX_END,
((bool *)val)[0]); ((bool *)val)[0]);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
default: default:
return -ENOTSUP; return -ENOTSUP;

36
drivers/xbee/xbee.c
View File

@ -597,8 +597,7 @@ static int _rem_cb(ng_netdev_t *dev, ng_netdev_event_cb_t cb)
return 0; return 0;
} }
static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, static int _get(ng_netdev_t *netdev, ng_netopt_t opt, void *value, size_t max_len)
void *value, size_t max_len)
{ {
xbee_t *dev = (xbee_t *)netdev; xbee_t *dev = (xbee_t *)netdev;
if (dev == NULL) { if (dev == NULL) {
@ -606,12 +605,12 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt,
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
return _get_addr_short(dev, (uint8_t *)value, max_len); return _get_addr_short(dev, (uint8_t *)value, max_len);
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
return _get_addr_long(dev, (uint8_t *)value, max_len); return _get_addr_long(dev, (uint8_t *)value, max_len);
case NETCONF_OPT_ADDR_LEN: case NG_NETOPT_ADDR_LEN:
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -622,7 +621,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt,
*((uint16_t *)value) = 2; *((uint16_t *)value) = 2;
} }
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_IPV6_IID: case NG_NETOPT_IPV6_IID:
if (max_len < sizeof(eui64_t)) { if (max_len < sizeof(eui64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -634,25 +633,24 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt,
} }
return sizeof(eui64_t); return sizeof(eui64_t);
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
return _get_channel(dev, (uint8_t *)value, max_len); return _get_channel(dev, (uint8_t *)value, max_len);
case NETCONF_OPT_MAX_PACKET_SIZE: case NG_NETOPT_MAX_PACKET_SIZE:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
*((uint16_t *)value) = XBEE_MAX_PAYLOAD_LENGTH; *((uint16_t *)value) = XBEE_MAX_PAYLOAD_LENGTH;
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
return _get_panid(dev, (uint8_t *)value, max_len); return _get_panid(dev, (uint8_t *)value, max_len);
case NETCONF_OPT_PROTO: case NG_NETOPT_PROTO:
return _get_proto(dev, (uint8_t *)value, max_len); return _get_proto(dev, (uint8_t *)value, max_len);
default: default:
return -ENOTSUP; return -ENOTSUP;
} }
} }
static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, static int _set(ng_netdev_t *netdev, ng_netopt_t opt, void *value, size_t value_len)
void *value, size_t value_len)
{ {
xbee_t *dev = (xbee_t *)netdev; xbee_t *dev = (xbee_t *)netdev;
if (dev == NULL) { if (dev == NULL) {
@ -660,16 +658,16 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt,
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
return _set_addr(dev, (uint8_t *)value, value_len); return _set_addr(dev, (uint8_t *)value, value_len);
case NETCONF_OPT_ADDR_LEN: case NG_NETOPT_ADDR_LEN:
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
return _set_addr_len(dev, value, value_len); return _set_addr_len(dev, value, value_len);
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
return _set_channel(dev, (uint8_t *)value, value_len); return _set_channel(dev, (uint8_t *)value, value_len);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
return _set_panid(dev, (uint8_t *)value, value_len); return _set_panid(dev, (uint8_t *)value, value_len);
case NETCONF_OPT_PROTO: case NG_NETOPT_PROTO:
return _set_proto(dev, (uint8_t *)value, value_len); return _set_proto(dev, (uint8_t *)value, value_len);
default: default:
return -ENOTSUP; return -ENOTSUP;

8
sys/include/net/ng_netapi.h
View File

@ -30,7 +30,7 @@
#include "kernel.h" #include "kernel.h"
#include "thread.h" #include "thread.h"
#include "net/ng_netconf.h" #include "net/ng_netopt.h"
#include "net/ng_nettype.h" #include "net/ng_nettype.h"
#include "net/ng_pkt.h" #include "net/ng_pkt.h"
@ -67,7 +67,7 @@ extern "C" {
* @brief Data structure to be send for setting and getting options * @brief Data structure to be send for setting and getting options
*/ */
typedef struct { typedef struct {
ng_netconf_opt_t opt; /**< the option to get/set */ ng_netopt_t opt; /**< the option to get/set */
uint16_t context; /**< (optional) context for that option */ uint16_t context; /**< (optional) context for that option */
void *data; /**< data to set or buffer to read into */ void *data; /**< data to set or buffer to read into */
uint16_t data_len; /**< size of the data / the buffer */ uint16_t data_len; /**< size of the data / the buffer */
@ -133,7 +133,7 @@ int ng_netapi_dispatch_receive(ng_nettype_t type, uint32_t demux_ctx,
* *
* @return value returned by the @ref NG_NETAPI_MSG_TYPE_ACK message * @return value returned by the @ref NG_NETAPI_MSG_TYPE_ACK message
*/ */
int ng_netapi_get(kernel_pid_t pid, ng_netconf_opt_t opt, uint16_t context, int ng_netapi_get(kernel_pid_t pid, ng_netopt_t opt, uint16_t context,
void *data, size_t max_len); void *data, size_t max_len);
/** /**
@ -148,7 +148,7 @@ int ng_netapi_get(kernel_pid_t pid, ng_netconf_opt_t opt, uint16_t context,
* *
* @return value returned by the @ref NG_NETAPI_MSG_TYPE_ACK message * @return value returned by the @ref NG_NETAPI_MSG_TYPE_ACK message
*/ */
int ng_netapi_set(kernel_pid_t pid, ng_netconf_opt_t opt, uint16_t context, int ng_netapi_set(kernel_pid_t pid, ng_netopt_t opt, uint16_t context,
void *data, size_t data_len); void *data, size_t data_len);
#ifdef __cplusplus #ifdef __cplusplus

2
sys/include/net/ng_netbase.h
View File

@ -22,7 +22,7 @@
#include "net/ng_netdev.h" #include "net/ng_netdev.h"
#include "net/ng_netapi.h" #include "net/ng_netapi.h"
#include "net/ng_netconf.h" #include "net/ng_netopt.h"
#include "net/ng_netreg.h" #include "net/ng_netreg.h"
#include "net/ng_nettype.h" #include "net/ng_nettype.h"
#include "net/ng_netif.h" #include "net/ng_netif.h"

8
sys/include/net/ng_netdev.h
View File

@ -28,7 +28,7 @@
#include "kernel.h" #include "kernel.h"
#include "net/ng_pkt.h" #include "net/ng_pkt.h"
#include "net/ng_netconf.h" #include "net/ng_netopt.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -127,8 +127,7 @@ typedef struct {
* @p max_len is too small to store the option value * @p max_len is too small to store the option value
* @return -ECANCELED if internal driver error occurred * @return -ECANCELED if internal driver error occurred
*/ */
int (*get)(ng_netdev_t *dev, ng_netconf_opt_t opt, int (*get)(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t max_len);
void *value, size_t max_len);
/** /**
* @brief Set an option value for a given network device * @brief Set an option value for a given network device
@ -144,8 +143,7 @@ typedef struct {
* @return -EINVAL if @p value is invalid * @return -EINVAL if @p value is invalid
* @return -ECANCELED if internal driver error occurred * @return -ECANCELED if internal driver error occurred
*/ */
int (*set)(ng_netdev_t *dev, ng_netconf_opt_t opt, int (*set)(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t value_len);
void *value, size_t value_len);
/** /**
* @brief This function is called by a MAC layer when a message of type * @brief This function is called by a MAC layer when a message of type

90
sys/include/net/ng_netconf.h → sys/include/net/ng_netopt.h
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @defgroup net_ng_netconf Configuration options for network APIs * @defgroup net_ng_netopt Configuration options for network APIs
* @ingroup net * @ingroup net
* @brief List of available configuration options for the * @brief List of available configuration options for the
* @ref net_ng_netdev and the @ref net_ng_netapi * @ref net_ng_netdev and the @ref net_ng_netapi
@ -20,8 +20,8 @@
* @author Oliver Hahm <oliver.hahm@inria.fr> * @author Oliver Hahm <oliver.hahm@inria.fr>
*/ */
#ifndef NG_NET_CONF_H_ #ifndef NG_NETOPT_H_
#define NG_NET_CONF_H_ #define NG_NETOPT_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -32,21 +32,21 @@ extern "C" {
* network stack, e.g. by netdev and netapi * network stack, e.g. by netdev and netapi
*/ */
typedef enum { typedef enum {
NETCONF_OPT_CHANNEL, /**< get/set channel as uint16_t in host NG_NETOPT_CHANNEL, /**< get/set channel as uint16_t in host
* byte order */ * byte order */
NETCONF_OPT_IS_CHANNEL_CLR, /**< check if channel is clear */ NG_NETOPT_IS_CHANNEL_CLR, /**< check if channel is clear */
NETCONF_OPT_ADDRESS, /**< get/set address in host byte order */ NG_NETOPT_ADDRESS, /**< get/set address in host byte order */
/** /**
* @brief get/set long address in host byte order * @brief get/set long address in host byte order
* *
* Examples for this include the EUI-64 in IEEE 802.15.4 * Examples for this include the EUI-64 in IEEE 802.15.4
*/ */
NETCONF_OPT_ADDRESS_LONG, NG_NETOPT_ADDRESS_LONG,
NETCONF_OPT_ADDR_LEN, /**< get the default address length a NG_NETOPT_ADDR_LEN, /**< get the default address length a
* network device expects as uint16_t in * network device expects as uint16_t in
* host byte order */ * host byte order */
NETCONF_OPT_SRC_LEN, /**< get/set the address length to choose NG_NETOPT_SRC_LEN, /**< get/set the address length to choose
* for the network device's source address * for the network device's source address
* as uint16_t in host byte order */ * as uint16_t in host byte order */
/** /**
@ -54,7 +54,7 @@ typedef enum {
* *
* Examples for this include the PAN ID in IEEE 802.15.4 * Examples for this include the PAN ID in IEEE 802.15.4
*/ */
NETCONF_OPT_NID, NG_NETOPT_NID,
/** /**
* @brief get the IPv6 interface identifier of a network interface as * @brief get the IPv6 interface identifier of a network interface as
@ -70,31 +70,31 @@ typedef enum {
* <a href="https://tools.ietf.org/html/rfc2464">RFC 2464</a> or * <a href="https://tools.ietf.org/html/rfc2464">RFC 2464</a> or
* <a href="https://tools.ietf.org/html/rfc4944">RFC 4944</a>). * <a href="https://tools.ietf.org/html/rfc4944">RFC 4944</a>).
*/ */
NETCONF_OPT_IPV6_IID, NG_NETOPT_IPV6_IID,
NETCONF_OPT_TX_POWER, /**< get/set the output power for radio NG_NETOPT_TX_POWER, /**< get/set the output power for radio
* devices in dBm as int16_t in host byte * devices in dBm as int16_t in host byte
* order */ * order */
NETCONF_OPT_MAX_PACKET_SIZE, /**< get/set the maximum packet size a NG_NETOPT_MAX_PACKET_SIZE, /**< get/set the maximum packet size a
* network module can handle as uint16_t * network module can handle as uint16_t
* in host byte order */ * in host byte order */
/** /**
* @brief en/disable preloading or read the current state. * @brief en/disable preloading or read the current state.
* *
* Preload using ng_netdev_driver_t::send_data() or ng_netapi_send() * Preload using ng_netdev_driver_t::send_data() or ng_netapi_send()
* respectively, send setting state to @ref NETCONF_STATE_TX * respectively, send setting state to @ref NG_NETOPT_STATE_TX
*/ */
NETCONF_OPT_PRELOADING, NG_NETOPT_PRELOADING,
NETCONF_OPT_PROMISCUOUSMODE, /**< en/disable promiscuous mode or read NG_NETOPT_PROMISCUOUSMODE, /**< en/disable promiscuous mode or read
* the current state */ * the current state */
NETCONF_OPT_AUTOACK, /**< en/disable link layer auto ACKs or read NG_NETOPT_AUTOACK, /**< en/disable link layer auto ACKs or read
* the current state */ * the current state */
NETCONF_OPT_RETRANS, /**< get/set the maximum number of NG_NETOPT_RETRANS, /**< get/set the maximum number of
retransmissions. */ retransmissions. */
NETCONF_OPT_PROTO, /**< get/set the protocol for the layer NG_NETOPT_PROTO, /**< get/set the protocol for the layer
* as type ng_nettype_t. */ * as type ng_nettype_t. */
NETCONF_OPT_STATE, /**< get/set the state of network devices as NG_NETOPT_STATE, /**< get/set the state of network devices as
* type ng_netconf_state_t */ * type ng_netopt_state_t */
NETCONF_OPT_RAWMODE, /**< en/disable the pre-processing of data NG_NETOPT_RAWMODE, /**< en/disable the pre-processing of data
* in a network device driver as type * in a network device driver as type
* ng_nettype_t */ * ng_nettype_t */
/** /**
@ -104,7 +104,7 @@ typedef enum {
* *
* @note not all transceivers may support this interrupt * @note not all transceivers may support this interrupt
*/ */
NETCONF_OPT_RX_START_IRQ, NG_NETOPT_RX_START_IRQ,
/** /**
* @brief en/disable the interrupt after packet reception. * @brief en/disable the interrupt after packet reception.
@ -114,7 +114,7 @@ typedef enum {
* @note in case a transceiver does not support this interrupt, the event * @note in case a transceiver does not support this interrupt, the event
* may be triggered by the driver * may be triggered by the driver
*/ */
NETCONF_OPT_RX_END_IRQ, NG_NETOPT_RX_END_IRQ,
/** /**
* @brief en/disable the interrupt right in the beginning of transmission. * @brief en/disable the interrupt right in the beginning of transmission.
@ -125,7 +125,7 @@ typedef enum {
* @note in case a transceiver does not support this interrupt, the event * @note in case a transceiver does not support this interrupt, the event
* may be triggered by the driver * may be triggered by the driver
*/ */
NETCONF_OPT_TX_START_IRQ, NG_NETOPT_TX_START_IRQ,
/** /**
* @brief en/disable the interrupt after packet transmission. * @brief en/disable the interrupt after packet transmission.
@ -134,9 +134,9 @@ typedef enum {
* *
* @note not all transceivers may support this interrupt * @note not all transceivers may support this interrupt
*/ */
NETCONF_OPT_TX_END_IRQ, NG_NETOPT_TX_END_IRQ,
NETCONF_OPT_AUTOCCA, /**< en/disable to check automatically NG_NETOPT_AUTOCCA, /**< en/disable to check automatically
before sending the channel is clear. */ * before sending the channel is clear. */
/* add more options if needed */ /* add more options if needed */
/** /**
@ -144,42 +144,42 @@ typedef enum {
* *
* @note Interfaces are not meant to respond to that. * @note Interfaces are not meant to respond to that.
*/ */
NETCONF_OPT_NUMOF, NG_NETOPT_NUMOF,
} ng_netconf_opt_t; } ng_netopt_t;
/** /**
* @brief Binary parameter for enabling and disabling options * @brief Binary parameter for enabling and disabling options
*/ */
typedef enum { typedef enum {
NETCONF_DISABLE = 0, /**< disable a given option */ NG_NETOPT_DISABLE = 0, /**< disable a given option */
NETCONF_ENABLE = 1, /**< enable a given option */ NG_NETOPT_ENABLE = 1, /**< enable a given option */
} ng_netconf_enable_t; } ng_netopt_enable_t;
/** /**
* @brief Option parameter to be used with @ref NETCONF_OPT_STATE to set or get * @brief Option parameter to be used with @ref NG_NETOPT_STATE to set or get
* the state of a network device or protocol implementation * the state of a network device or protocol implementation
*/ */
typedef enum { typedef enum {
NETCONF_STATE_OFF = 0, /**< powered off */ NG_NETOPT_STATE_OFF = 0, /**< powered off */
NETCONF_STATE_SLEEP, /**< sleep mode */ NG_NETOPT_STATE_SLEEP, /**< sleep mode */
NETCONF_STATE_IDLE, /**< idle mode, NG_NETOPT_STATE_IDLE, /**< idle mode,
* the device listens to receive packets */ * the device listens to receive packets */
NETCONF_STATE_RX, /**< receive mode, NG_NETOPT_STATE_RX, /**< receive mode,
* the device currently receives a packet */ * the device currently receives a packet */
NETCONF_STATE_TX, /**< transmit mode, NG_NETOPT_STATE_TX, /**< transmit mode,
* set: triggers transmission of a preloaded packet * set: triggers transmission of a preloaded packet
* (see *NETCONF_OPT_PRELOADING*). The resulting * (see @ref NG_NETOPT_PRELOADING*). The resulting
* state of the network device is *NETCONF_STATE_IDLE* * state of the network device is @ref NG_NETOPT_STATE_IDLE
* get: the network device is in the process of * get: the network device is in the process of
* transmitting a packet */ * transmitting a packet */
NETCONF_STATE_RESET, /**< triggers a hardware reset. The resulting NG_NETOPT_STATE_RESET, /**< triggers a hardware reset. The resulting
* state of the network device is *NETCONF_STATE_IDLE* */ * state of the network device is @ref NG_NETOPT_STATE_IDLE */
/* add other states if needed */ /* add other states if needed */
} ng_netconf_state_t; } ng_netopt_state_t;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* NG_NET_CONF_H_ */ #endif /* NG_NETOPT_H_ */
/** @} */ /** @} */

10
sys/include/net/ng_nettest.h
View File

@ -26,7 +26,7 @@
#include "kernel_types.h" #include "kernel_types.h"
#include "net/ng_netapi.h" #include "net/ng_netapi.h"
#include "net/ng_netconf.h" #include "net/ng_netopt.h"
#include "net/ng_nettype.h" #include "net/ng_nettype.h"
#include "net/ng_pkt.h" #include "net/ng_pkt.h"
#include "thread.h" #include "thread.h"
@ -105,7 +105,7 @@ typedef enum {
* @param[in] opt The option to register the getter for. * @param[in] opt The option to register the getter for.
* @param[in] cb An option getter. NULL to delete. * @param[in] cb An option getter. NULL to delete.
*/ */
void ng_nettest_register_get(ng_netconf_opt_t opt, ng_nettest_opt_cb_t cb); void ng_nettest_register_get(ng_netopt_t opt, ng_nettest_opt_cb_t cb);
/** /**
* @brief Registers a setter for an option. * @brief Registers a setter for an option.
@ -115,7 +115,7 @@ void ng_nettest_register_get(ng_netconf_opt_t opt, ng_nettest_opt_cb_t cb);
* @param[in] opt The option to register the setter for. * @param[in] opt The option to register the setter for.
* @param[in] cb An option setter. NULL to delete. * @param[in] cb An option setter. NULL to delete.
*/ */
void ng_nettest_register_set(ng_netconf_opt_t opt, ng_nettest_opt_cb_t cb); void ng_nettest_register_set(ng_netopt_t opt, ng_nettest_opt_cb_t cb);
/** /**
* @brief Test @ref NG_NETAPI_MSG_TYPE_SND command to @p pid. * @brief Test @ref NG_NETAPI_MSG_TYPE_SND command to @p pid.
@ -223,7 +223,7 @@ ng_nettest_res_t ng_nettest_receive(kernel_pid_t pid, ng_pktsnip_t *in,
* *
* @return @see ng_nettest_res_t * @return @see ng_nettest_res_t
*/ */
ng_nettest_res_t ng_nettest_get(kernel_pid_t pid, ng_netconf_opt_t opt, ng_nettest_res_t ng_nettest_get(kernel_pid_t pid, ng_netopt_t opt,
uint16_t context, void *data, size_t data_len, uint16_t context, void *data, size_t data_len,
void *exp_data, int exp_res); void *exp_data, int exp_res);
@ -242,7 +242,7 @@ ng_nettest_res_t ng_nettest_get(kernel_pid_t pid, ng_netconf_opt_t opt,
* *
* @return @see ng_nettest_res_t * @return @see ng_nettest_res_t
*/ */
ng_nettest_res_t ng_nettest_set(kernel_pid_t pid, ng_netconf_opt_t opt, ng_nettest_res_t ng_nettest_set(kernel_pid_t pid, ng_netopt_t opt,
uint16_t context, void *data, size_t data_len, uint16_t context, void *data, size_t data_len,
int exp_res); int exp_res);

56
sys/net/application_layer/ng_zep/ng_zep.c
View File

@ -56,10 +56,8 @@ static ringbuffer_t _rx_buf = RINGBUFFER_INIT(_rx_buf_array);
static int _send(ng_netdev_t *dev, ng_pktsnip_t *pkt); static int _send(ng_netdev_t *dev, ng_pktsnip_t *pkt);
static int _add_cb(ng_netdev_t *dev, ng_netdev_event_cb_t cb); static int _add_cb(ng_netdev_t *dev, ng_netdev_event_cb_t cb);
static int _rem_cb(ng_netdev_t *dev, ng_netdev_event_cb_t cb); static int _rem_cb(ng_netdev_t *dev, ng_netdev_event_cb_t cb);
static int _get(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value, static int _get(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t max_len);
size_t max_len); static int _set(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t value_len);
static int _set(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value,
size_t value_len);
static void _isr_event(ng_netdev_t *dev, uint32_t event_type); static void _isr_event(ng_netdev_t *dev, uint32_t event_type);
static const ng_netdev_driver_t _zep_driver = { static const ng_netdev_driver_t _zep_driver = {
@ -184,14 +182,14 @@ static inline void _set_uint64_ptr(uint64_t *ptr, uint64_t val)
*ptr = val; *ptr = val;
} }
static inline void _set_flag_ptr(ng_netconf_enable_t *enable, static inline void _set_flag_ptr(ng_netopt_enable_t *enable,
uint16_t flag_field, uint16_t flag) uint16_t flag_field, uint16_t flag)
{ {
if (flag_field & flag) { if (flag_field & flag) {
*enable = NETCONF_ENABLE; *enable = NG_NETOPT_ENABLE;
} }
else { else {
*enable = NETCONF_DISABLE; *enable = NG_NETOPT_DISABLE;
} }
} }
@ -329,8 +327,7 @@ static int _rem_cb(ng_netdev_t *dev, ng_netdev_event_cb_t cb)
return 0; return 0;
} }
static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, static int _get(ng_netdev_t *netdev, ng_netopt_t opt, void *value, size_t max_len)
size_t max_len)
{ {
ng_zep_t *dev = (ng_zep_t *)netdev; ng_zep_t *dev = (ng_zep_t *)netdev;
@ -339,7 +336,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -347,7 +344,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
_set_uint16_ptr(value, (uint16_t)dev->chan); _set_uint16_ptr(value, (uint16_t)dev->chan);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -355,7 +352,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
_set_uint16_ptr(value, byteorder_ltobs(dev->addr).u16); _set_uint16_ptr(value, byteorder_ltobs(dev->addr).u16);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
if (max_len < sizeof(uint64_t)) { if (max_len < sizeof(uint64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -363,7 +360,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
_set_uint64_ptr(value, byteorder_ltobll(dev->eui64).u64); _set_uint64_ptr(value, byteorder_ltobll(dev->eui64).u64);
return sizeof(uint64_t); return sizeof(uint64_t);
case NETCONF_OPT_ADDR_LEN: case NG_NETOPT_ADDR_LEN:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -377,7 +374,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -391,7 +388,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_PROTO: case NG_NETOPT_PROTO:
if (max_len < sizeof(ng_nettype_t)) { if (max_len < sizeof(ng_nettype_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -399,7 +396,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
*((ng_nettype_t *)value) = dev->proto; *((ng_nettype_t *)value) = dev->proto;
return sizeof(ng_nettype_t); return sizeof(ng_nettype_t);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -407,7 +404,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
_set_uint16_ptr(value, byteorder_ltobs(dev->pan).u16); _set_uint16_ptr(value, byteorder_ltobs(dev->pan).u16);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_IPV6_IID: case NG_NETOPT_IPV6_IID:
if (max_len < sizeof(eui64_t)) { if (max_len < sizeof(eui64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -421,7 +418,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
} }
return sizeof(eui64_t); return sizeof(eui64_t);
case NETCONF_OPT_MAX_PACKET_SIZE: case NG_NETOPT_MAX_PACKET_SIZE:
if (max_len < sizeof(uint16_t)) { if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -429,8 +426,8 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
_set_uint16_ptr(value, NG_ZEP_MAX_PKT_LENGTH); _set_uint16_ptr(value, NG_ZEP_MAX_PKT_LENGTH);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_AUTOACK: case NG_NETOPT_AUTOACK:
if (max_len < sizeof(ng_netconf_enable_t)) { if (max_len < sizeof(ng_netopt_enable_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -442,8 +439,7 @@ static int _get(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
} }
} }
static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value, static int _set(ng_netdev_t *netdev, ng_netopt_t opt, void *value, size_t value_len)
size_t value_len)
{ {
ng_zep_t *dev = (ng_zep_t *)netdev; ng_zep_t *dev = (ng_zep_t *)netdev;
@ -452,7 +448,7 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
if (value_len < sizeof(uint16_t)) { if (value_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -465,7 +461,7 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
dev->chan = *_get_uint16_ptr(value); dev->chan = *_get_uint16_ptr(value);
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
if (value_len < sizeof(be_uint16_t)) { if (value_len < sizeof(be_uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -476,7 +472,7 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
return sizeof(be_uint16_t); return sizeof(be_uint16_t);
} }
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
if (value_len < sizeof(be_uint64_t)) { if (value_len < sizeof(be_uint64_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -487,7 +483,7 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
return sizeof(be_uint64_t); return sizeof(be_uint64_t);
} }
case NETCONF_OPT_ADDR_LEN: case NG_NETOPT_ADDR_LEN:
if (value_len < sizeof(uint16_t)) { if (value_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -507,7 +503,7 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
if (value_len < sizeof(uint16_t)) { if (value_len < sizeof(uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -527,7 +523,7 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
return sizeof(uint16_t); return sizeof(uint16_t);
case NETCONF_OPT_NID: case NG_NETOPT_NID:
if (value_len < sizeof(be_uint16_t)) { if (value_len < sizeof(be_uint16_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -538,8 +534,8 @@ static int _set(ng_netdev_t *netdev, ng_netconf_opt_t opt, void *value,
return sizeof(be_uint16_t); return sizeof(be_uint16_t);
} }
case NETCONF_OPT_AUTOACK: case NG_NETOPT_AUTOACK:
if (value_len < sizeof(ng_netconf_enable_t)) { if (value_len < sizeof(ng_netopt_enable_t)) {
return -EOVERFLOW; return -EOVERFLOW;
} }

9
sys/net/crosslayer/ng_netapi/ng_netapi.c
View File

@ -36,7 +36,7 @@
* @return the value from the received ACK message * @return the value from the received ACK message
*/ */
static inline int _get_set(kernel_pid_t pid, uint16_t type, static inline int _get_set(kernel_pid_t pid, uint16_t type,
ng_netconf_opt_t opt, uint16_t context, ng_netopt_t opt, uint16_t context,
void *data, size_t data_len) void *data, size_t data_len)
{ {
msg_t cmd; msg_t cmd;
@ -70,10 +70,9 @@ static inline int _snd_rcv_dispatch(ng_nettype_t type, uint32_t demux_ctx,
uint16_t cmd, ng_pktsnip_t *pkt) uint16_t cmd, ng_pktsnip_t *pkt)
{ {
int numof = ng_netreg_num(type, demux_ctx); int numof = ng_netreg_num(type, demux_ctx);
ng_netreg_entry_t *sendto;
if (numof != 0) { if (numof != 0) {
sendto = ng_netreg_lookup(type, demux_ctx); ng_netreg_entry_t *sendto = ng_netreg_lookup(type, demux_ctx);
ng_pktbuf_hold(pkt, numof - 1); ng_pktbuf_hold(pkt, numof - 1);
@ -107,14 +106,14 @@ int ng_netapi_dispatch_receive(ng_nettype_t type, uint32_t demux_ctx,
return _snd_rcv_dispatch(type, demux_ctx, NG_NETAPI_MSG_TYPE_RCV, pkt); return _snd_rcv_dispatch(type, demux_ctx, NG_NETAPI_MSG_TYPE_RCV, pkt);
} }
int ng_netapi_get(kernel_pid_t pid, ng_netconf_opt_t opt, uint16_t context, int ng_netapi_get(kernel_pid_t pid, ng_netopt_t opt, uint16_t context,
void *data, size_t data_len) void *data, size_t data_len)
{ {
return _get_set(pid, NG_NETAPI_MSG_TYPE_GET, opt, context, return _get_set(pid, NG_NETAPI_MSG_TYPE_GET, opt, context,
data, data_len); data, data_len);
} }
int ng_netapi_set(kernel_pid_t pid, ng_netconf_opt_t opt, uint16_t context, int ng_netapi_set(kernel_pid_t pid, ng_netopt_t opt, uint16_t context,
void *data, size_t data_len) void *data, size_t data_len)
{ {
return _get_set(pid, NG_NETAPI_MSG_TYPE_SET, opt, context, return _get_set(pid, NG_NETAPI_MSG_TYPE_SET, opt, context,

14
sys/net/crosslayer/ng_nettest/ng_nettest.c
View File

@ -19,7 +19,7 @@
#include "mutex.h" #include "mutex.h"
#include "net/ng_netapi.h" #include "net/ng_netapi.h"
#include "net/ng_netif.h" #include "net/ng_netif.h"
#include "net/ng_netconf.h" #include "net/ng_netopt.h"
#include "net/ng_netreg.h" #include "net/ng_netreg.h"
#include "net/ng_pktbuf.h" #include "net/ng_pktbuf.h"
#include "timex.h" #include "timex.h"
@ -28,21 +28,21 @@
#include "net/ng_nettest.h" #include "net/ng_nettest.h"
static ng_nettest_opt_cbs_t _opt_cbs[NETCONF_OPT_NUMOF]; static ng_nettest_opt_cbs_t _opt_cbs[NG_NETOPT_NUMOF];
static mutex_t _mutex = MUTEX_INIT; static mutex_t _mutex = MUTEX_INIT;
static kernel_pid_t _pid = KERNEL_PID_UNDEF; static kernel_pid_t _pid = KERNEL_PID_UNDEF;
static char _stack[NG_NETTEST_STACK_SIZE]; static char _stack[NG_NETTEST_STACK_SIZE];
static void *_event_loop(void *arg); static void *_event_loop(void *arg);
void ng_nettest_register_get(ng_netconf_opt_t opt, ng_nettest_opt_cb_t cb) void ng_nettest_register_get(ng_netopt_t opt, ng_nettest_opt_cb_t cb)
{ {
mutex_lock(&_mutex); mutex_lock(&_mutex);
_opt_cbs[opt].get = cb; _opt_cbs[opt].get = cb;
mutex_unlock(&_mutex); mutex_unlock(&_mutex);
} }
void ng_nettest_register_set(ng_netconf_opt_t opt, ng_nettest_opt_cb_t cb) void ng_nettest_register_set(ng_netopt_t opt, ng_nettest_opt_cb_t cb)
{ {
mutex_lock(&_mutex); mutex_lock(&_mutex);
_opt_cbs[opt].set = cb; _opt_cbs[opt].set = cb;
@ -163,7 +163,7 @@ ng_nettest_res_t ng_nettest_receive(kernel_pid_t pid, ng_pktsnip_t *in,
return res; return res;
} }
ng_nettest_res_t ng_nettest_get(kernel_pid_t pid, ng_netconf_opt_t opt, ng_nettest_res_t ng_nettest_get(kernel_pid_t pid, ng_netopt_t opt,
uint16_t context, void *data, size_t data_len, uint16_t context, void *data, size_t data_len,
void *exp_data, int exp_res) void *exp_data, int exp_res)
{ {
@ -175,7 +175,7 @@ ng_nettest_res_t ng_nettest_get(kernel_pid_t pid, ng_netconf_opt_t opt,
return NG_NETTEST_SUCCESS; return NG_NETTEST_SUCCESS;
} }
ng_nettest_res_t ng_nettest_set(kernel_pid_t pid, ng_netconf_opt_t opt, ng_nettest_res_t ng_nettest_set(kernel_pid_t pid, ng_netopt_t opt,
uint16_t context, void *data, size_t data_len, uint16_t context, void *data, size_t data_len,
int exp_res) int exp_res)
{ {
@ -198,7 +198,7 @@ int ng_nettest_init(void)
void ng_nettest_reset(void) void ng_nettest_reset(void)
{ {
for (int i = 0; i < NETCONF_OPT_NUMOF; i++) { for (int i = 0; i < NG_NETOPT_NUMOF; i++) {
_opt_cbs[i].get = NULL; _opt_cbs[i].get = NULL;
_opt_cbs[i].set = NULL; _opt_cbs[i].set = NULL;
} }

38
sys/net/link_layer/ng_netdev_eth/ng_netdev_eth.c
View File

@ -56,10 +56,8 @@ static uint8_t recv_buffer[NG_ETHERNET_MAX_LEN];
static int _send_data(ng_netdev_t *netdev, ng_pktsnip_t *pkt); static int _send_data(ng_netdev_t *netdev, ng_pktsnip_t *pkt);
static int _add_event_callback(ng_netdev_t *dev, ng_netdev_event_cb_t cb); static int _add_event_callback(ng_netdev_t *dev, ng_netdev_event_cb_t cb);
static int _rem_event_callback(ng_netdev_t *dev, ng_netdev_event_cb_t cb); static int _rem_event_callback(ng_netdev_t *dev, ng_netdev_event_cb_t cb);
static int _get(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value, static int _get(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t max_len);
size_t max_len); static int _set(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t value_len);
static int _set(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value,
size_t value_len);
static void _isr_event(ng_netdev_t *dev, uint32_t event_type); static void _isr_event(ng_netdev_t *dev, uint32_t event_type);
/* netdev driver struct */ /* netdev driver struct */
@ -229,23 +227,22 @@ static inline int _get_max_pkt_sz(uint16_t *value, size_t max_len)
return sizeof(uint16_t); return sizeof(uint16_t);
} }
static inline int _get_promiscousmode(ng_netdev_eth_t *netdev, ng_netconf_enable_t *value, static inline int _get_promiscousmode(ng_netdev_eth_t *netdev, ng_netopt_enable_t *value,
size_t max_len) size_t max_len)
{ {
if (max_len != sizeof(ng_netconf_enable_t)) { if (max_len != sizeof(ng_netopt_enable_t)) {
/* value buffer not big enough */ /* value buffer not big enough */
return -EOVERFLOW; return -EOVERFLOW;
} }
dev_eth_t *dev = netdev->ethdev; dev_eth_t *dev = netdev->ethdev;
*value = (ng_netconf_enable_t)dev->driver->get_promiscous(dev); *value = (ng_netopt_enable_t)dev->driver->get_promiscous(dev);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
} }
static int _get(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value, static int _get(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t max_len)
size_t max_len)
{ {
DEBUG("ng_netdev_eth: get "); DEBUG("ng_netdev_eth: get ");
@ -255,23 +252,23 @@ static int _get(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value,
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
DEBUG("address\n"); DEBUG("address\n");
return _get_addr((ng_netdev_eth_t *)dev, value, max_len); return _get_addr((ng_netdev_eth_t *)dev, value, max_len);
case NETCONF_OPT_ADDR_LEN: case NG_NETOPT_ADDR_LEN:
DEBUG("address length\n"); DEBUG("address length\n");
return _get_addr_len(value, max_len); return _get_addr_len(value, max_len);
case NETCONF_OPT_IPV6_IID: case NG_NETOPT_IPV6_IID:
DEBUG("IPv6 IID\n"); DEBUG("IPv6 IID\n");
return _get_iid((ng_netdev_eth_t *)dev, value, max_len); return _get_iid((ng_netdev_eth_t *)dev, value, max_len);
case NETCONF_OPT_MAX_PACKET_SIZE: case NG_NETOPT_MAX_PACKET_SIZE:
DEBUG("maximum packet size\n"); DEBUG("maximum packet size\n");
return _get_max_pkt_sz(value, max_len); return _get_max_pkt_sz(value, max_len);
case NETCONF_OPT_PROMISCUOUSMODE: case NG_NETOPT_PROMISCUOUSMODE:
DEBUG("promiscous mode\n"); DEBUG("promiscous mode\n");
return _get_promiscousmode((ng_netdev_eth_t *)dev, value, max_len); return _get_promiscousmode((ng_netdev_eth_t *)dev, value, max_len);
@ -282,10 +279,10 @@ static int _get(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value,
} }
/* individual option getters to be called by _get() */ /* individual option getters to be called by _get() */
static inline int _set_promiscousmode(ng_netdev_eth_t *netdev, ng_netconf_enable_t *value, static inline int _set_promiscousmode(ng_netdev_eth_t *netdev, ng_netopt_enable_t *value,
size_t value_len) size_t value_len)
{ {
if (value_len != sizeof(ng_netconf_enable_t)) { if (value_len != sizeof(ng_netopt_enable_t)) {
/* value buffer not big enough */ /* value buffer not big enough */
return -EOVERFLOW; return -EOVERFLOW;
} }
@ -294,11 +291,10 @@ static inline int _set_promiscousmode(ng_netdev_eth_t *netdev, ng_netconf_enable
dev->driver->set_promiscous(dev, (uint8_t)*value); dev->driver->set_promiscous(dev, (uint8_t)*value);
return sizeof(ng_netconf_enable_t); return sizeof(ng_netopt_enable_t);
} }
static int _set(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value, static int _set(ng_netdev_t *dev, ng_netopt_t opt, void *value, size_t value_len)
size_t value_len)
{ {
DEBUG("ng_netdev_eth: set "); DEBUG("ng_netdev_eth: set ");
@ -308,7 +304,7 @@ static int _set(ng_netdev_t *dev, ng_netconf_opt_t opt, void *value,
} }
switch (opt) { switch (opt) {
case NETCONF_OPT_PROMISCUOUSMODE: case NG_NETOPT_PROMISCUOUSMODE:
DEBUG("promiscous mode\n"); DEBUG("promiscous mode\n");
return _set_promiscousmode((ng_netdev_eth_t *)dev, value, value_len); return _set_promiscousmode((ng_netdev_eth_t *)dev, value, value_len);

6
sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c
View File

@ -470,7 +470,7 @@ void ng_ipv6_netif_init_by_dev(void)
#ifdef MODULE_NG_SIXLOWPAN #ifdef MODULE_NG_SIXLOWPAN
ng_nettype_t if_type = NG_NETTYPE_UNDEF; ng_nettype_t if_type = NG_NETTYPE_UNDEF;
if ((ng_netapi_get(ifs[i], NETCONF_OPT_PROTO, 0, &if_type, if ((ng_netapi_get(ifs[i], NG_NETOPT_PROTO, 0, &if_type,
sizeof(if_type)) != -ENOTSUP) && sizeof(if_type)) != -ENOTSUP) &&
(if_type == NG_NETTYPE_SIXLOWPAN)) { (if_type == NG_NETTYPE_SIXLOWPAN)) {
uint16_t src_len = 8; uint16_t src_len = 8;
@ -478,13 +478,13 @@ void ng_ipv6_netif_init_by_dev(void)
ipv6_ifs[i].flags |= NG_IPV6_NETIF_FLAGS_SIXLOWPAN; ipv6_ifs[i].flags |= NG_IPV6_NETIF_FLAGS_SIXLOWPAN;
/* use EUI-64 (8-byte address) for IID generation and for sending /* use EUI-64 (8-byte address) for IID generation and for sending
* packets */ * packets */
ng_netapi_set(ifs[i], NETCONF_OPT_SRC_LEN, 0, &src_len, ng_netapi_set(ifs[i], NG_NETOPT_SRC_LEN, 0, &src_len,
sizeof(src_len)); /* don't care for result */ sizeof(src_len)); /* don't care for result */
} }
#endif #endif
if ((ng_netapi_get(ifs[i], NETCONF_OPT_IPV6_IID, 0, &iid, if ((ng_netapi_get(ifs[i], NG_NETOPT_IPV6_IID, 0, &iid,
sizeof(eui64_t)) < 0)) { sizeof(eui64_t)) < 0)) {
mutex_unlock(&ipv6_if->mutex); mutex_unlock(&ipv6_if->mutex);
continue; continue;

6
sys/net/network_layer/ng_ndp/ng_ndp.c
View File

@ -640,17 +640,17 @@ static uint16_t _get_l2src(uint8_t *l2src, size_t l2src_size, kernel_pid_t iface
const uint16_t max_short_len = 6; const uint16_t max_short_len = 6;
/* try getting source address */ /* try getting source address */
if ((ng_netapi_get(iface, NETCONF_OPT_SRC_LEN, 0, &l2src_len, if ((ng_netapi_get(iface, NG_NETOPT_SRC_LEN, 0, &l2src_len,
sizeof(l2src_len)) >= 0) && sizeof(l2src_len)) >= 0) &&
(l2src_len > max_short_len)) { (l2src_len > max_short_len)) {
try_long = true; try_long = true;
} }
if (try_long && ((res = ng_netapi_get(iface, NETCONF_OPT_ADDRESS_LONG, 0, if (try_long && ((res = ng_netapi_get(iface, NG_NETOPT_ADDRESS_LONG, 0,
l2src, l2src_size)) > max_short_len)) { l2src, l2src_size)) > max_short_len)) {
l2src_len = (uint16_t)res; l2src_len = (uint16_t)res;
} }
else if ((res = ng_netapi_get(iface, NETCONF_OPT_ADDRESS, 0, l2src, else if ((res = ng_netapi_get(iface, NG_NETOPT_ADDRESS, 0, l2src,
l2src_size)) >= 0) { l2src_size)) >= 0) {
l2src_len = (uint16_t)res; l2src_len = (uint16_t)res;
} }

2
sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
View File

@ -515,7 +515,7 @@ bool ng_sixlowpan_iphc_encode(ng_pktsnip_t *pkt)
} }
else { else {
/* but take from driver otherwise */ /* but take from driver otherwise */
ng_netapi_get(netif_hdr->if_pid, NETCONF_OPT_IPV6_IID, 0, &iid, ng_netapi_get(netif_hdr->if_pid, NG_NETOPT_IPV6_IID, 0, &iid,
sizeof(eui64_t)); sizeof(eui64_t));
} }

2
sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
View File

@ -195,7 +195,7 @@ static void _send(ng_pktsnip_t *pkt)
iface = ng_sixlowpan_netif_get(hdr->if_pid); iface = ng_sixlowpan_netif_get(hdr->if_pid);
if (iface == NULL) { if (iface == NULL) {
if (ng_netapi_get(hdr->if_pid, NETCONF_OPT_MAX_PACKET_SIZE, if (ng_netapi_get(hdr->if_pid, NG_NETOPT_MAX_PACKET_SIZE,
0, &max_frag_size, sizeof(max_frag_size)) < 0) { 0, &max_frag_size, sizeof(max_frag_size)) < 0) {
/* if error we assume it works */ /* if error we assume it works */
DEBUG("6lo: can not get max packet size from interface %" DEBUG("6lo: can not get max packet size from interface %"

135
sys/shell/commands/sc_netif.c
View File

@ -29,7 +29,7 @@
#include "net/ng_ipv6/netif.h" #include "net/ng_ipv6/netif.h"
#include "net/ng_netif.h" #include "net/ng_netif.h"
#include "net/ng_netapi.h" #include "net/ng_netapi.h"
#include "net/ng_netconf.h" #include "net/ng_netopt.h"
#include "net/ng_pkt.h" #include "net/ng_pkt.h"
#include "net/ng_pktbuf.h" #include "net/ng_pktbuf.h"
#include "net/ng_netif/hdr.h" #include "net/ng_netif/hdr.h"
@ -106,30 +106,30 @@ static void _del_usage(char *cmd_name)
cmd_name); cmd_name);
} }
static void _print_netconf(ng_netconf_opt_t opt) static void _print_netopt(ng_netopt_t opt)
{ {
switch (opt) { switch (opt) {
case NETCONF_OPT_ADDRESS: case NG_NETOPT_ADDRESS:
printf("(short) address"); printf("(short) address");
break; break;
case NETCONF_OPT_ADDRESS_LONG: case NG_NETOPT_ADDRESS_LONG:
printf("long address"); printf("long address");
break; break;
case NETCONF_OPT_SRC_LEN: case NG_NETOPT_SRC_LEN:
printf("source address length"); printf("source address length");
break; break;
case NETCONF_OPT_CHANNEL: case NG_NETOPT_CHANNEL:
printf("channel"); printf("channel");
break; break;
case NETCONF_OPT_NID: case NG_NETOPT_NID:
printf("network identifier"); printf("network identifier");
break; break;
case NETCONF_OPT_TX_POWER: case NG_NETOPT_TX_POWER:
printf("TX power [in dBm]"); printf("TX power [in dBm]");
break; break;
@ -139,25 +139,25 @@ static void _print_netconf(ng_netconf_opt_t opt)
} }
} }
static void _print_netconf_state(ng_netconf_state_t state) static void _print_netopt_state(ng_netopt_state_t state)
{ {
switch (state) { switch (state) {
case NETCONF_STATE_OFF: case NG_NETOPT_STATE_OFF:
printf("OFF"); printf("OFF");
break; break;
case NETCONF_STATE_SLEEP: case NG_NETOPT_STATE_SLEEP:
printf("SLEEP"); printf("SLEEP");
break; break;
case NETCONF_STATE_IDLE: case NG_NETOPT_STATE_IDLE:
printf("IDLE"); printf("IDLE");
break; break;
case NETCONF_STATE_RX: case NG_NETOPT_STATE_RX:
printf("RX"); printf("RX");
break; break;
case NETCONF_STATE_TX: case NG_NETOPT_STATE_TX:
printf("TX"); printf("TX");
break; break;
case NETCONF_STATE_RESET: case NG_NETOPT_STATE_RESET:
printf("RESET"); printf("RESET");
break; break;
default: default:
@ -172,8 +172,8 @@ static void _netif_list(kernel_pid_t dev)
uint16_t u16; uint16_t u16;
int16_t i16; int16_t i16;
int res; int res;
ng_netconf_state_t state; ng_netopt_state_t state;
ng_netconf_enable_t enable; ng_netopt_enable_t enable;
bool linebreak = false; bool linebreak = false;
#ifdef MODULE_NG_IPV6_NETIF #ifdef MODULE_NG_IPV6_NETIF
ng_ipv6_netif_t *entry = ng_ipv6_netif_get(dev); ng_ipv6_netif_t *entry = ng_ipv6_netif_get(dev);
@ -183,7 +183,7 @@ static void _netif_list(kernel_pid_t dev)
printf("Iface %2d ", dev); printf("Iface %2d ", dev);
res = ng_netapi_get(dev, NETCONF_OPT_ADDRESS, 0, hwaddr, sizeof(hwaddr)); res = ng_netapi_get(dev, NG_NETOPT_ADDRESS, 0, hwaddr, sizeof(hwaddr));
if (res >= 0) { if (res >= 0) {
char hwaddr_str[res * 3]; char hwaddr_str[res * 3];
@ -193,34 +193,34 @@ static void _netif_list(kernel_pid_t dev)
printf(" "); printf(" ");
} }
res = ng_netapi_get(dev, NETCONF_OPT_CHANNEL, 0, &u16, sizeof(u16)); res = ng_netapi_get(dev, NG_NETOPT_CHANNEL, 0, &u16, sizeof(u16));
if (res >= 0) { if (res >= 0) {
printf(" Channel: %" PRIu16 " ", u16); printf(" Channel: %" PRIu16 " ", u16);
} }
res = ng_netapi_get(dev, NETCONF_OPT_NID, 0, &u16, sizeof(u16)); res = ng_netapi_get(dev, NG_NETOPT_NID, 0, &u16, sizeof(u16));
if (res >= 0) { if (res >= 0) {
printf(" NID: 0x%" PRIx16 " ", u16); printf(" NID: 0x%" PRIx16 " ", u16);
} }
res = ng_netapi_get(dev, NETCONF_OPT_TX_POWER, 0, &i16, sizeof(i16)); res = ng_netapi_get(dev, NG_NETOPT_TX_POWER, 0, &i16, sizeof(i16));
if (res >= 0) { if (res >= 0) {
printf(" TX-Power: %" PRIi16 "dBm ", i16); printf(" TX-Power: %" PRIi16 "dBm ", i16);
} }
res = ng_netapi_get(dev, NETCONF_OPT_STATE, 0, &state, sizeof(state)); res = ng_netapi_get(dev, NG_NETOPT_STATE, 0, &state, sizeof(state));
if (res >= 0) { if (res >= 0) {
printf(" State: "); printf(" State: ");
_print_netconf_state(state); _print_netopt_state(state);
} }
printf("\n "); printf("\n ");
res = ng_netapi_get(dev, NETCONF_OPT_ADDRESS_LONG, 0, hwaddr, sizeof(hwaddr)); res = ng_netapi_get(dev, NG_NETOPT_ADDRESS_LONG, 0, hwaddr, sizeof(hwaddr));
if (res >= 0) { if (res >= 0) {
char hwaddr_str[res * 3]; char hwaddr_str[res * 3];
@ -230,30 +230,30 @@ static void _netif_list(kernel_pid_t dev)
printf("\n "); printf("\n ");
} }
res = ng_netapi_get(dev, NETCONF_OPT_PROMISCUOUSMODE, 0, &enable, sizeof(enable)); res = ng_netapi_get(dev, NG_NETOPT_PROMISCUOUSMODE, 0, &enable, sizeof(enable));
if ((res >= 0) && (enable == NETCONF_ENABLE)) { if ((res >= 0) && (enable == NG_NETOPT_ENABLE)) {
printf("PROMISC "); printf("PROMISC ");
linebreak = true; linebreak = true;
} }
res = ng_netapi_get(dev, NETCONF_OPT_AUTOACK, 0, &enable, sizeof(enable)); res = ng_netapi_get(dev, NG_NETOPT_AUTOACK, 0, &enable, sizeof(enable));
if ((res >= 0) && (enable == NETCONF_ENABLE)) { if ((res >= 0) && (enable == NG_NETOPT_ENABLE)) {
printf("AUTOACK "); printf("AUTOACK ");
linebreak = true; linebreak = true;
} }
res = ng_netapi_get(dev, NETCONF_OPT_PRELOADING, 0, &enable, sizeof(enable)); res = ng_netapi_get(dev, NG_NETOPT_PRELOADING, 0, &enable, sizeof(enable));
if ((res >= 0) && (enable == NETCONF_ENABLE)) { if ((res >= 0) && (enable == NG_NETOPT_ENABLE)) {
printf("PRELOAD "); printf("PRELOAD ");
linebreak = true; linebreak = true;
} }
res = ng_netapi_get(dev, NETCONF_OPT_RAWMODE, 0, &enable, sizeof(enable)); res = ng_netapi_get(dev, NG_NETOPT_RAWMODE, 0, &enable, sizeof(enable));
if ((res >= 0) && (enable == NETCONF_ENABLE)) { if ((res >= 0) && (enable == NG_NETOPT_ENABLE)) {
printf("RAWMODE "); printf("RAWMODE ");
linebreak = true; linebreak = true;
} }
@ -278,7 +278,7 @@ static void _netif_list(kernel_pid_t dev)
printf("\n "); printf("\n ");
} }
res = ng_netapi_get(dev, NETCONF_OPT_SRC_LEN, 0, &u16, sizeof(u16)); res = ng_netapi_get(dev, NG_NETOPT_SRC_LEN, 0, &u16, sizeof(u16));
if (res >= 0) { if (res >= 0) {
printf("Source address length: %" PRIu16 "\n ", u16); printf("Source address length: %" PRIu16 "\n ", u16);
@ -322,8 +322,7 @@ static void _netif_list(kernel_pid_t dev)
puts(""); puts("");
} }
static int _netif_set_u16(kernel_pid_t dev, ng_netconf_opt_t opt, static int _netif_set_u16(kernel_pid_t dev, ng_netopt_t opt, char *u16_str)
char *u16_str)
{ {
unsigned int res; unsigned int res;
bool hex = false; bool hex = false;
@ -353,13 +352,13 @@ static int _netif_set_u16(kernel_pid_t dev, ng_netconf_opt_t opt,
if (ng_netapi_set(dev, opt, 0, (uint16_t *)&res, sizeof(uint16_t)) < 0) { if (ng_netapi_set(dev, opt, 0, (uint16_t *)&res, sizeof(uint16_t)) < 0) {
printf("error: unable to set "); printf("error: unable to set ");
_print_netconf(opt); _print_netopt(opt);
puts(""); puts("");
return 1; return 1;
} }
printf("success: set "); printf("success: set ");
_print_netconf(opt); _print_netopt(opt);
printf(" on interface %" PRIkernel_pid " to ", dev); printf(" on interface %" PRIkernel_pid " to ", dev);
if (hex) { if (hex) {
@ -372,29 +371,28 @@ static int _netif_set_u16(kernel_pid_t dev, ng_netconf_opt_t opt,
return 0; return 0;
} }
static int _netif_set_i16(kernel_pid_t dev, ng_netconf_opt_t opt, static int _netif_set_i16(kernel_pid_t dev, ng_netopt_t opt, char *i16_str)
char *i16_str)
{ {
int16_t val = (int16_t)atoi(i16_str); int16_t val = (int16_t)atoi(i16_str);
if (ng_netapi_set(dev, opt, 0, (int16_t *)&val, sizeof(int16_t)) < 0) { if (ng_netapi_set(dev, opt, 0, (int16_t *)&val, sizeof(int16_t)) < 0) {
printf("error: unable to set "); printf("error: unable to set ");
_print_netconf(opt); _print_netopt(opt);
puts(""); puts("");
return 1; return 1;
} }
printf("success: set "); printf("success: set ");
_print_netconf(opt); _print_netopt(opt);
printf(" on interface %" PRIkernel_pid " to %i\n", dev, val); printf(" on interface %" PRIkernel_pid " to %i\n", dev, val);
return 0; return 0;
} }
static int _netif_set_flag(kernel_pid_t dev, ng_netconf_opt_t opt, static int _netif_set_flag(kernel_pid_t dev, ng_netopt_t opt,
ng_netconf_enable_t set) ng_netopt_enable_t set)
{ {
if (ng_netapi_set(dev, opt, 0, &set, sizeof(ng_netconf_enable_t)) < 0) { if (ng_netapi_set(dev, opt, 0, &set, sizeof(ng_netopt_enable_t)) < 0) {
puts("error: unable to set option"); puts("error: unable to set option");
return 1; return 1;
} }
@ -402,8 +400,7 @@ static int _netif_set_flag(kernel_pid_t dev, ng_netconf_opt_t opt,
return 0; return 0;
} }
static int _netif_set_addr(kernel_pid_t dev, ng_netconf_opt_t opt, static int _netif_set_addr(kernel_pid_t dev, ng_netopt_t opt, char *addr_str)
char *addr_str)
{ {
uint8_t addr[MAX_ADDR_LEN]; uint8_t addr[MAX_ADDR_LEN];
size_t addr_len = ng_netif_addr_from_str(addr, sizeof(addr), addr_str); size_t addr_len = ng_netif_addr_from_str(addr, sizeof(addr), addr_str);
@ -417,13 +414,13 @@ static int _netif_set_addr(kernel_pid_t dev, ng_netconf_opt_t opt,
if (ng_netapi_set(dev, opt, 0, addr, addr_len) < 0) { if (ng_netapi_set(dev, opt, 0, addr, addr_len) < 0) {
printf("error: unable to set "); printf("error: unable to set ");
_print_netconf(opt); _print_netopt(opt);
puts(""); puts("");
return 1; return 1;
} }
printf("success: set "); printf("success: set ");
_print_netconf(opt); _print_netopt(opt);
printf(" on interface %" PRIkernel_pid " to %s\n", dev, addr_str); printf(" on interface %" PRIkernel_pid " to %s\n", dev, addr_str);
return 0; return 0;
@ -431,35 +428,35 @@ static int _netif_set_addr(kernel_pid_t dev, ng_netconf_opt_t opt,
static int _netif_set_state(kernel_pid_t dev, char *state_str) static int _netif_set_state(kernel_pid_t dev, char *state_str)
{ {
ng_netconf_state_t state; ng_netopt_state_t state;
if ((strcmp("off", state_str) == 0) || (strcmp("OFF", state_str) == 0)) { if ((strcmp("off", state_str) == 0) || (strcmp("OFF", state_str) == 0)) {
state = NETCONF_STATE_OFF; state = NG_NETOPT_STATE_OFF;
} }
else if ((strcmp("sleep", state_str) == 0) || else if ((strcmp("sleep", state_str) == 0) ||
(strcmp("SLEEP", state_str) == 0)) { (strcmp("SLEEP", state_str) == 0)) {
state = NETCONF_STATE_SLEEP; state = NG_NETOPT_STATE_SLEEP;
} }
else if ((strcmp("idle", state_str) == 0) || else if ((strcmp("idle", state_str) == 0) ||
(strcmp("IDLE", state_str) == 0)) { (strcmp("IDLE", state_str) == 0)) {
state = NETCONF_STATE_IDLE; state = NG_NETOPT_STATE_IDLE;
} }
else if ((strcmp("reset", state_str) == 0) || else if ((strcmp("reset", state_str) == 0) ||
(strcmp("RESET", state_str) == 0)) { (strcmp("RESET", state_str) == 0)) {
state = NETCONF_STATE_RESET; state = NG_NETOPT_STATE_RESET;
} }
else { else {
puts("usage: ifconfig <if_id> set state [off|sleep|idle|reset]"); puts("usage: ifconfig <if_id> set state [off|sleep|idle|reset]");
return 1; return 1;
} }
if (ng_netapi_set(dev, NETCONF_OPT_STATE, 0, if (ng_netapi_set(dev, NG_NETOPT_STATE, 0,
&state, sizeof(ng_netconf_state_t)) < 0) { &state, sizeof(ng_netopt_state_t)) < 0) {
printf("error: unable to set state to "); printf("error: unable to set state to ");
_print_netconf_state(state); _print_netopt_state(state);
puts(""); puts("");
return 1; return 1;
} }
printf("success: set state of interface %" PRIkernel_pid " to ", dev); printf("success: set state of interface %" PRIkernel_pid " to ", dev);
_print_netconf_state(state); _print_netopt_state(state);
puts(""); puts("");
return 0; return 0;
@ -468,23 +465,23 @@ static int _netif_set_state(kernel_pid_t dev, char *state_str)
static int _netif_set(char *cmd_name, kernel_pid_t dev, char *key, char *value) static int _netif_set(char *cmd_name, kernel_pid_t dev, char *key, char *value)
{ {
if ((strcmp("addr", key) == 0) || (strcmp("addr_short", key) == 0)) { if ((strcmp("addr", key) == 0) || (strcmp("addr_short", key) == 0)) {
return _netif_set_addr(dev, NETCONF_OPT_ADDRESS, value); return _netif_set_addr(dev, NG_NETOPT_ADDRESS, value);
} }
else if (strcmp("addr_long", key) == 0) { else if (strcmp("addr_long", key) == 0) {
return _netif_set_addr(dev, NETCONF_OPT_ADDRESS_LONG, value); return _netif_set_addr(dev, NG_NETOPT_ADDRESS_LONG, value);
} }
else if ((strcmp("channel", key) == 0) || (strcmp("chan", key) == 0)) { else if ((strcmp("channel", key) == 0) || (strcmp("chan", key) == 0)) {
return _netif_set_u16(dev, NETCONF_OPT_CHANNEL, value); return _netif_set_u16(dev, NG_NETOPT_CHANNEL, value);
} }
else if ((strcmp("nid", key) == 0) || (strcmp("pan", key) == 0) || else if ((strcmp("nid", key) == 0) || (strcmp("pan", key) == 0) ||
(strcmp("pan_id", key) == 0)) { (strcmp("pan_id", key) == 0)) {
return _netif_set_u16(dev, NETCONF_OPT_NID, value); return _netif_set_u16(dev, NG_NETOPT_NID, value);
} }
else if (strcmp("power", key) == 0) { else if (strcmp("power", key) == 0) {
return _netif_set_i16(dev, NETCONF_OPT_TX_POWER, value); return _netif_set_i16(dev, NG_NETOPT_TX_POWER, value);
} }
else if (strcmp("src_len", key) == 0) { else if (strcmp("src_len", key) == 0) {
return _netif_set_u16(dev, NETCONF_OPT_SRC_LEN, value); return _netif_set_u16(dev, NG_NETOPT_SRC_LEN, value);
} }
else if (strcmp("state", key) == 0) { else if (strcmp("state", key) == 0) {
return _netif_set_state(dev, value); return _netif_set_state(dev, value);
@ -496,24 +493,24 @@ static int _netif_set(char *cmd_name, kernel_pid_t dev, char *key, char *value)
static int _netif_flag(char *cmd, kernel_pid_t dev, char *flag) static int _netif_flag(char *cmd, kernel_pid_t dev, char *flag)
{ {
ng_netconf_enable_t set = NETCONF_ENABLE; ng_netopt_enable_t set = NG_NETOPT_ENABLE;
if (flag[0] == '-') { if (flag[0] == '-') {
set = NETCONF_DISABLE; set = NG_NETOPT_DISABLE;
flag++; flag++;
} }
if (strcmp(flag, "promisc") == 0) { if (strcmp(flag, "promisc") == 0) {
return _netif_set_flag(dev, NETCONF_OPT_PROMISCUOUSMODE, set); return _netif_set_flag(dev, NG_NETOPT_PROMISCUOUSMODE, set);
} }
else if (strcmp(flag, "preload") == 0) { else if (strcmp(flag, "preload") == 0) {
return _netif_set_flag(dev, NETCONF_OPT_PRELOADING, set); return _netif_set_flag(dev, NG_NETOPT_PRELOADING, set);
} }
else if (strcmp(flag, "autoack") == 0) { else if (strcmp(flag, "autoack") == 0) {
return _netif_set_flag(dev, NETCONF_OPT_AUTOACK, set); return _netif_set_flag(dev, NG_NETOPT_AUTOACK, set);
} }
else if (strcmp(flag, "raw") == 0) { else if (strcmp(flag, "raw") == 0) {
return _netif_set_flag(dev, NETCONF_OPT_RAWMODE, set); return _netif_set_flag(dev, NG_NETOPT_RAWMODE, set);
} }
else if (strcmp(flag, "6lo") == 0) { else if (strcmp(flag, "6lo") == 0) {
#ifdef MODULE_NG_IPV6_NETIF #ifdef MODULE_NG_IPV6_NETIF