aboutsummaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2011-11-02 18:21:08 +0000
committerDimitri Sokolyuk <demon@dim13.org>2011-11-02 18:21:08 +0000
commit25a00477652beed65cb818d8708f032bfa2f0fb0 (patch)
tree2ce07626c6ea11899799ef8d6f25c687433382cd /kernel/kernel.c
parent8f3692ab517b7cc7108c4dd27ded31db55adb025 (diff)
re-add adc
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c19
1 files changed, 6 insertions, 13 deletions
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");
-}