aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-11-08 21:46:43 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-11-08 21:46:43 +0000
commit00993176cd38fd224552eb48dcc952dca40044d9 (patch)
tree10cd4e26425c70be0be2939a0efe50f2e0364d3d
parentad2f8ada3cad9fb8a8dfd1a490af1e00b1ba1a01 (diff)
rename timer flags to name timer 1 (16bit) expicit
-rw-r--r--kernel/kernel.c2
-rw-r--r--kernel/kernel.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index c28ecb1..df3c254 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -135,7 +135,7 @@ init(uint8_t sema)
/* Set up timer 1 */
TCNT1 = 0; /* reset timer */
TCCR1A = 0; /* normal operation */
- TCCR1B = TIMER_FLAGS; /* prescale */
+ TCCR1B = TIMER1_FLAGS; /* prescale */
TIMSK1 = _BV(OCIE1A) | _BV(OCIE1B) | _BV(TOIE1);
OCR1A = 0;
OCR1B = 0;
diff --git a/kernel/kernel.h b/kernel/kernel.h
index 3069515..c22dc78 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -32,15 +32,15 @@
#endif
#if (PRESCALE == 1)
-#define TIMER_FLAGS (_BV(CS10))
+#define TIMER1_FLAGS (_BV(CS10))
#elif (PRESCALE == 8)
-#define TIMER_FLAGS (_BV(CS11))
+#define TIMER1_FLAGS (_BV(CS11))
#elif (PRESCALE == 64)
-#define TIMER_FLAGS (_BV(CS11) | _BV(CS10))
+#define TIMER1_FLAGS (_BV(CS11) | _BV(CS10))
#elif (PRESCALE == 256)
-#define TIMER_FLAGS (_BV(CS12))
+#define TIMER1_FLAGS (_BV(CS12))
#elif (PRESCALE == 1024)
-#define TIMER_FLAGS (_BV(CS12) | _BV(CS10))
+#define TIMER1_FLAGS (_BV(CS12) | _BV(CS10))
#else
#error invalid PRESCALE value
#endif