Merge branch 'RIOT-OS:master' into cord-doc

.mailmap

@@ -26,4 +26,6 @@ Peter Kietzmann <[email protected]>
 René Kijewski <[email protected]>
 René Kijewski <[email protected]> <[email protected]>
 Sebastian Meiling <[email protected]>
+Marian Buschsieweke <[email protected]> <[email protected]>
 Marian Buschsieweke <[email protected]> <[email protected]>
+Marian Buschsieweke <[email protected]> <[email protected]>

LOSTANDFOUND.md

@@ -302,6 +302,18 @@ therefore, have no interest in supporting this board. As result, none of the
 RIOT core contributors has access to the hardware, preventing us from doing the
 necessary testing for maintaining this board.
 
+### boards/nrf6310 [4953ba8e6759d2b1a1a1ea497a4ad1e71489195a]
+Author(s):
+- Christian Kühling <[email protected]>
+- Timo Ziegler <[email protected]>
+- Hauke Petersen <[email protected]>
+
+Reason for removal:
+- this was an early development board by Nordic which was discontinued
+ (successor: `nrf51dk`)
+- also for a `BLE DEVKIT.N` board from Mommosoft, which was discontinued as well
+- no hardware available anymore for testing, many exclusions from CI
+
 [6cad5d24771ba6199228351a11b5062cd2e9b36d]: https://github.com/RIOT-OS/RIOT/commit/6cad5d24771ba6199228351a11b5062cd2e9b36d
 [d83d08f0995a88f399e70a7d07b44dd780082436]: https://github.com/RIOT-OS/RIOT/commit/d83d08f0995a88f399e70a7d07b44dd780082436
 [cdc252ab7bd4161cc046bf93a3e55995704b24d4]: https://github.com/RIOT-OS/RIOT/commit/cdc252ab7bd4161cc046bf93a3e55995704b24d4
@@ -334,3 +346,4 @@ necessary testing for maintaining this board.
 [fe941ac9fe3f81c0f08ff3b8564cf439639abcda]: https://github.com/RIOT-OS/RIOT/commit/fe941ac9fe3f81c0f08ff3b8564cf439639abcda
 [81458c8eed8949c686d5ded652dbee10748e860b]: https://github.com/RIOT-OS/RIOT/commit/81458c8eed8949c686d5ded652dbee10748e860b
 [2b8a0d48940517f7df4e78c7a0b16024f46a8694]: https://github.com/RIOT-OS/RIOT/commit/2b8a0d48940517f7df4e78c7a0b16024f46a8694
+[4953ba8e6759d2b1a1a1ea497a4ad1e71489195a]: https://github.com/RIOT-OS/RIOT/commit/4953ba8e6759d2b1a1a1ea497a4ad1e71489195a

cpu/nrf52/radio/nrf802154/nrf802154_radio.c

