diff options
| author | Adam Jackson <ajax@redhat.com> | 2007-11-15 14:24:36 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2007-11-15 14:24:36 -0500 |
| commit | c67b9c5fc33002b13a2360929a37f24169710f64 (patch) | |
| tree | 808491582f3da7ffe731b8b2b57398b739a4419b | |
| parent | 0706e5e790060fbf046cfaff295b78806b7841c6 (diff) | |
Clean up some garbage in driver enumeration.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 19 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Helper.c | 3 | ||||
| -rw-r--r-- | include/xorg-server.h.in | 6 |
4 files changed, 3 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 8a1f88c93..35b7f0ffc 100644 --- a/configure.ac +++ b/configure.ac @@ -1518,8 +1518,6 @@ dnl has it in libc), or if libdl is needed to get it. AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module]) - AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)]) - AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)]) AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file]) AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file]) AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path]) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 638027432..e74c590ee 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -538,14 +538,8 @@ fixup_video_driver_list(char **drivers) } } - -/* - * Generate a compiled-in list of driver names. This is used to produce a - * consistent probe order. For the loader server, we also look for vendor- - * provided modules, pre-pending them to our own list. - */ static char ** -GenerateDriverlist(char * dirname, char * drivernames) +GenerateDriverlist(char * dirname) { char **ret; const char *subdirs[] = { dirname, NULL }; @@ -559,20 +553,13 @@ GenerateDriverlist(char * dirname, char * drivernames) return ret; } - char ** xf86DriverlistFromCompile(void) { static char **driverlist = NULL; - static Bool generated = FALSE; - - /* This string is modified in-place */ - static char drivernames[] = DRIVERS; - if (!generated) { - generated = TRUE; - driverlist = GenerateDriverlist("drivers", drivernames); - } + if (!driverlist) + driverlist = GenerateDriverlist("drivers"); return driverlist; } diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 1ef79730c..d37875c35 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1492,9 +1492,6 @@ xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips) } -#define MAXDRIVERS 64 /* A >hack<, to be sure ... */ - - _X_EXPORT int xf86MatchDevice(const char *drivername, GDevPtr **sectlist) { diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 2a0a5f5e2..f38213117 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -31,9 +31,6 @@ /* Build DPMS extension */ #undef DPMSExtension -/* Built-in output drivers */ -#undef DRIVERS - /* Build GLX extension */ #undef GLXEXT @@ -46,9 +43,6 @@ /* Support SHM */ #undef HAS_SHM -/* Built-in input drivers */ -#undef IDRIVERS - /* Support IPv6 for TCP connections */ #undef IPv6 |