=================================================================== RCS file: /cvs/funnyos/arch/testarm/config.c,v retrieving revision 1.7 retrieving revision 1.10 diff -u -r1.7 -r1.10 --- funnyos/arch/testarm/config.c 2007/10/25 19:18:17 1.7 +++ funnyos/arch/testarm/config.c 2007/10/29 20:54:00 1.10 @@ -1,5 +1,5 @@ /* - * $Id: config.c,v 1.7 2007/10/25 18:18:17 init Exp $ + * $Id: config.c,v 1.10 2007/10/29 20:54:00 init Exp $ */ #include #include @@ -14,6 +14,7 @@ extern struct driver obio_dr; extern struct driver tacons_dr; extern struct driver fcons_dr; +extern struct driver tartc_dr; extern void(*putchar)(char); @@ -26,13 +27,13 @@ * Where to attach each device. */ struct attachinfo config_attachinfo[] = { - /* child, parent, pminor, loc, flags */ - { "obio", "root", 0, 0, 0 }, - { "cpu" , "root", 0, 0, 0 }, - { "tacons", "obio", 0, 0x10000000, 0 }, -// { "tartc", "obio", 0, 0x15000000, 0x01 }, - { "fcons", "tacons", 0, 0, 0}, - { NULL, NULL, 0, 0, 0} + /* child, parent, pminor, loc, intrno, flags */ + { "cpu" , "root", 0, 0, 0, 0 }, + { "obio", "root", 0, 0, 0, 0 }, + { "tacons", "obio", 0, 0x10000000, 0, 0 }, + { "tartc", "obio", 0, 0x15000000, 4, 0 }, + { "fcons", "tacons", 0, 0, 0, 0 }, + { NULL, NULL, 0, 0, 0, 0 } }; @@ -45,7 +46,7 @@ { "obio", &obio_dr, -1 }, { "cpu" , &cpu_dr, -1 }, { "tacons", &tacons_dr, -1 }, -// { "tartc", &tartc_dr, -1 }, + { "tartc", &tartc_dr, -1 }, { "fcons", &fcons_dr, -1 }, { NULL, NULL, 0 } };