diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 22d229c..ea65a88 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -254,6 +254,7 @@ xf86ModulelistFromConfig(pointer **optlist) char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", NULL }; pointer *optarray; XF86LoadPtr modp; + Bool found; /* * make sure the config file has been parsed and that we have a @@ -266,34 +267,78 @@ xf86ModulelistFromConfig(pointer **optlist) } if (xf86configptr->conf_modules) { - /* - * Walk the list of modules in the "Module" section to determine how - * many we have. - */ - modp = xf86configptr->conf_modules->mod_load_lst; - while (modp) { - for (i = 0; ignore[i]; i++) { - if (strcmp(modp->load_name, ignore[i]) == 0) - modp->ignore = 1; + /* Walk the noload list and let people know what we've parsed to + * not be loaded + */ + modp = xf86configptr->conf_modules->mod_no_load_lst; + while (modp) { + xf86Msg(X_WARNING, "\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n", modp->load_name); + modp = (XF86LoadPtr) modp->list.next; + } + /* + * Walk the default settings table. For each module listed to be + * loaded, make sure it's in the mod_load_lst. If it's not, make + * sure it's not in the mod_no_load_lst. If it's not a "noload", + * append it to mod_load_lst + */ + for (i=0 ; ModuleDefaults[i].name != NULL ; i++) { + if (ModuleDefaults[i].toLoad == FALSE) { + xf86Msg(X_WARNING, "\"%s\" is not to be loaded by default. Skipping.\n", ModuleDefaults[i].name); + continue; } - if (!modp->ignore) - count++; - modp = (XF86LoadPtr) modp->list.next; - } + found = FALSE; + modp = xf86configptr->conf_modules->mod_load_lst; + while (modp) { + if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) { + found = TRUE; + break; + } + modp = (XF86LoadPtr) modp->list.next; + } + if (found == FALSE) { + modp = xf86configptr->conf_modules->mod_no_load_lst; + while (modp) { + if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) { + found = TRUE; + break; + } + modp = (XF86LoadPtr) modp->list.next; + } + } + if (found == FALSE) { + XF86ConfModulePtr ptr = xf86configptr->conf_modules; + ptr = xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt); + } + } + + /* + * Walk the list of modules in the "Module" section to determine how + * many we have. + */ + modp = xf86configptr->conf_modules->mod_load_lst; + while (modp) { + for (i = 0; ignore[i]; i++) { + if (strcmp(modp->load_name, ignore[i]) == 0) + modp->ignore = 1; + } + if (!modp->ignore) + count++; + modp = (XF86LoadPtr) modp->list.next; + } } else { - xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec)); + xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec)); } if (count == 0) { - XF86ConfModulePtr ptr = xf86configptr->conf_modules; - ptr = xf86addNewLoadDirective(ptr, "extmod", XF86_LOAD_MODULE, NULL); - ptr = xf86addNewLoadDirective(ptr, "dbe", XF86_LOAD_MODULE, NULL); - ptr = xf86addNewLoadDirective(ptr, "glx", XF86_LOAD_MODULE, NULL); - ptr = xf86addNewLoadDirective(ptr, "freetype", XF86_LOAD_MODULE, NULL); - ptr = xf86addNewLoadDirective(ptr, "type1", XF86_LOAD_MODULE, NULL); - ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL); - ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL); - count = 7; + XF86ConfModulePtr ptr = xf86configptr->conf_modules; + ptr = xf86addNewLoadDirective(ptr, "extmod", XF86_LOAD_MODULE, NULL); + ptr = xf86addNewLoadDirective(ptr, "dbe", XF86_LOAD_MODULE, NULL); + ptr = xf86addNewLoadDirective(ptr, "glx", XF86_LOAD_MODULE, NULL); + ptr = xf86addNewLoadDirective(ptr, "freetype", XF86_LOAD_MODULE, NULL); + ptr = xf86addNewLoadDirective(ptr, "type1", XF86_LOAD_MODULE, NULL); + ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL); + ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL); + count = 7; } /* @@ -303,22 +348,22 @@ xf86ModulelistFromConfig(pointer **optlist) optarray = xnfalloc((count + 1) * sizeof(pointer)); count = 0; if (xf86configptr->conf_modules) { - modp = xf86configptr->conf_modules->mod_load_lst; - while (modp) { + modp = xf86configptr->conf_modules->mod_load_lst; + while (modp) { if (!modp->ignore) { - modulearray[count] = modp->load_name; - optarray[count] = modp->load_opt; - count++; + modulearray[count] = modp->load_name; + optarray[count] = modp->load_opt; + count++; } - modp = (XF86LoadPtr) modp->list.next; - } + modp = (XF86LoadPtr) modp->list.next; + } } modulearray[count] = NULL; optarray[count] = NULL; if (optlist) - *optlist = optarray; + *optlist = optarray; else - xfree(optarray); + xfree(optarray); return modulearray; } diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index 0786ec6..3fe74fa 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -46,6 +46,23 @@ typedef enum _ConfigStatus { CONFIG_NOFILE } ConfigStatus; +typedef struct _ModuleDefault { + char *name; + Bool toLoad; + pointer *load_opt; +} ModuleDefault; + +static ModuleDefault ModuleDefaults[] = { + {.name = "extmod", .toLoad = TRUE, .load_opt=NULL}, + {.name = "dbe", .toLoad = TRUE, .load_opt=NULL}, + {.name = "glx", .toLoad = TRUE, .load_opt=NULL}, + {.name = "freetype", .toLoad = TRUE, .load_opt=NULL}, + {.name = "type1", .toLoad = TRUE, .load_opt=NULL}, + {.name = "record", .toLoad = TRUE, .load_opt=NULL}, + {.name = "dri", .toLoad = TRUE, .load_opt=NULL}, + {.name = NULL, .toLoad = FALSE, .load_opt=NULL} +}; + /* * prototypes */ diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c index f3ed9d1..b297a60 100644 --- a/hw/xfree86/parser/Module.c +++ b/hw/xfree86/parser/Module.c @@ -76,6 +76,7 @@ static xf86ConfigSymTabRec ModuleTab[] = { {ENDSECTION, "endsection"}, {LOAD, "load"}, + {NOLOAD, "noload"}, {LOAD_DRIVER, "loaddriver"}, {SUBSECTION, "subsection"}, {-1, ""}, @@ -141,6 +142,13 @@ xf86parseModuleSection (void) xf86addNewLoadDirective (ptr->mod_load_lst, val.str, XF86_LOAD_MODULE, NULL); break; + case NOLOAD: + if (xf86getSubToken (&(ptr->mod_comment)) != STRING) + Error (QUOTE_MSG, "NoLoad"); + ptr->mod_no_load_lst = + xf86addNewLoadDirective (ptr->mod_no_load_lst, val.str, + XF86_NO_LOAD_MODULE, NULL); + break; case LOAD_DRIVER: if (xf86getSubToken (&(ptr->mod_comment)) != STRING) Error (QUOTE_MSG, "LoadDriver"); @@ -217,6 +225,20 @@ xf86printModuleSection (FILE * cf, XF86ConfModulePtr ptr) #endif } } + /* Ick... this needs refactoring to not duplicate the loop */ + for (lptr = ptr->mod_no_load_lst; lptr; lptr = lptr->list.next) + { + switch (lptr->load_type) + { + case XF86_NO_LOAD_MODULE: + fprintf (cf, "\tNoLoadModule\"%s\"", lptr->load_name); + if (lptr->load_comment) + fprintf(cf, "%s", lptr->load_comment); + else + fputc('\n', cf); + break; + } + } } XF86LoadPtr @@ -257,6 +279,15 @@ xf86freeModules (XF86ConfModulePtr ptr) lptr = lptr->list.next; xf86conffree (prev); } + lptr = ptr->mod_no_load_lst; + while (lptr) + { + TestFree (lptr->load_name); + TestFree (lptr->load_comment); + prev = lptr; + lptr = lptr->list.next; + xf86conffree (prev); + } TestFree (ptr->mod_comment); xf86conffree (ptr); } diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index a682927..69f506d 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -82,6 +82,7 @@ XF86ConfFilesRec, *XF86ConfFilesPtr; /* Values for load_type */ #define XF86_LOAD_MODULE 0 #define XF86_LOAD_DRIVER 1 +#define XF86_NO_LOAD_MODULE 2 typedef struct { @@ -97,6 +98,7 @@ XF86LoadRec, *XF86LoadPtr; typedef struct { XF86LoadPtr mod_load_lst; + XF86LoadPtr mod_no_load_lst; char *mod_comment; } XF86ConfModuleRec, *XF86ConfModulePtr; diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index d5948dd..3b0219d 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -170,6 +170,7 @@ typedef enum { /* Module tokens */ LOAD, LOAD_DRIVER, + NOLOAD, /* Device tokens */ DRIVER,