=================================================================== RCS file: /cvs/funnyos/arch/testarm/config.c,v retrieving revision 1.4 retrieving revision 1.9 diff -u -r1.4 -r1.9 --- funnyos/arch/testarm/config.c 2007/10/16 21:29:50 1.4 +++ funnyos/arch/testarm/config.c 2007/10/29 15:12:21 1.9 @@ -1,5 +1,5 @@ /* - * $Id: config.c,v 1.4 2007/10/16 20:29:50 init Exp $ + * $Id: config.c,v 1.9 2007/10/29 15:12:21 init Exp $ */ #include #include @@ -12,6 +12,9 @@ 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 struct driver tartc_dr; extern void(*putchar)(char); @@ -25,11 +28,11 @@ */ struct attachinfo config_attachinfo[] = { /* child, parent, pminor, loc, flags */ - { "obio", "root", 0, 0, 0 }, { "cpu" , "root", 0, 0, 0 }, + { "obio", "root", 0, 0, 0 }, { "tacons", "obio", 0, 0x10000000, 0 }, -// { "tartc", "obio", 0, 0x15000000, 0x01 }, -// { "fcons", "tacons", 0, 0, 0}, + { "tartc", "obio", 0, 0x15000000, 0 }, + { "fcons", "tacons", 0, 0, 0}, { NULL, NULL, 0, 0, 0} }; @@ -38,12 +41,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 }, { "cpu" , &cpu_dr, -1 }, { "tacons", &tacons_dr, -1 }, -// { "tartc", &tartc_dr, -1 }, -// { "fcons", &fcons_dr, -1 }, + { "tartc", &tartc_dr, -1 }, + { "fcons", &fcons_dr, -1 }, { NULL, NULL, 0 } };