Merge pull request #17234 from fjmolinas/pr_cocci_ztimer_fixes

sys/ztimer/xtimer2ztimer.cocci: extend and fix api replacements
RIOT-OS · Nov 19, 2021 · 4c03d10 · 4c03d10
2 parents 2226dc6 + e6a79c8
commit 4c03d10
Showing 1 changed file with 59 additions and 3 deletions.
diff --git a/sys/ztimer/xtimer2ztimer.cocci b/sys/ztimer/xtimer2ztimer.cocci
@@ -19,6 +19,20 @@ expression e;
 expression e;
 @@
 
+- xtimer_msleep(e)
++ ztimer_sleep(ZTIMER_MSEC, e)
+
+@@
+expression e;
+@@
+
+- xtimer_sleep(e)
++ ztimer_sleep(ZTIMER_MSEC, e * 1000)
+
+@@
+expression e;
+@@
+
 - xtimer_set(e)
 + ztimer_set(ZTIMER_USEC, e)
 
@@ -29,6 +43,20 @@ expression e;
 - xtimer_remove(e)
 + ztimer_remove(ZTIMER_USEC, e)
 
+@@
+expression e;
+@@
+
+- xtimer_now_usec(e)
++ ztimer_now(ZTIMER_USEC, e)
+
+@@
+expression e;
+@@
+
+- xtimer_now_msec(e)
++ ztimer_now(ZTIMER_MSEC, e)
+
 @@
 expression e, e2;
 @@
@@ -55,13 +83,13 @@ identifier i;
 @@
 
 - xtimer_now_usec()
-+ ztimer_get(ZTIMER_USEC)
++ ztimer_now(ZTIMER_USEC)
 
 @@
 @@
 
 - _xtimer_now()
-+ ztimer_get(ZTIMER_USEC)
++ ztimer_now(ZTIMER_USEC)
 
 @@
 @@
@@ -166,11 +194,39 @@ expression e;
 @@
 
 - xtimer_now()
-+ ztimer_get(ZTIMER_USEC)
++ ztimer_now(ZTIMER_USEC)
+
+@@
+@@
+
+- MODULE_XTIMER
++ MODULE_ZTIMER
 
 @@
 expression e, e2;
 @@
 
 - xtimer_periodic_wakeup(e, e2)
 + ztimer_periodic_wakeup(ZTIMER_USEC, e, e2)
+
+@@
+expression e, e2;
+@@
+
+- xtimer_set_timeout_flag(e, e2)
++ ztimer_set_timeout_flag(ZTIMER_USEC, e, e2)
+
+
+@@
+expression e, e2;
+@@
+
+- xtimer_mutex_lock_timeout(e, e2)
++ ztimer_mutex_lock_timeout(ZTIMER_USEC, e, e2)
+
+@@
+expression e, e2;
+@@
+
+- xtimer_msg_receive_timeout(e, e2)
++ ztimer_msg_receive_timeout(ZTIMER_USEC, e, e2)