===================================================================
RCS file: /cvs/funnyos/arch/testarm/config.c,v
retrieving revision 1.5
retrieving revision 1.11
diff -u -r1.5 -r1.11
--- funnyos/arch/testarm/config.c	2007/10/16 22:26:15	1.5
+++ funnyos/arch/testarm/config.c	2007/11/02 12:39:26	1.11
@@ -1,5 +1,5 @@
 /*
- * $Id: config.c,v 1.5 2007/10/16 21:26:15 init Exp $
+ * $Id: config.c,v 1.11 2007/11/02 12:39:26 init Exp $
  */
 #include <sys/types.h>
 #include <sys/device.h>
@@ -13,6 +13,9 @@
 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 struct driver tairqc_dr;
 
 
 extern void(*putchar)(char);
@@ -25,13 +28,14 @@
  * 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 },
+	{ "tairqc", "obio",		0, 0x16000000, 	0,	0 },
+	{ "fcons", 	"tacons", 	0, 0, 			0, 	0 },
+	{ NULL, 	NULL, 		0, 0, 			0,  0 }
 };
 
 
@@ -39,12 +43,14 @@
  * 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 },
+	{ "tairqc", &tairqc_dr, -1 },
 	{ NULL, NULL, 0 }
 };