Bug #4361: Change driver probe logic to read the driver list from disk

instead of using a compile-time array.
This commit is contained in:
Adam Jackson 2005-12-09 03:59:41 +00:00
parent 7fa2d11d85
commit 80ea67e379

View File

@ -457,6 +457,11 @@ xf86InputDriverlistFromConfig()
static char ** static char **
GenerateDriverlist(char * dirname, char * drivernames) GenerateDriverlist(char * dirname, char * drivernames)
{ {
#ifdef XFree86LOADER
char *subdirs[] = { dirname, NULL };
static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
return LoaderListDirs(subdirs, patlist);
#else /* non-loadable server */
char *cp, **driverlist; char *cp, **driverlist;
int count; int count;
@ -544,6 +549,7 @@ GenerateDriverlist(char * dirname, char * drivernames)
#endif /* XFree86LOADER */ #endif /* XFree86LOADER */
return driverlist; return driverlist;
#endif
} }