Merge #19605 #19624 #19625

19605: drivers/at86rf2xx: setting rx timestamp based on symbol counter for ATmega*RFR2 r=maribu a=chudov 19624: pkg/tensorflow-lite: remove deprecated package r=maribu a=aabadie Use tflite-micro instead 19625: sys/hashes: remove deprecated aes cmac hashing r=maribu a=aabadie Co-authored-by: chudov <[email protected]> Co-authored-by: Alexandre Abadie <[email protected]>
RIOT-OS · May 19, 2023 · a46b49a · a46b49a
4 parents 57555ca + c52f6e7 + eefa4de + 0eb5bac
commit a46b49a
Show file tree

Hide file tree

Showing 21 changed files with 106 additions and 297 deletions.
diff --git a/cpu/atmega_common/include/cpu_conf.h b/cpu/atmega_common/include/cpu_conf.h
@@ -31,7 +31,9 @@
 extern "C" {
 #endif
 
+#ifndef THREAD_EXTRA_STACKSIZE_PRINTF
 #define THREAD_EXTRA_STACKSIZE_PRINTF    (128)
+#endif
 
 /**
  * @name           Kernel configuration

diff --git a/drivers/at86rf2xx/at86rf2xx_netdev.c b/drivers/at86rf2xx/at86rf2xx_netdev.c
@@ -319,8 +319,23 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
         at86rf2xx_fb_stop(dev);
 #endif
         radio_info->rssi = RSSI_BASE_VAL + ed;
-        DEBUG("[at86rf2xx] LQI:%d high is good, RSSI:%d high is either good or"
+        DEBUG("[at86rf2xx] LQI:%d high is good, RSSI:%d high is either good or "
               "too much interference.\n", radio_info->lqi, radio_info->rssi);
+#if AT86RF2XX_IS_PERIPH && IS_USED(MODULE_NETDEV_IEEE802154_RX_TIMESTAMP)
+        /* AT86RF2XX_IS_PERIPH means the MCU is ATmegaRFR2 that has symbol counter */
+        {
+            uint32_t rx_sc;
+            rx_sc = at86rf2xx_get_sc(dev);
+
+            /* convert counter value to ns */
+            uint64_t res = SC_TO_NS * (uint64_t)rx_sc;
+            netdev_ieee802154_rx_info_set_timestamp(radio_info, res);
+            DEBUG("[at86rf2xx] CS: %" PRIu32 " timestamp: %" PRIu32 ".%09" PRIu32 " ",
+                    rx_sc, (uint32_t)(radio_info->timestamp / NS_PER_SEC),
+                           (uint32_t)(radio_info->timestamp % NS_PER_SEC));
+        }
+#endif
+
     }
     else {
         at86rf2xx_fb_stop(dev);

diff --git a/drivers/at86rf2xx/include/at86rf2xx_internal.h b/drivers/at86rf2xx/include/at86rf2xx_internal.h
@@ -30,6 +30,8 @@
 
 #if AT86RF2XX_IS_PERIPH
 #include <string.h>
+#include "irq.h"
+#include "time_units.h"
 #endif
 #include "at86rf2xx_registers.h"
 
@@ -293,6 +295,46 @@ static inline uint8_t at86rf2xx_get_irq_flags(at86rf2xx_t *dev)
 
 }
 
+#if AT86RF2XX_IS_PERIPH
+/*
+ * Read a 32 bit register as described in section 10.3 of the datasheet: A read
+ * of the least significant byte causes the current value to be atomically
+ * captured in a temporary 32 bit registers. The remaining reads will access this
+ * register instead. Only a single 32 bit temporary register is used to provide
+ * means to atomically access them. Thus, interrupts must be disabled during the
+ * read sequence in order to prevent other threads (or ISRs) from updating the
+ * temporary 32 bit register before the reading sequence has completed.
+ */
+static inline uint32_t reg32_read(volatile uint8_t *reg_ll)
+{
+    le_uint32_t reg;
+    unsigned state = irq_disable();
+    reg.u8[0] =  reg_ll[0];
+    reg.u8[1] =  reg_ll[1];
+    reg.u8[2] =  reg_ll[2];
+    reg.u8[3] =  reg_ll[3];
+    irq_restore(state);
+    return reg.u32;
+}
+
+/**
+ * @brief Get the timestamp of the packet in symbol counter ticks
+ *
+ * @param[in] dev   pointer to the device descriptor
+ *
+ * @return the symbol counter value
+ */
+static inline uint32_t at86rf2xx_get_sc(const at86rf2xx_t *dev)
+{
+    (void) dev;
+    return reg32_read(&SCCNTLL);
+}
+
+/* Symbol counter frequency is 62500Hz. One symbol counter tick is 16us = 16000 ns*/
+#define SC_TO_NS (16000LU)
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/pkg/tensorflow-lite/Makefile b/pkg/tensorflow-lite/Makefile
diff --git a/pkg/tensorflow-lite/Makefile.dep b/pkg/tensorflow-lite/Makefile.dep
diff --git a/pkg/tensorflow-lite/Makefile.include b/pkg/tensorflow-lite/Makefile.include
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite b/pkg/tensorflow-lite/Makefile.tensorflow-lite
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite-c b/pkg/tensorflow-lite/Makefile.tensorflow-lite-c
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite-core b/pkg/tensorflow-lite/Makefile.tensorflow-lite-core
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite-hello_world b/pkg/tensorflow-lite/Makefile.tensorflow-lite-hello_world
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite-kernels b/pkg/tensorflow-lite/Makefile.tensorflow-lite-kernels
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite-kernels-internal b/pkg/tensorflow-lite/Makefile.tensorflow-lite-kernels-internal
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite-memory b/pkg/tensorflow-lite/Makefile.tensorflow-lite-memory
diff --git a/pkg/tensorflow-lite/Makefile.tensorflow-lite-micro-kernels b/pkg/tensorflow-lite/Makefile.tensorflow-lite-micro-kernels
diff --git a/pkg/tensorflow-lite/doc.txt b/pkg/tensorflow-lite/doc.txt
diff --git a/pkg/tensorflow-lite/patches/0001-global-round.patch b/pkg/tensorflow-lite/patches/0001-global-round.patch
diff --git a/sys/include/hashes/cmac.h b/sys/include/hashes/cmac.h
diff --git a/sys/include/net/gnrc/netif/hdr.h b/sys/include/net/gnrc/netif/hdr.h
@@ -29,6 +29,7 @@
 #include "net/gnrc/pkt.h"
 #include "net/gnrc/pktbuf.h"
 #include "net/gnrc/netif.h"
+#include "time_units.h"
 
 #ifdef __cplusplus
 extern "C" {