aboutsummaryrefslogtreecommitdiff
path: root/kernel/kernel.h
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-02-23 15:08:01 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-02-23 15:08:01 +0000
commit26efb8f08eb1c38ce2d09b87fb5465324033b896 (patch)
tree0927ea097af9c13f9ee57f4b60e506aa38380b8e /kernel/kernel.h
parent2acb123fbf5dadf743db122e26fb96da4a58a84c (diff)
back to monotone time
new sleep() function
Diffstat (limited to 'kernel/kernel.h')
-rw-r--r--kernel/kernel.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/kernel/kernel.h b/kernel/kernel.h
index bfcd6f9..b53634c 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -52,9 +52,9 @@
#error invalid PRESCALE value
#endif
-#define MHz ((F_CPU / 1000000) / PRESCALE)
-#define kHz ((F_CPU / 1000) / PRESCALE)
#define Hz (F_CPU / PRESCALE)
+#define kHz (Hz / 1000)
+#define MHz (kHz / 1000)
#if (!MHz)
#error MHz value too small, adjust PRESCALE and/or F_CPU
@@ -76,14 +76,6 @@
#define MSEC(T) ((uint32_t)(T) * kHz)
#define SEC(T) ((uint32_t)(T) * Hz)
-#define SEC6(T) ((uint32_t)(T) * ((F_CPU / 1000000) / PRESCALE))
-#define SEC5(T) ((uint32_t)(T) * ((F_CPU / 100000) / PRESCALE))
-#define SEC4(T) ((uint32_t)(T) * ((F_CPU / 10000) / PRESCALE))
-#define SEC3(T) ((uint32_t)(T) * ((F_CPU / 1000) / PRESCALE))
-#define SEC2(T) ((uint32_t)(T) * ((F_CPU / 100) / PRESCALE))
-#define SEC1(T) ((uint32_t)(T) * ((F_CPU / 10) / PRESCALE))
-#define SEC0(T) ((uint32_t)(T) * ((F_CPU / 1) / PRESCALE))
-
/* __BEGIN_DECLS */
void init(uint8_t stack);
@@ -93,7 +85,7 @@ void wait(uint8_t sema);
void signal(void);
void suspend(void);
-void sleep(uint32_t ticks);
+void sleep(uint32_t sec, uint32_t usec);
void yield(void);
uint32_t now(void);