Commit c67b9c5f authored by Adam Jackson's avatar Adam Jackson 💣

Clean up some garbage in driver enumeration.

parent 0706e5e7
......@@ -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])
......
......@@ -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;
}
......
......@@ -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)
{
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment