Merge pull request #17381 from gschorcht/drivers/atwinc15x0_migrate_z…

…timer drivers/atwinc15x0: migrate to ztimer
RIOT-OS · Dec 13, 2021 · e20f3e5 · e20f3e5
2 parents cfaa167 + c6874df
commit e20f3e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/drivers/atwinc15x0/Makefile.dep b/drivers/atwinc15x0/Makefile.dep
@@ -1,5 +1,5 @@
 USEMODULE += netdev_eth
-USEMODULE += xtimer
+USEMODULE += ztimer_msec
 USEPKG += driver_atwinc15x0
 FEATURES_REQUIRED += periph_gpio
 FEATURES_REQUIRED += periph_gpio_irq

diff --git a/drivers/atwinc15x0/atwinc15x0_bsp.c b/drivers/atwinc15x0/atwinc15x0_bsp.c
@@ -23,7 +23,7 @@
 #include "atwinc15x0_internal.h"
 #include "mutex.h"
 #include "periph/spi.h"
-#include "xtimer.h"
+#include "ztimer.h"
 
 #define ENABLE_DEBUG 0
 #include "debug.h"
@@ -78,7 +78,7 @@ void nm_bsp_reset(void)
 
 void nm_bsp_sleep(uint32 u32TimeMsec)
 {
-    xtimer_msleep(u32TimeMsec);
+    ztimer_sleep(ZTIMER_MSEC, u32TimeMsec);
 }
 
 void nm_bsp_register_isr(tpfNmBspIsr pfIsr)

diff --git a/drivers/atwinc15x0/atwinc15x0_netdev.c b/drivers/atwinc15x0/atwinc15x0_netdev.c
@@ -33,7 +33,7 @@
 #include "log.h"
 #include "net/netdev/eth.h"
 #include "od.h"
-#include "xtimer.h"
+#include "ztimer.h"
 
 #define ENABLE_DEBUG        0
 #define ENABLE_DEBUG_DUMP   0
@@ -42,9 +42,9 @@
 #define ATWINC15X0_MAC_STR          "%02x:%02x:%02x:%02x:%02x:%02x"
 #define ATWINC15X0_MAC_STR_ARG(m)   m[0], m[1], m[2], m[3], m[4], m[5]
 
-#define ATWINC15X0_WAIT_TIME        (1 * US_PER_MS)
-#define ATWINC15X0_WAIT_TIMEOUT     (20)
-#define ATWINC15X0_WAIT_RECONNECT   (5 * US_PER_SEC)
+#define ATWINC15X0_WAIT_TIME_MS         (1)
+#define ATWINC15X0_WAIT_TIMEOUT         (20)
+#define ATWINC15X0_WAIT_RECONNECT_MS    (5000)
 
 /* Forward function declarations */
 static void _atwinc15x0_wifi_cb(uint8_t event, void *msg);
@@ -184,7 +184,7 @@ static void _atwinc15x0_wifi_cb(uint8_t type, void *msg)
                     atwinc15x0->netdev.event_callback(&atwinc15x0->netdev,
                                                       NETDEV_EVENT_LINK_DOWN);
                     /* wait and try to reconnect */
-                    xtimer_usleep(ATWINC15X0_WAIT_RECONNECT);
+                    ztimer_sleep(ZTIMER_MSEC, ATWINC15X0_WAIT_RECONNECT_MS);
                     _atwinc15x0_connect();
                     break;
                 case M2M_WIFI_CONNECTED:
@@ -381,7 +381,7 @@ static int _atwinc15x0_get(netdev_t *netdev, netopt_t opt, void *val,
             /* wait for the response with a given timeout */
             unsigned int _rssi_info_time_out = ATWINC15X0_WAIT_TIMEOUT;
             while (!_rssi_info_ready && _rssi_info_time_out--) {
-                xtimer_usleep(ATWINC15X0_WAIT_TIME);
+                ztimer_sleep(ZTIMER_MSEC, ATWINC15X0_WAIT_TIME_MS);
             }
             /* return the RSSI */
             *((int8_t *)val) = dev->rssi;