andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up some garbage in driver enumeration.

Browse Source
This commit is contained in:
Adam Jackson 2007-11-15 14:24:36 -05:00
parent 0706e5e790
commit c67b9c5fc3
4 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module]) 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(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(XF86CONFIGFILE, 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]) AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])

19
hw/xfree86/common/xf86Config.c
View File

@ -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 ** static char **
GenerateDriverlist(char * dirname, char * drivernames) GenerateDriverlist(char * dirname)
{ {
char **ret; char **ret;
const char *subdirs[] = { dirname, NULL }; const char *subdirs[] = { dirname, NULL };
@ -559,20 +553,13 @@ GenerateDriverlist(char * dirname, char * drivernames)
return ret; return ret;
} }
char ** char **
xf86DriverlistFromCompile(void) xf86DriverlistFromCompile(void)
{ {
static char **driverlist = NULL; static char **driverlist = NULL;
static Bool generated = FALSE;
/* This string is modified in-place */ if (!driverlist)
static char drivernames[] = DRIVERS; driverlist = GenerateDriverlist("drivers");
if (!generated) {
generated = TRUE;
driverlist = GenerateDriverlist("drivers", drivernames);
}
return driverlist; return driverlist;
} }

3
hw/xfree86/common/xf86Helper.c
View File

@ -1492,9 +1492,6 @@ xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips)
} }
#define MAXDRIVERS 64 /* A >hack<, to be sure ... */
_X_EXPORT int _X_EXPORT int
xf86MatchDevice(const char *drivername, GDevPtr **sectlist) xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
{ {

6
include/xorg-server.h.in
View File

@ -31,9 +31,6 @@
/* Build DPMS extension */ /* Build DPMS extension */
#undef DPMSExtension #undef DPMSExtension
/* Built-in output drivers */
#undef DRIVERS
/* Build GLX extension */ /* Build GLX extension */
#undef GLXEXT #undef GLXEXT
@ -46,9 +43,6 @@
/* Support SHM */ /* Support SHM */
#undef HAS_SHM #undef HAS_SHM
/* Built-in input drivers */
#undef IDRIVERS
/* Support IPv6 for TCP connections */ /* Support IPv6 for TCP connections */
#undef IPv6 #undef IPv6