@@ -119,14 +119,22 @@ static void _power_off(void)
 static bool _l2filter(uint8_t *mhr)
 {
     uint8_t dst_addr[IEEE802154_LONG_ADDRESS_LEN];
+    uint8_t src_addr[IEEE802154_LONG_ADDRESS_LEN];
     le_uint16_t dst_pan;
+    le_uint16_t src_pan;
     uint8_t pan_bcast[] = IEEE802154_PANID_BCAST;
 
-    int addr_len = ieee802154_get_dst(mhr, dst_addr, &dst_pan);
+    int dst_addr_len = ieee802154_get_dst(mhr, dst_addr, &dst_pan);
+
+    int src_addr_len = ieee802154_get_src(mhr, src_addr, &src_pan);
 
     if ((mhr[0] & IEEE802154_FCF_TYPE_MASK) == IEEE802154_FCF_TYPE_BEACON) {
-        if ((memcmp(&nrf802154_pan_id, pan_bcast, 2) == 0)) {
-            return true;
+        if (src_addr_len == IEEE802154_SHORT_ADDRESS_LEN ||
+            src_addr_len == IEEE802154_LONG_ADDRESS_LEN){
+            if ((memcmp(&nrf802154_pan_id, src_pan.u8, 2) == 0) ||
+                (memcmp(&nrf802154_pan_id, pan_bcast, 2) == 0)) {
+                return true;
+            }
         }
     }
     /* filter PAN ID */
@@ -138,11 +146,11 @@ static bool _l2filter(uint8_t *mhr)
     }
 
     /* check destination address */
-    if (((addr_len == IEEE802154_SHORT_ADDRESS_LEN) &&
-          (memcmp(nrf802154_short_addr, dst_addr, addr_len) == 0 ||
-           memcmp(ieee802154_addr_bcast, dst_addr, addr_len) == 0)) ||
-        ((addr_len == IEEE802154_LONG_ADDRESS_LEN) &&
-          (memcmp(nrf802154_long_addr, dst_addr, addr_len) == 0))) {
+    if (((dst_addr_len == IEEE802154_SHORT_ADDRESS_LEN) &&
+          (memcmp(nrf802154_short_addr, dst_addr, dst_addr_len) == 0 ||
+           memcmp(ieee802154_addr_bcast, dst_addr, dst_addr_len) == 0)) ||
+        ((dst_addr_len == IEEE802154_LONG_ADDRESS_LEN) &&
+          (memcmp(nrf802154_long_addr, dst_addr, dst_addr_len) == 0))) {
         return true;
     }
 

cpu/sam3/periph/rtt.c

@@ -88,12 +88,12 @@ void rtt_clear_alarm(void)
 
 void rtt_poweron(void)
 {
-    PMC->PMC_PCER0 |= (1 << ID_RTT);
+    PMC->PMC_PCER0 = (1 << ID_RTT);
 }
 
 void rtt_poweroff(void)
 {
-    PMC->PMC_PCER0 &= ~(1 << ID_RTT);
+    PMC->PMC_PCDR0 = (1 << ID_RTT);
 }
 
 void isr_rtt(void)

cpu/sam3/periph/spi.c

@@ -71,7 +71,7 @@ void spi_acquire(spi_t bus, spi_cs_t cs, spi_mode_t mode, spi_clk_t clk)
     /* lock bus */
     mutex_lock(&locks[bus]);
     /* enable SPI device clock */
-    PMC->PMC_PCER0 |= (1 << spi_config[bus].id);
+    PMC->PMC_PCER0 = (1 << spi_config[bus].id);
     /* set mode and speed */
     dev(bus)->SPI_CSR[0] = (SPI_CSR_SCBR(CLOCK_CORECLOCK / clk) | mode);
     dev(bus)->SPI_MR = (SPI_MR_MSTR | SPI_MR_MODFDIS);
@@ -82,7 +82,7 @@ void spi_release(spi_t bus)
 {
     /* disable device and turn off clock signal */
     dev(bus)->SPI_CR = 0;
-    PMC->PMC_PCER0 &= ~(1 << spi_config[bus].id);
+    PMC->PMC_PCDR0 = (1 << spi_config[bus].id);
     /* release device lock */
     mutex_unlock(&locks[bus]);
 }

cpu/sam3/periph/uart.c

@@ -89,12 +89,12 @@ void uart_write(uart_t uart, const uint8_t *data, size_t len)
 
 void uart_poweron(uart_t uart)
 {
-    PMC->PMC_PCER0 |= (1 << uart_config[uart].pmc_id);
+    PMC->PMC_PCER0 = (1 << uart_config[uart].pmc_id);
 }
 
 void uart_poweroff(uart_t uart)
 {
-    PMC->PMC_PCER0 &= ~(1 << uart_config[uart].pmc_id);
+    PMC->PMC_PCDR0 = (1 << uart_config[uart].pmc_id);
 }
 
 static inline void isr_handler(int num)

doc.txt

@@ -59,6 +59,32 @@
 #   define DEVELHELP
 #endif
 
+/**
+ * @def RIOT_FILE_RELATIVE
+ * @brief   Provides the current filename relative to the RIOT base directory (RIOTBASE)
+ * @warning This only works within `*.c` and `*.cpp` files. For `*.h`/`*.hpp` files the
+ *          source compiles, however, the including `*.c`/`*.cpp` file will be
+ *          substituted.
+ * @see     `__FILE__` for absolute filenames that also work with *.h files
+ * @see     @ref RIOT_FILE_NOPATH
+ */
+#if DOXYGEN
+#   define RIOT_FILE_RELATIVE
+#endif
+
+/**
+ * @def RIOT_FILE_NOPATH
+ * @brief   Provides the current filename without the parent directory path
+ * @warning This only works within `*.c` and `*.cpp` files. For `*.h`/`*.hpp` files the
+ *          source compiles, however, the including `*.c`/`*.cpp` file will be
+ *          substituted.
+ * @see     `__FILE__` for absolute filenames that also work with *.h files
+ * @see     @ref RIOT_FILE_RELATIVE
+ */
+#if DOXYGEN
+#   define RIOT_FILE_NOPATH
+#endif
+
 /**
  * @def CONFIG_THREAD_NAMES
  * @brief   This global macro enable storage of thread names to help developers.

doc/doxygen/riot.doxyfile

@@ -2304,8 +2304,7 @@ PREDEFINED             = DOXYGEN \
                          MODULE_GNRC_SIXLOWPAN \
                          MODULE_GNRC_SIXLOWPAN_ND_ROUTER \
                          MODULE_GNRC_SIXLOWPAN_ND_BORDER_ROUTER \
-                         MODULE_GNRC_UDP \
-                         RIOT_FILE_RELATIVE
+                         MODULE_GNRC_UDP
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The