=================================================================== RCS file: /cvs/funnyos/arch/testarm/config.c,v retrieving revision 1.10 retrieving revision 1.16 diff -u -r1.10 -r1.16 --- funnyos/arch/testarm/config.c 2007/10/29 20:54:00 1.10 +++ funnyos/arch/testarm/config.c 2008/01/11 15:22:09 1.16 @@ -1,9 +1,9 @@ /* - * $Id: config.c,v 1.10 2007/10/29 20:54:00 init Exp $ + * $Id: config.c,v 1.16 2008/01/11 15:22:09 nbrk Exp $ */ #include #include - +#include /* * Configuration file for platform (testarm). */ @@ -15,11 +15,18 @@ extern struct driver tacons_dr; extern struct driver fcons_dr; extern struct driver tartc_dr; +extern struct driver tairqc_dr; +/* putchar & early putchar */ extern void(*putchar)(char); void tacons_early_putc(char ch); +/* tasks */ +extern void hello_enter(void); +extern void hello2_enter(void); + + /* amount of physical memory, in Bytes */ uint32_t physmem = 33554432; @@ -28,12 +35,13 @@ */ struct attachinfo config_attachinfo[] = { /* child, parent, pminor, loc, intrno, flags */ - { "cpu" , "root", 0, 0, 0, 0 }, - { "obio", "root", 0, 0, 0, 0 }, - { "tacons", "obio", 0, 0x10000000, 0, 0 }, + { "cpu" , "root", 0, 0, -1, 0 }, + { "obio", "root", 0, 0, -1, 0 }, + { "tacons", "obio", 0, 0x10000000, 2, 0 }, { "tartc", "obio", 0, 0x15000000, 4, 0 }, - { "fcons", "tacons", 0, 0, 0, 0 }, - { NULL, NULL, 0, 0, 0, 0 } + { "tairqc", "obio", 0, 0x16000000, -1, 0 }, + { "fcons", "tacons", 0, 0, -1, 0 }, + { NULL, NULL, 0, 0, -1, 0 } }; @@ -48,22 +56,35 @@ { "tacons", &tacons_dr, -1 }, { "tartc", &tartc_dr, -1 }, { "fcons", &fcons_dr, -1 }, + { "tairqc", &tairqc_dr, -1 }, { NULL, NULL, 0 } }; /* + * Tasks. + */ +struct u_task config_tasklist[] = { +/* name, priority, enter */ + { "hello", 1, hello_enter }, + { "hello2",1, hello2_enter }, + { NULL, 0, NULL } +}; + + +/* * Machine early-stage initialization hooks. */ void -config_consinit(void) +config_machineinit(void) { /* * Configure putchar, so we can printf messages to the console without fcons. */ /* putchar = tauart_early_putc; */ putchar = tacons_early_putc; + }