Merge pull request #17361 from fjmolinas/pr_sdcard_ztimer

drivers/sdcard_spi: convert to ztimer_usec
RIOT-OS · Dec 9, 2021 · d0eb8e2 · d0eb8e2
2 parents eba1f09 + 9747204
commit d0eb8e2
Show file tree

Hide file tree

Showing 7 changed files with 367 additions and 327 deletions.
diff --git a/drivers/sdcard_spi/Kconfig b/drivers/sdcard_spi/Kconfig
@@ -13,5 +13,5 @@ config MODULE_SDCARD_SPI
     select MODULE_PERIPH_GPIO
     select MODULE_PERIPH_SPI
     select MODULE_PERIPH_SPI_RECONFIGURE if HAS_PERIPH_SPI_RECONFIGURE
-    select MODULE_XTIMER
     select MODULE_CHECKSUM
+    select ZTIMER_USEC
diff --git a/drivers/sdcard_spi/Makefile.dep b/drivers/sdcard_spi/Makefile.dep
@@ -2,4 +2,5 @@ FEATURES_REQUIRED += periph_gpio
 FEATURES_REQUIRED += periph_spi
 FEATURES_OPTIONAL += periph_spi_reconfigure
 USEMODULE += checksum
-USEMODULE += xtimer
+USEMODULE += ztimer
+USEMODULE += ztimer_usec
diff --git a/drivers/sdcard_spi/include/sdcard_spi_internal.h b/drivers/sdcard_spi/include/sdcard_spi_internal.h
@@ -32,6 +32,7 @@ extern "C" {
 #include "periph/gpio.h"
 #include "stdbool.h"
 #include "sdcard_spi.h"
+#include "timex.h"
 
 /* number of clocks that should be applied to the card on init
    before taking further actions (see sd spec. 6.4.1.1 Power Up Time of Card) */

diff --git a/drivers/sdcard_spi/sdcard_spi.c b/drivers/sdcard_spi/sdcard_spi.c
diff --git a/tests/driver_io1_xplained/Makefile b/tests/driver_io1_xplained/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
 USEMODULE += io1_xplained
-USEMODULE += xtimer
+USEMODULE += ztimer_msec
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/driver_io1_xplained/app.config.test b/tests/driver_io1_xplained/app.config.test
@@ -3,3 +3,5 @@
 CONFIG_MODULE_IO1_XPLAINED=y
 CONFIG_MODULE_AT30TSE75X=y
 CONFIG_MODULE_SDCARD_SPI=y
+CONFIG_MODULE_ZTIMER=y
+CONFIG_MODULE_ZTIMER_MSEC=y
diff --git a/tests/driver_io1_xplained/main.c b/tests/driver_io1_xplained/main.c
@@ -21,7 +21,8 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include "xtimer.h"
+#include "timex.h"
+#include "ztimer.h"
 #include "board.h"
 
 #include "periph/gpio.h"
@@ -31,7 +32,7 @@
 #include "io1_xplained.h"
 #include "io1_xplained_params.h"
 
-#define DELAY_1S   (1U) /* 1 seconds delay between each test */
+#define DELAY_1S   (1U * MS_PER_SEC) /* 1 seconds delay between each test */
 
 static io1_xplained_t dev;
 
@@ -71,36 +72,36 @@ int main(void)
                "+-------------------------------------+\n",
                (int)temperature,
                (unsigned)((temperature - (int)temperature) * 1000));
-        xtimer_sleep(DELAY_1S);
+        ztimer_sleep(ZTIMER_MSEC, DELAY_1S);
 
         /* Card detect pin is inverted */
         if (!gpio_read(IO1_SDCARD_SPI_PARAM_DETECT)) {
             _sd_card_cid();
-            xtimer_sleep(DELAY_1S);
+            ztimer_sleep(ZTIMER_MSEC, DELAY_1S);
         }
 
         uint16_t light;
         io1_xplained_read_light_level(&light);
         printf("Light level: %i\n"
                "+-------------------------------------+\n",
                light);
-        xtimer_sleep(DELAY_1S);
+        ztimer_sleep(ZTIMER_MSEC, DELAY_1S);
 
         /* set led */
         gpio_set(IO1_LED_PIN);
-        xtimer_sleep(DELAY_1S);
+        ztimer_sleep(ZTIMER_MSEC, DELAY_1S);
 
         /* clear led */
         gpio_clear(IO1_LED_PIN);
-        xtimer_sleep(DELAY_1S);
+        ztimer_sleep(ZTIMER_MSEC, DELAY_1S);
 
         /* toggle led */
         gpio_toggle(IO1_LED_PIN);
-        xtimer_sleep(DELAY_1S);
+        ztimer_sleep(ZTIMER_MSEC, DELAY_1S);
 
         /* toggle led again */
         gpio_toggle(IO1_LED_PIN);
-        xtimer_sleep(DELAY_1S);
+        ztimer_sleep(ZTIMER_MSEC, DELAY_1S);
     }
 
     return 0;