RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #5880 from OlegHahm/fix_debug_newlines

Browse Source 
debug: add missing line breaks
This commit is contained in:
Martine Lenders 2016-09-28 15:21:28 +02:00 committed by GitHub
commit ff2f9983f0
19 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/lpc2387/lpc2387-lpm.c
View File

@ -103,7 +103,7 @@ enum lpm_mode lpm_set(enum lpm_mode target)
lpm = target; lpm = target;
DEBUG("# LPM power down %u -> %u", lpm, target); DEBUG("# LPM power down %u -> %u\n", lpm, target);
PCON |= target_flags; // set target power mode PCON |= target_flags; // set target power mode
return last_lpm; return last_lpm;

2
cpu/native/netdev2_tap/netdev2_tap.c
View File

@ -275,7 +275,7 @@ static int _recv(netdev2_t *netdev2, void *buf, size_t len, void *info)
} }
} }
else if (nread == 0) { else if (nread == 0) {
DEBUG("_native_handle_tap_input: ignoring null-event"); DEBUG("_native_handle_tap_input: ignoring null-event\n");
} }
else { else {
errx(EXIT_FAILURE, "internal error _rx_event"); errx(EXIT_FAILURE, "internal error _rx_event");

4
drivers/ethos/ethos.c
View File

@ -299,7 +299,7 @@ static int _recv(netdev2_t *netdev, void *buf, size_t len, void* info)
if (buf) { if (buf) {
if (len < (int)dev->last_framesize) { if (len < (int)dev->last_framesize) {
DEBUG("ethos _recv(): receive buffer too small."); DEBUG("ethos _recv(): receive buffer too small.\n");
return -1; return -1;
} }
@ -307,7 +307,7 @@ static int _recv(netdev2_t *netdev, void *buf, size_t len, void* info)
dev->last_framesize = 0; dev->last_framesize = 0;
if ((tsrb_get(&dev->inbuf, buf, len) != len)) { if ((tsrb_get(&dev->inbuf, buf, len) != len)) {
DEBUG("ethos _recv(): inbuf doesn't contain enough bytes."); DEBUG("ethos _recv(): inbuf doesn't contain enough bytes.\n");
return -1; return -1;
} }

4
drivers/lsm303dlhc/lsm303dlhc.c
View File

@ -48,12 +48,12 @@ int lsm303dlhc_init(lsm303dlhc_t *dev, i2c_t i2c, gpio_t acc_pin, gpio_t mag_pin
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
i2c_init_master(i2c, I2C_SPEED_NORMAL); i2c_init_master(i2c, I2C_SPEED_NORMAL);
DEBUG("lsm303dlhc reboot "); DEBUG("lsm303dlhc reboot...");
res = i2c_write_reg(dev->i2c, dev->acc_address, res = i2c_write_reg(dev->i2c, dev->acc_address,
LSM303DLHC_REG_CTRL5_A, LSM303DLHC_REG_CTRL5_A_BOOT); LSM303DLHC_REG_CTRL5_A, LSM303DLHC_REG_CTRL5_A_BOOT);
/* Release the bus for other threads. */ /* Release the bus for other threads. */
i2c_release(dev->i2c); i2c_release(dev->i2c);
DEBUG("[OK]"); DEBUG("[OK]\n");
/* configure accelerometer */ /* configure accelerometer */
/* enable all three axis and set sample rate */ /* enable all three axis and set sample rate */

1
drivers/pir/pir.c
View File

@ -93,6 +93,7 @@ static void pir_send_msg(pir_t *dev, pir_event_t event)
dev->msg_thread_pid = KERNEL_PID_UNDEF; dev->msg_thread_pid = KERNEL_PID_UNDEF;
break; break;
} }
DEBUG("\n");
} }
static void pir_callback(void *arg) static void pir_callback(void *arg)

6
drivers/srf08/srf08.c
View File

@ -107,12 +107,12 @@ int srf08_get_distances(srf08_t *dev, uint16_t *range_array, int num_echos, srf0
i2c_release(dev->i2c); i2c_release(dev->i2c);
if (!status) { if (!status) {
DEBUG("Write the ranging command to the i2c-interface is failed"); DEBUG("Write the ranging command to the i2c-interface is failed\n");
return -1; return -1;
} }
if(max_reg_no_read > SRF08_MAX_REGISTER_NUMBER) { if(max_reg_no_read > SRF08_MAX_REGISTER_NUMBER) {
DEBUG("Too many echos requested. Max. is 17"); DEBUG("Too many echos requested. Max. is 17\n");
return -2; return -2;
} }
@ -130,7 +130,7 @@ int srf08_get_distances(srf08_t *dev, uint16_t *range_array, int num_echos, srf0
i2c_release(dev->i2c); i2c_release(dev->i2c);
if (!status) { if (!status) {
DEBUG("Read the echo bytes from the i2c-interface is failed"); DEBUG("Read the echo bytes from the i2c-interface is failed\n");
return -3; return -3;
} }

14
pkg/nordic_softdevice_ble/src/ble-core.c
View File

@ -183,12 +183,14 @@ ble_advertising_start(void)
void void
ble_gap_addr_print(const ble_gap_addr_t *addr) ble_gap_addr_print(const ble_gap_addr_t *addr)
{ {
unsigned int i; unsigned int i;
for(i = 0; i < sizeof(addr->addr); i++) { for(i = 0; i < sizeof(addr->addr); i++) {
if(i > 0) { if (i > 0) {
DEBUG(":"); DEBUG(":");
}DEBUG("%02x", addr->addr[i]); }
}DEBUG(" (%d)", addr->addr_type); DEBUG("%02x", addr->addr[i]);
}
DEBUG(" (%d)\n", addr->addr_type);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**

4
pkg/nordic_softdevice_ble/src/ble-mac.c
View File

@ -96,7 +96,7 @@ static ble_mac_interface_t *ble_mac_interface_lookup(ble_ipsp_handle_t *handle)
static ble_mac_interface_t *ble_mac_interface_add(uint8_t peer[8], static ble_mac_interface_t *ble_mac_interface_add(uint8_t peer[8],
ble_ipsp_handle_t *handle) ble_ipsp_handle_t *handle)
{ {
DEBUG("ble_mac_interface_add()"); DEBUG("ble_mac_interface_add()\n");
for (int i = 0; i < BLE_MAC_MAX_INTERFACE_NUM; i++) { for (int i = 0; i < BLE_MAC_MAX_INTERFACE_NUM; i++) {
if (interfaces[i].handle.conn_handle == 0 && interfaces[i].handle.cid == 0) { if (interfaces[i].handle.conn_handle == 0 && interfaces[i].handle.cid == 0) {
memcpy(&interfaces[i].handle, handle, sizeof(ble_ipsp_handle_t)); memcpy(&interfaces[i].handle, handle, sizeof(ble_ipsp_handle_t));
@ -118,7 +118,7 @@ static ble_mac_interface_t *ble_mac_interface_add(uint8_t peer[8],
*/ */
static void ble_mac_interface_delete(ble_mac_interface_t *interface) static void ble_mac_interface_delete(ble_mac_interface_t *interface)
{ {
DEBUG("ble_mac_interface_delete()"); DEBUG("ble_mac_interface_delete()\n");
memset(interface, 0, sizeof(ble_mac_interface_t)); memset(interface, 0, sizeof(ble_mac_interface_t));
} }

BIN
pkg/openwsn/patches/0002-Add-RIOT-adaption.patch
View File

Binary file not shown.

4
sys/auto_init/netif/auto_init_cc110x.c
View File

@ -53,14 +53,14 @@ void auto_init_cc110x(void)
DEBUG("Initializing CC110X radio at SPI_%i\n", p->spi); DEBUG("Initializing CC110X radio at SPI_%i\n", p->spi);
int res = netdev2_cc110x_setup(&cc110x_devs[i], p); int res = netdev2_cc110x_setup(&cc110x_devs[i], p);
if (res < 0) { if (res < 0) {
DEBUG("Error initializing CC110X radio device!"); DEBUG("Error initializing CC110X radio device!\n");
} }
else { else {
gnrc_netdev2_cc110x_init(&_gnrc_netdev2_devs[i], &cc110x_devs[i]); gnrc_netdev2_cc110x_init(&_gnrc_netdev2_devs[i], &cc110x_devs[i]);
res = gnrc_netdev2_init(_stacks[i], CC110X_MAC_STACKSIZE, res = gnrc_netdev2_init(_stacks[i], CC110X_MAC_STACKSIZE,
CC110X_MAC_PRIO, "cc110x", &_gnrc_netdev2_devs[i]); CC110X_MAC_PRIO, "cc110x", &_gnrc_netdev2_devs[i]);
if (res < 0) { if (res < 0) {
DEBUG("Error starting gnrc_cc110x thread for CC110X!"); DEBUG("Error starting gnrc_cc110x thread for CC110X!\n");
} }
} }
} }

2
sys/auto_init/netif/auto_init_kw2xrf.c
View File

@ -59,7 +59,7 @@ void auto_init_kw2xrf(void)
p->int_pin); p->int_pin);
if (res < 0) { if (res < 0) {
DEBUG("Error initializing KW2xrf radio device!"); DEBUG("Error initializing KW2xrf radio device!\n");
} }
else { else {
gnrc_nomac_init(_nomac_stacks[i], gnrc_nomac_init(_nomac_stacks[i],

2
sys/auto_init/netif/auto_init_xbee.c
View File

@ -56,7 +56,7 @@ void auto_init_xbee(void)
int res = xbee_init(&xbee_devs[i], (xbee_params_t*) p); int res = xbee_init(&xbee_devs[i], (xbee_params_t*) p);
if (res < 0) { if (res < 0) {
DEBUG("Error initializing XBee radio device!"); DEBUG("Error initializing XBee radio device!\n");
} }
else { else {
gnrc_nomac_init(_nomac_stacks[i], gnrc_nomac_init(_nomac_stacks[i],

5
sys/cbor/cbor.c
View File

@ -224,6 +224,7 @@ void dump_memory(const unsigned char *data, size_t size)
for (size_t i = 0; i < size; ++i) { for (size_t i = 0; i < size; ++i) {
DEBUG("%02X", data[i]); DEBUG("%02X", data[i]);
} }
DEBUG("\n");
} }
#endif /* CBOR_NO_PRINT */ #endif /* CBOR_NO_PRINT */
@ -874,7 +875,7 @@ static size_t cbor_stream_decode_at(cbor_stream_t *stream, size_t offset, int in
offset += inner_read_bytes = cbor_stream_decode_at(stream, offset, indent + 2); offset += inner_read_bytes = cbor_stream_decode_at(stream, offset, indent + 2);
if (inner_read_bytes == 0) { if (inner_read_bytes == 0) {
DEBUG("Failed to read array item at position %d", i); DEBUG("Failed to read array item at position %d\n", i);
break; break;
} }
@ -908,7 +909,7 @@ static size_t cbor_stream_decode_at(cbor_stream_t *stream, size_t offset, int in
offset += value_read_bytes = cbor_stream_decode_at(stream, offset, indent + 2); /* value */ offset += value_read_bytes = cbor_stream_decode_at(stream, offset, indent + 2); /* value */
if (key_read_bytes == 0 || value_read_bytes == 0) { if (key_read_bytes == 0 || value_read_bytes == 0) {
DEBUG("Failed to read key-value pair at position %d", i); DEBUG("Failed to read key-value pair at position %d\n", i);
break; break;
} }

2
sys/crypto/modes/ccm.c
View File

@ -114,7 +114,7 @@ int ccm_compute_adata_mac(cipher_t* cipher, uint8_t* auth_data,
auth_data_encoded[1] = auth_data_len & 0xFF; auth_data_encoded[1] = auth_data_len & 0xFF;
auth_data_encoded[0] = (auth_data_len >> 8) & 0xFF; auth_data_encoded[0] = (auth_data_len >> 8) & 0xFF;
} else { } else {
DEBUG("UNSUPPORTED Adata length"); DEBUG("UNSUPPORTED Adata length\n");
return -1; return -1;
} }

18
sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
View File

@ -463,7 +463,7 @@ int _tftp_server(tftp_context_t *ctxt)
/* register the servers main listening port */ /* register the servers main listening port */
if (gnrc_netreg_register(GNRC_NETTYPE_UDP, &entry)) { if (gnrc_netreg_register(GNRC_NETTYPE_UDP, &entry)) {
DEBUG("tftp: error starting server."); DEBUG("tftp: error starting server.\n");
return TS_FAILED; return TS_FAILED;
} }
@ -523,7 +523,7 @@ int _tftp_do_client_transfer(tftp_context_t *ctxt)
gnrc_netreg_entry_t entry = { NULL, ctxt->src_port, thread_getpid() }; gnrc_netreg_entry_t entry = { NULL, ctxt->src_port, thread_getpid() };
if (gnrc_netreg_register(GNRC_NETTYPE_UDP, &entry)) { if (gnrc_netreg_register(GNRC_NETTYPE_UDP, &entry)) {
DEBUG("tftp: error starting server."); DEBUG("tftp: error starting server.\n");
return TS_FAILED; return TS_FAILED;
} }
@ -590,7 +590,7 @@ tftp_state _tftp_state_processes(tftp_context_t *ctxt, msg_t *m)
} }
} }
else if (m->type != GNRC_NETAPI_MSG_TYPE_RCV) { else if (m->type != GNRC_NETAPI_MSG_TYPE_RCV) {
DEBUG("tftp: unknown message"); DEBUG("tftp: unknown message\n");
gnrc_pktbuf_release(outbuf); gnrc_pktbuf_release(outbuf);
return TS_BUSY; return TS_BUSY;
} }
@ -680,7 +680,7 @@ tftp_state _tftp_state_processes(tftp_context_t *ctxt, msg_t *m)
/* check if the client negotiation was successful */ /* check if the client negotiation was successful */
if (state != TS_BUSY) { if (state != TS_BUSY) {
DEBUG("tftp: not able to send ACK"); DEBUG("tftp: not able to send ACK\n");
} }
return state; return state;
} break; } break;
@ -932,7 +932,7 @@ tftp_state _tftp_send(gnrc_pktsnip_t *buf, tftp_context_t *ctxt, size_t len)
/* down-size the packet to it's used size */ /* down-size the packet to it's used size */
if (len > TFTP_DEFAULT_DATA_SIZE) { if (len > TFTP_DEFAULT_DATA_SIZE) {
DEBUG("tftp: can't reallocate to bigger packet, buffer overflowed"); DEBUG("tftp: can't reallocate to bigger packet, buffer overflowed\n");
gnrc_pktbuf_release(buf); gnrc_pktbuf_release(buf);
if (ctxt->stop_cb) { if (ctxt->stop_cb) {
@ -944,7 +944,7 @@ tftp_state _tftp_send(gnrc_pktsnip_t *buf, tftp_context_t *ctxt, size_t len)
else if (gnrc_pktbuf_realloc_data(buf, len) != 0) { else if (gnrc_pktbuf_realloc_data(buf, len) != 0) {
assert(false); assert(false);
DEBUG("tftp: failed to reallocate data snippet"); DEBUG("tftp: failed to reallocate data snippet\n");
gnrc_pktbuf_release(buf); gnrc_pktbuf_release(buf);
/* inform the user that we can't reallocate */ /* inform the user that we can't reallocate */
@ -960,7 +960,7 @@ tftp_state _tftp_send(gnrc_pktsnip_t *buf, tftp_context_t *ctxt, size_t len)
dst_port.u16 = ctxt->dst_port; dst_port.u16 = ctxt->dst_port;
udp = gnrc_udp_hdr_build(buf, src_port.u16, dst_port.u16); udp = gnrc_udp_hdr_build(buf, src_port.u16, dst_port.u16);
if (udp == NULL) { if (udp == NULL) {
DEBUG("tftp: error unable to allocate UDP header"); DEBUG("tftp: error unable to allocate UDP header\n");
gnrc_pktbuf_release(buf); gnrc_pktbuf_release(buf);
if (ctxt->stop_cb) { if (ctxt->stop_cb) {
@ -973,7 +973,7 @@ tftp_state _tftp_send(gnrc_pktsnip_t *buf, tftp_context_t *ctxt, size_t len)
/* allocate IPv6 header */ /* allocate IPv6 header */
ip = gnrc_ipv6_hdr_build(udp, NULL, &(ctxt->peer)); ip = gnrc_ipv6_hdr_build(udp, NULL, &(ctxt->peer));
if (ip == NULL) { if (ip == NULL) {
DEBUG("tftp: error unable to allocate IPv6 header"); DEBUG("tftp: error unable to allocate IPv6 header\n");
gnrc_pktbuf_release(udp); gnrc_pktbuf_release(udp);
if (ctxt->stop_cb) { if (ctxt->stop_cb) {
@ -987,7 +987,7 @@ tftp_state _tftp_send(gnrc_pktsnip_t *buf, tftp_context_t *ctxt, size_t len)
if (gnrc_netapi_dispatch_send(GNRC_NETTYPE_UDP, GNRC_NETREG_DEMUX_CTX_ALL, if (gnrc_netapi_dispatch_send(GNRC_NETTYPE_UDP, GNRC_NETREG_DEMUX_CTX_ALL,
ip) == 0) { ip) == 0) {
/* if send failed inform the user */ /* if send failed inform the user */
DEBUG("tftp: error unable to locate UDP thread"); DEBUG("tftp: error unable to locate UDP thread\n");
gnrc_pktbuf_release(ip); gnrc_pktbuf_release(ip);
if (ctxt->stop_cb) { if (ctxt->stop_cb) {

2
sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_eth.c
View File

@ -145,7 +145,7 @@ static int _send(gnrc_netdev2_t *gnrc_netdev2, gnrc_pktsnip_t *pkt)
netdev2_t *dev = gnrc_netdev2->dev; netdev2_t *dev = gnrc_netdev2->dev;
if (pkt == NULL) { if (pkt == NULL) {
DEBUG("gnrc_netdev2_eth: pkt was NULL"); DEBUG("gnrc_netdev2_eth: pkt was NULL\n");
return -EINVAL; return -EINVAL;
} }

2
sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
View File

@ -391,7 +391,7 @@ static void _send_to_iface(kernel_pid_t iface, gnrc_pktsnip_t *pkt)
if (if_entry->flags & GNRC_IPV6_NETIF_FLAGS_SIXLOWPAN) { if (if_entry->flags & GNRC_IPV6_NETIF_FLAGS_SIXLOWPAN) {
DEBUG("ipv6: send to 6LoWPAN instead\n"); DEBUG("ipv6: send to 6LoWPAN instead\n");
if (!gnrc_netapi_dispatch_send(GNRC_NETTYPE_SIXLOWPAN, GNRC_NETREG_DEMUX_CTX_ALL, pkt)) { if (!gnrc_netapi_dispatch_send(GNRC_NETTYPE_SIXLOWPAN, GNRC_NETREG_DEMUX_CTX_ALL, pkt)) {
DEBUG("ipv6: no 6LoWPAN thread found"); DEBUG("ipv6: no 6LoWPAN thread found\n");
gnrc_pktbuf_release(pkt); gnrc_pktbuf_release(pkt);
} }
return; return;

2
sys/net/gnrc/network_layer/ipv6/netif/gnrc_ipv6_netif.c
View File

@ -73,7 +73,7 @@ static ipv6_addr_t *_add_addr_to_entry(gnrc_ipv6_netif_t *entry, const ipv6_addr
} }
if (!tmp_addr) { if (!tmp_addr) {
DEBUG("ipv6 netif: couldn't add %s/%" PRIu8 " to interface %" PRIkernel_pid "\n: No space left.", DEBUG("ipv6 netif: couldn't add %s/%" PRIu8 " to interface %" PRIkernel_pid "\n: No space left.\n",
ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)), ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)),
prefix_len, entry->pid); prefix_len, entry->pid);
return NULL; return NULL;

6
sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c
View File

@ -401,16 +401,16 @@ gnrc_rpl_instance_t *gnrc_rpl_root_instance_init(uint8_t instance_id, ipv6_addr_
inst->max_rank_inc = GNRC_RPL_DEFAULT_MAX_RANK_INCREASE; inst->max_rank_inc = GNRC_RPL_DEFAULT_MAX_RANK_INCREASE;
} }
else if (inst == NULL) { else if (inst == NULL) {
DEBUG("RPL: could not allocate memory for a new instance with id %d", instance_id); DEBUG("RPL: could not allocate memory for a new instance with id %d\n", instance_id);
return NULL; return NULL;
} }
else { else {
DEBUG("RPL: instance (%d) exists", instance_id); DEBUG("RPL: instance (%d) exists\n", instance_id);
return NULL; return NULL;
} }
if (!gnrc_rpl_dodag_init(inst, dodag_id, iface, netif_addr)) { if (!gnrc_rpl_dodag_init(inst, dodag_id, iface, netif_addr)) {
DEBUG("RPL: could not initialize DODAG"); DEBUG("RPL: could not initialize DODAG\n");
gnrc_rpl_instance_remove(inst); gnrc_rpl_instance_remove(inst);
return NULL; return NULL;
} }