From 25a00477652beed65cb818d8708f032bfa2f0fb0 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 2 Nov 2011 18:21:08 +0000 Subject: re-add adc --- kernel/kernel.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index bf8fee9..44395d7 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -35,19 +35,19 @@ enum State { TERMINATED, RUNQ, TIMEQ, WAITQOFFSET }; #define NOW(hi, lo) (((uint32_t)(hi) << 0x10) | (lo)) struct task { - uint8_t state; - uint16_t sp; /* stack pointer */ uint32_t release; uint32_t deadline; + uint16_t sp; /* stack pointer */ + uint8_t state; }; struct kernel { struct task *running; struct task *last; struct task task[TASKS + 1]; - uint8_t semaphore[SEMAPHORES]; - uint8_t *freemem; uint16_t cycles; + uint8_t *freemem; + uint8_t semaphore[SEMAPHORES]; } kernel; ISR(TIMER1_OVF_vect) @@ -100,7 +100,7 @@ ISR(TIMER1_COMPA_vect, ISR_NAKED) } void -init(int stack) +init(uint8_t stack) { cli(); @@ -123,7 +123,7 @@ init(int stack) } void -exec(void (*fun)(void *), uint16_t stack, void *args) +exec(void (*fun)(void *), uint8_t stack, void *args) { struct task *t; uint8_t *sp; @@ -287,10 +287,3 @@ running(void) return ret; } - -void -idle(void) -{ - for (;;) - asm volatile ("nop"); -} -- cgit v1.2.3