diff --git a/arch/platform/srf06-cc26xx/contiki-conf.h b/arch/platform/srf06-cc26xx/contiki-conf.h index 4a1470b40..23c086db3 100644 --- a/arch/platform/srf06-cc26xx/contiki-conf.h +++ b/arch/platform/srf06-cc26xx/contiki-conf.h @@ -50,23 +50,13 @@ /** * \name Button configurations * - * Configure a button as power on/off: We use the right button for both boards. * @{ */ -#ifndef BUTTON_SENSOR_CONF_ENABLE_SHUTDOWN -#define BUTTON_SENSOR_CONF_ENABLE_SHUTDOWN 1 -#endif /* Notify various examples that we have Buttons */ #define PLATFORM_HAS_BUTTON 1 #define PLATFORM_SUPPORTS_BUTTON_HAL 1 -/* - * Override button symbols from dev/button-sensor.h, for the examples that - * include it - */ -#define button_sensor button_left_sensor -#define button_sensor2 button_right_sensor /** @} */ /*---------------------------------------------------------------------------*/ /* Platform-specific define to signify sensor reading failure */ diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h b/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h index 41e929571..f3c1dcd0f 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h b/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h index 643d69e0b..b989311b4 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h b/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h index 66ba6d78c..df5866eee 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h b/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h index 822e776b8..047d4f920 100644 --- a/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h +++ b/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h @@ -111,15 +111,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_10 -#define BOARD_IOID_FLASH_MOSI IOID_9 -#define BOARD_IOID_FLASH_MISO IOID_8 -#define BOARD_IOID_FLASH_CS IOID_20 - -#define EXT_FLASH_SPI_PIN_SCK 10 -#define EXT_FLASH_SPI_PIN_MOSI 9 -#define EXT_FLASH_SPI_PIN_MISO 8 -#define EXT_FLASH_SPI_PIN_CS 20 +#define EXT_FLASH_SPI_PIN_SCK IOID_10 +#define EXT_FLASH_SPI_PIN_MOSI IOID_9 +#define EXT_FLASH_SPI_PIN_MISO IOID_8 +#define EXT_FLASH_SPI_PIN_CS IOID_20 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h b/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h index 6fdab1295..c9999c219 100644 --- a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h +++ b/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h @@ -137,15 +137,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_17 -#define BOARD_IOID_FLASH_MOSI IOID_19 -#define BOARD_IOID_FLASH_MISO IOID_18 -#define BOARD_IOID_FLASH_CS IOID_14 - -#define EXT_FLASH_SPI_PIN_SCK 17 -#define EXT_FLASH_SPI_PIN_MOSI 19 -#define EXT_FLASH_SPI_PIN_MISO 18 -#define EXT_FLASH_SPI_PIN_CS 14 +#define EXT_FLASH_SPI_PIN_SCK IOID_17 +#define EXT_FLASH_SPI_PIN_MOSI IOID_19 +#define EXT_FLASH_SPI_PIN_MISO IOID_18 +#define EXT_FLASH_SPI_PIN_CS IOID_14 #define EXT_FLASH_DEVICE_ID 0x14 #define EXT_FLASH_MID 0xC2 diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h b/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h index dda3e46e5..4784815a4 100644 --- a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h +++ b/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h @@ -139,15 +139,10 @@ */ #define EXT_FLASH_SPI_CONTROLLER SPI_CONTROLLER_SPI0 -#define BOARD_IOID_FLASH_SCK IOID_17 -#define BOARD_IOID_FLASH_MOSI IOID_19 -#define BOARD_IOID_FLASH_MISO IOID_18 -#define BOARD_IOID_FLASH_CS IOID_14 - -#define EXT_FLASH_SPI_PIN_SCK 17 -#define EXT_FLASH_SPI_PIN_MOSI 19 -#define EXT_FLASH_SPI_PIN_MISO 18 -#define EXT_FLASH_SPI_PIN_CS 14 +#define EXT_FLASH_SPI_PIN_SCK IOID_17 +#define EXT_FLASH_SPI_PIN_MOSI IOID_19 +#define EXT_FLASH_SPI_PIN_MISO IOID_18 +#define EXT_FLASH_SPI_PIN_CS IOID_14 #if SENSORTAG_CC2650_REV_1_2_0 #define EXT_FLASH_DEVICE_ID 0x12 diff --git a/examples/platform-specific/cc26xx/ble-ipv6/project-conf.h b/examples/platform-specific/cc26xx/ble-ipv6/project-conf.h index 815cfb90a..b311a2fa5 100644 --- a/examples/platform-specific/cc26xx/ble-ipv6/project-conf.h +++ b/examples/platform-specific/cc26xx/ble-ipv6/project-conf.h @@ -36,9 +36,6 @@ #ifndef PROJECT_CONF_H_ #define PROJECT_CONF_H_ -/*---------------------------------------------------------------------------*/ -/* Disable button shutdown functionality */ -#define BUTTON_SENSOR_CONF_ENABLE_SHUTDOWN 0 /*---------------------------------------------------------------------------*/ /* Change to match your configuration */ #define BOARD_CONF_DEBUGGER_DEVPACK 1 diff --git a/examples/rpl-border-router/webserver/httpd-simple.c b/examples/rpl-border-router/webserver/httpd-simple.c index d8ce76816..7ce984e6a 100644 --- a/examples/rpl-border-router/webserver/httpd-simple.c +++ b/examples/rpl-border-router/webserver/httpd-simple.c @@ -128,7 +128,8 @@ PT_THREAD(handle_output(struct httpd_state *s)) s->script = NULL; s->script = httpd_simple_get_script(&s->filename[1]); if(s->script == NULL) { - strncpy(s->filename, "/notfound.html", sizeof(s->filename)); + strncpy(s->filename, "/notfound.html", sizeof(s->filename) - 1); + s->filename[sizeof(s->filename) - 1] = '\0'; PT_WAIT_THREAD(&s->outputpt, send_headers(s, http_header_404)); PT_WAIT_THREAD(&s->outputpt, @@ -170,7 +171,8 @@ PT_THREAD(handle_input(struct httpd_state *s)) urlconv_tofilename(s->filename, s->inputbuf, sizeof(s->filename)); #else /* URLCONV */ if(s->inputbuf[1] == ISO_space) { - strncpy(s->filename, http_index_html, sizeof(s->filename)); + strncpy(s->filename, http_index_html, sizeof(s->filename) - 1); + s->filename[sizeof(s->filename) - 1] = '\0'; } else { s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0; strncpy(s->filename, s->inputbuf, sizeof(s->filename)); diff --git a/os/net/ipv6/multicast/esmrf.c b/os/net/ipv6/multicast/esmrf.c index 00619c354..5b6f1b863 100644 --- a/os/net/ipv6/multicast/esmrf.c +++ b/os/net/ipv6/multicast/esmrf.c @@ -376,7 +376,9 @@ in() static void init() { - UIP_MCAST6_STATS_INIT(NULL); + ESMRF_STATS_INIT(); + UIP_MCAST6_STATS_INIT(&stats); + uip_mcast6_route_init(); /* Register the ICMPv6 input handler */ uip_icmp6_register_input_handler(&esmrf_icmp_handler); diff --git a/os/net/ipv6/multicast/esmrf.h b/os/net/ipv6/multicast/esmrf.h index a44a87396..15857a1d4 100644 --- a/os/net/ipv6/multicast/esmrf.h +++ b/os/net/ipv6/multicast/esmrf.h @@ -68,16 +68,9 @@ /* Stats datatype */ /*---------------------------------------------------------------------------*/ struct esmrf_stats { - uint16_t mcast_in_unique; - uint16_t mcast_in_all; /* At layer 3 */ - uint16_t mcast_in_ours; /* Unique and we are a group member */ - uint16_t mcast_fwd; /* Forwarded by us but we are not the seed */ - uint16_t mcast_out; /* We are the seed */ - uint16_t mcast_bad; - uint16_t mcast_dropped; uint16_t icmp_out; uint16_t icmp_in; uint16_t icmp_bad; }; - +/*---------------------------------------------------------------------------*/ #endif /* ESMRF_H_ */ diff --git a/os/net/ipv6/multicast/smrf.h b/os/net/ipv6/multicast/smrf.h index bbe7e5e26..d69aa73a5 100644 --- a/os/net/ipv6/multicast/smrf.h +++ b/os/net/ipv6/multicast/smrf.h @@ -70,18 +70,6 @@ #define SMRF_MAX_SPREAD 4 #endif /*---------------------------------------------------------------------------*/ -/* Stats datatype */ -/*---------------------------------------------------------------------------*/ -struct smrf_stats { - uint16_t mcast_in_unique; - uint16_t mcast_in_all; /* At layer 3 */ - uint16_t mcast_in_ours; /* Unique and we are a group member */ - uint16_t mcast_fwd; /* Forwarded by us but we are not the seed */ - uint16_t mcast_out; /* We are the seed */ - uint16_t mcast_bad; - uint16_t mcast_dropped; -}; -/*---------------------------------------------------------------------------*/ #endif /* SMRF_H_ */ /*---------------------------------------------------------------------------*/ /** @} */ diff --git a/tools/code-style/uncrustify.cfg b/tools/code-style/uncrustify.cfg index 37b49a48b..7b2b353ec 100644 --- a/tools/code-style/uncrustify.cfg +++ b/tools/code-style/uncrustify.cfg @@ -35,7 +35,7 @@ sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false -align_number_left=false +align_number_right=false align_func_params=false align_same_func_call_params=false align_var_def_colon=false diff --git a/tools/serial-io/tunslip6.c b/tools/serial-io/tunslip6.c index aa8b5b9fd..48b0ecd0f 100644 --- a/tools/serial-io/tunslip6.c +++ b/tools/serial-io/tunslip6.c @@ -579,8 +579,10 @@ tun_alloc(char *dev, int tap) * IFF_NO_PI - Do not provide packet information */ ifr.ifr_flags = (tap ? IFF_TAP : IFF_TUN) | IFF_NO_PI; - if(*dev != 0) - strncpy(ifr.ifr_name, dev, IFNAMSIZ); + if(*dev != 0) { + strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name) - 1); + ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; + } if((err = ioctl(fd, TUNSETIFF, (void *) &ifr)) < 0 ) { close(fd); @@ -793,9 +795,9 @@ main(int argc, char **argv) case 's': if(strncmp("/dev/", optarg, 5) == 0) { - siodev = optarg + 5; + siodev = optarg + 5; } else { - siodev = optarg; + siodev = optarg; } break; @@ -806,10 +808,11 @@ main(int argc, char **argv) case 't': if(strncmp("/dev/", optarg, 5) == 0) { - strncpy(tundev, optarg + 5, sizeof(tundev)); + strncpy(tundev, optarg + 5, sizeof(tundev) - 1); } else { - strncpy(tundev, optarg, sizeof(tundev)); + strncpy(tundev, optarg, sizeof(tundev) - 1); } + tundev[sizeof(tundev) - 1] = '\0'; break; case 'a':