2 files changed, 18 insertions, 3 deletions

diff --git a/firmware/test/kernel/Makefile b/firmware/test/kernel/Makefile
index 659fdad159..2a9ef0f71b 100644
--- a/firmware/test/kernel/Makefile
+++ b/firmware/test/kernel/Makefile
@@ -14,7 +14,7 @@ TARGET = -DARCHOS_PLAYER_OLD=1
 CFLAGS = -g -O -Wall -m1 -save-temps -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns -fno-builtin $(INCLUDES) $(TARGET) -DDEBUG
 AFLAGS += -small -relax
 
-OBJS=   ../../crt0.o ../../system.o main.o timer.o \
+OBJS=   ../../crt0.o ../../system.o main.o ../../panic.o ../../drivers/lcd.o \
         ../../thread.o ../../kernel.o ../../drivers/led.o \
         ../../debug.o ../../common/sprintf.o
 
diff --git a/firmware/test/kernel/main.c b/firmware/test/kernel/main.c
index fe7ddc8378..46a77eae16 100644
--- a/firmware/test/kernel/main.c
+++ b/firmware/test/kernel/main.c
@@ -31,6 +31,14 @@ void t2(void);
 
 struct event_queue main_q;
 
+int tick_add_task(void (*f)(void));
+
+void testfunc(void)
+{
+    if(current_tick == 5000)
+        debugf("Yippie!\n");
+}
+
 int main(void)
 {
     char buf[40];
@@ -46,12 +54,19 @@ int main(void)
     SCR1 |= 0x40;
     SCR1 &= ~0x80;
     IPRE |= 0xf000; /* Set to highest priority */
-    asm ("ldc\t%0,sr" : : "r"(0<<4));
+
+    set_irq_level(0);
 
     debugf("OK. Let's go\n");
 
-    tick_start(10);
+    kernel_init();
 
+    tick_add_task(testfunc);
+    
+    debugf("sleeping 10s...\n");
+    sleep(10000);
+    debugf("woke up\n");
+    
     queue_init(&main_q);
     
     create_thread(t1, s1, 1024);