Merge branch 'master' into gnrc_sixlowpan_iphc/enh/i8511

Makefile.dep

@@ -110,6 +110,7 @@ endif
 ifneq (,$(filter netdev_tap,$(USEMODULE)))
   USEMODULE += netif
   USEMODULE += netdev_eth
+  USEMODULE += iolist
 endif
 
 ifneq (,$(filter gnrc_tftp,$(USEMODULE)))

README.md

@@ -72,11 +72,12 @@ If you compile RIOT for the native cpu and include the `netdev_tap` module,
 you can specify a network interface like this: `PORT=tap0 make term`
 
 #### SETTING UP A TAP NETWORK
-There is a shellscript in `RIOT/dist/tools/tapsetup` called `tapsetup` which
+There is a shell script in `RIOT/dist/tools/tapsetup` called `tapsetup` which
 you can use to create a network of tap interfaces.
 
 *USAGE*
-To create a bridge and two (or count at your option) tap interfaces:
+
+To create a bridge and two (or `count` at your option) tap interfaces:
 
     ./dist/tools/tapsetup/tapsetup [-c [<count>]]
 

boards/common/iotlab/include/board_common.h

@@ -55,16 +55,16 @@ extern "C" {
 /** @} */
 
 /**
- * @brief   Define the interface to the AT86RF231 radio
+ * @name    Define the interface to the AT86RF231 radio
  *
  * {spi bus, spi speed, cs pin, int pin, reset pin, sleep pin}
+ * @{
  */
-#define AT86RF2XX_PARAMS_BOARD      {.spi       = SPI_DEV(0), \
-                                     .spi_clk   = SPI_CLK_5MHZ, \
-                                     .cs_pin    = GPIO_PIN(PORT_A, 4), \
-                                     .int_pin   = GPIO_PIN(PORT_C, 4), \
-                                     .sleep_pin = GPIO_PIN(PORT_A, 2), \
-                                     .reset_pin = GPIO_PIN(PORT_C, 1)}
+#define AT86RF2XX_PARAM_CS         GPIO_PIN(PORT_A, 4)
+#define AT86RF2XX_PARAM_INT        GPIO_PIN(PORT_C, 4)
+#define AT86RF2XX_PARAM_SLEEP      GPIO_PIN(PORT_A, 2)
+#define AT86RF2XX_PARAM_RESET      GPIO_PIN(PORT_C, 1)
+/** @} */
 
 /**
  * @name    LED pin definitions and handlers

boards/iotlab-a8-m3/include/board.h

@@ -7,13 +7,13 @@
  */
 
 /**
- * @defgroup    boards_iotlab-m3 IoT-LAB M3 open node
+ * @defgroup    boards_iotlab-a8-m3 IoT-LAB A8 M3 open node
  * @ingroup     boards
- * @brief       Support for the iotlab-m3 board
+ * @brief       Support for the iotlab-a8-m3 board
  * @{
  *
  * @file
- * @brief       Board specific definitions for the iotlab-m3 board
+ * @brief       Board specific definitions for the iotlab-a8-m3 board
  *
  */
 
@@ -34,22 +34,16 @@ extern "C" {
  * @name Define the interface for the L3G4200D gyroscope
  * @{
  */
-#define L3G4200D_I2C        I2C_0
-#define L3G4200D_ADDR       0x68
-#define L3G4200D_DRDY       GPIO_PIN(PORT_C,9)
-#define L3G4200D_INT        GPIO_PIN(PORT_C,6)
+#define L3G4200D_PARAM_INT2       GPIO_PIN(PORT_C, 9)
+#define L3G4200D_PARAM_INT1       GPIO_PIN(PORT_C, 6)
 /** @} */
 
 /**
  * @name Define the interface to the LSM303DLHC accelerometer and magnetometer
  * @{
  */
-#define LSM303DLHC_I2C      I2C_0
-#define LSM303DLHC_ACC_ADDR (0x19)
-#define LSM303DLHC_MAG_ADDR (0x1e)
-#define LSM303DLHC_INT1     GPIO_PIN(PORT_B,12)
-#define LSM303DLHC_INT2     GPIO_PIN(PORT_B,2)
-#define LSM303DLHC_DRDY     GPIO_PIN(PORT_A,11)
+#define LSM303DLHC_PARAM_ACC_PIN  GPIO_PIN(PORT_B, 12)
+#define LSM303DLHC_PARAM_MAG_PIN  GPIO_PIN(PORT_A, 11)
 /** @} */
 
 #ifdef __cplusplus

boards/iotlab-a8-m3/include/periph_conf.h

@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_iotlab-m3
+ * @ingroup     boards_iotlab-a8-m3
  * @{
  *
  * @file
- * @brief       Peripheral MCU configuration for the iotlab-m3 board
+ * @brief       Peripheral MCU configuration for the iotlab-a8-m3 board
  *
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>

boards/iotlab-m3/include/board.h

@@ -39,47 +39,32 @@ extern "C" {
  * @{
  */
 #define EXTFLASH_SPI        SPI_DEV(1)
-#define EXTFLASH_CS         GPIO_PIN(PORT_A,11)
-#define EXTFLASH_WRITE      GPIO_PIN(PORT_C,6)
-#define EXTFLASH_HOLD       GPIO_PIN(PORT_C,9)
-/** @} */
-
-/**
- * @name Define the interface to the ISL29020 light sensor
- * @{
- */
-#define ISL29020_I2C        I2C_0
-#define ISL29020_ADDR       0x44
+#define EXTFLASH_CS         GPIO_PIN(PORT_A, 11)
+#define EXTFLASH_WRITE      GPIO_PIN(PORT_C, 6)
+#define EXTFLASH_HOLD       GPIO_PIN(PORT_C, 9)
 /** @} */
 
 /**
  * @name Define the interface to the LPS331AP pressure sensor
  * @{
  */
-#define LPS331AP_I2C        I2C_0
-#define LPS331AP_ADDR       0x5c
+#define LPS331AP_PARAM_ADDR        (0x5C)
 /** @} */
 
 /**
  * @name Define the interface for the L3G4200D gyroscope
  * @{
  */
-#define L3G4200D_I2C        I2C_0
-#define L3G4200D_ADDR       0x68
-#define L3G4200D_DRDY       GPIO_PIN(PORT_C,0)
-#define L3G4200D_INT        GPIO_PIN(PORT_C,5)
+#define L3G4200D_PARAM_INT2        GPIO_PIN(PORT_C, 0)
+#define L3G4200D_PARAM_INT1        GPIO_PIN(PORT_C, 5)
 /** @} */
 
 /**
  * @name Define the interface to the LSM303DLHC accelerometer and magnetometer
  * @{
  */
-#define LSM303DLHC_I2C      I2C_0
-#define LSM303DLHC_ACC_ADDR (0x19)
-#define LSM303DLHC_MAG_ADDR (0x1e)
-#define LSM303DLHC_INT1     GPIO_PIN(PORT_B,12)
-#define LSM303DLHC_INT2     GPIO_PIN(PORT_B,1)
-#define LSM303DLHC_DRDY     GPIO_PIN(PORT_B,2)
+#define LSM303DLHC_PARAM_ACC_PIN   GPIO_PIN(PORT_B, 12)
+#define LSM303DLHC_PARAM_MAG_PIN   GPIO_PIN(PORT_B, 2)
 /** @} */
 
 #ifdef __cplusplus