[xserver-commit] xserver/hw/xizzle/common xf86Config.c,3.281,3.282

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/common
In directory pdx:/tmp/cvs-serv13000/common

Modified Files:
	xf86Config.c 
Log Message:
'No, really, it should build now.'

os-support/linux/drm/Makefile.am: Add missing file.
common/xf86Config.c: Add GetDriverlistFromCompile(), modify semantics. THIS
NEEDS FIXING.
os-support/bus/Pci.h: Disable x86-specific PCI functions for now.


Index: xf86Config.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/common/xf86Config.c,v
retrieving revision 3.281
retrieving revision 3.282
diff -u -d -r3.281 -r3.282
--- a/xf86Config.c	7 Mar 2004 13:43:01 -0000	3.281
+++ b/xf86Config.c	9 Mar 2004 11:54:34 -0000	3.282
@@ -448,7 +448,7 @@
  * provided modules, pre-pending them to our own list.
  */
 static char **
-GenerateDriverList(char * dirname, char * drivernames)
+GenerateDriverlist(char * dirname, char * drivernames)
 {
     char *cp, **driverlist;
     int count;
@@ -537,6 +537,41 @@
     return driverlist;
 }
 
+char **
+xf86DriverlistFromCompile(void)
+{
+    static char **driverlist = NULL;
+    static Bool generated = FALSE;
+
+    /* This string is modified in-place */
+    static char drivernames[] = { "ati" };
+
+    if (!generated) {
+        generated = TRUE;
+        driverlist = GenerateDriverlist("drivers", drivernames);
+    }
+
+    return driverlist;
+}
+
+
+char **
+xf86InputDriverlistFromCompile(void)
+{
+    static char **driverlist = NULL;
+    static Bool generated = FALSE;
+
+    /* This string is modified in-place */
+    static char drivernames[] = {};
+
+    if (!generated) {
+        generated = TRUE;
+	driverlist = GenerateDriverlist("input", drivernames);
+    }
+
+    return driverlist;
+}
+
 
 /*
  * xf86ConfigError --