X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Fwait.h;h=a77840bcef965dc8712d32869b53f55e39436eb0;hb=64aef1f4c9296dc63d5e7b27102a276f84389a26;hp=82727be01254d93eb73f4eb9a05945df197583ff;hpb=6c296557909501b71fe344ce379e74094cf77c8e;p=qmk_firmware.git

diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h
index 82727be01..a77840bce 100644
--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -1,6 +1,8 @@
 #ifndef WAIT_H
 #define WAIT_H
 
+#include <inttypes.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -9,13 +11,20 @@ extern "C" {
 #   include <util/delay.h>
 #   define wait_ms(ms)  _delay_ms(ms)
 #   define wait_us(us)  _delay_us(us)
-#elif defined(PROTOCOL_CHIBIOS) /* __AVR__ */
+#elif defined PROTOCOL_CHIBIOS
 #   include "ch.h"
 #   define wait_ms(ms) chThdSleepMilliseconds(ms)
 #   define wait_us(us) chThdSleepMicroseconds(us)
-#elif defined(__arm__) /* __AVR__ */
+#elif defined PROTOCOL_ARM_ATSAM
+#   include "clks.h"
+#   define wait_ms(ms) CLK_delay_ms(ms)
+#   define wait_us(us) CLK_delay_us(us)
+#elif defined(__arm__)
 #   include "wait_api.h"
-#endif /* __AVR__ */
+#else  // Unit tests
+void wait_ms(uint32_t ms);
+#define wait_us(us) wait_ms(us / 1000)
+#endif
 
 #ifdef __cplusplus
 }