=================================================================== RCS file: /cvs/funnyos/arch/testarm/config.c,v retrieving revision 1.2 retrieving revision 1.7 diff -u -r1.2 -r1.7 --- funnyos/arch/testarm/config.c 2007/10/16 19:43:23 1.2 +++ funnyos/arch/testarm/config.c 2007/10/25 19:18:17 1.7 @@ -1,5 +1,5 @@ /* - * $Id: config.c,v 1.2 2007/10/16 18:43:23 init Exp $ + * $Id: config.c,v 1.7 2007/10/25 18:18:17 init Exp $ */ #include #include @@ -11,6 +11,9 @@ /* device drivers */ extern struct driver root_dr; extern struct driver cpu_dr; +extern struct driver obio_dr; +extern struct driver tacons_dr; +extern struct driver fcons_dr; extern void(*putchar)(char); @@ -24,11 +27,11 @@ */ struct attachinfo config_attachinfo[] = { /* child, parent, pminor, loc, flags */ -// { "obio", "root", 0, 0, 0 }, + { "obio", "root", 0, 0, 0 }, { "cpu" , "root", 0, 0, 0 }, -// { "tacons", "obio", 0, 0x10000000, 0 }, + { "tacons", "obio", 0, 0x10000000, 0 }, // { "tartc", "obio", 0, 0x15000000, 0x01 }, -// { "fcons", "tacons", 0, 0, 0}, + { "fcons", "tacons", 0, 0, 0}, { NULL, NULL, 0, 0, 0} }; @@ -37,12 +40,13 @@ * Link device names with their drivers. */ struct driverinfo config_driverinfo[] = { +/* name, driverp, ninstances (should be -1) */ { "root", &root_dr, -1 }, -// { "obio", &obio_dr, -1 }, + { "obio", &obio_dr, -1 }, { "cpu" , &cpu_dr, -1 }, -// { "tacons", &tacons_dr, -1 }, + { "tacons", &tacons_dr, -1 }, // { "tartc", &tartc_dr, -1 }, -// { "fcons", &fcons_dr, -1 }, + { "fcons", &fcons_dr, -1 }, { NULL, NULL, 0 } };