aboutsummaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-06-13 08:21:49 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-06-13 08:21:49 +0000
commitc36da8e540b7c2ca614d497621e06dea9b993e74 (patch)
tree58a16dc4c7ce01bab4c1bb87fb4b93210722dd42 /kernel/kernel.c
parentc4df113e347c518b6fda108b4a9e01992ccb3050 (diff)
minor: rename macro
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 0feb2d6..d3b11ca 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -34,7 +34,7 @@
#define LO8(x) ((uint8_t)((uint16_t)(x)))
#define HI8(x) ((uint8_t)((uint16_t)(x) >> 8))
#define NOW(hi, lo) (((uint32_t)(hi) << 0x10) | (lo))
-#define DIST(from, to) ((int32_t)((to) - (from)))
+#define SPAN(from, to) ((int32_t)((to) - (from)))
#define SLICE MSEC(1) /* 1kHz */
struct task {
@@ -103,7 +103,7 @@ ISR(TIMER1_COMPA_vect)
now = NOW(kern.cycles, TCNT1);
/* release waiting tasks */
- while ((tp = TAILQ_FIRST(&kern.tq)) && DIST(now, tp->release) <= 0) {
+ while ((tp = TAILQ_FIRST(&kern.tq)) && SPAN(now, tp->release) <= 0) {
TAILQ_REMOVE(&kern.tq, tp, t_link);
tp->prio = tp->defprio;
tp->rq = &kern.rq[tp->prio];
@@ -112,7 +112,7 @@ ISR(TIMER1_COMPA_vect)
/* set next wakeup timer */
if ((tp = TAILQ_FIRST(&kern.tq)))
- OCR1A = TCNT1 + DIST(now, tp->release);
+ OCR1A = TCNT1 + SPAN(now, tp->release);
}
ISR(TIMER1_COMPB_vect)