qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update after module loader simplification upstreams. Fixes loading

Browse Source 
in xserver 1.8. ok miod@.
This commit is contained in:
matthieu 2010-08-29 14:43:17 +00:00
parent 1fb6d3c868
commit a52d37219e
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
driver/xf86-video-wildcatfb/src/wildcatfb_driver.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: wildcatfb_driver.c,v 1.6 2010/07/23 15:20:33 miod Exp $ */ /* $OpenBSD: wildcatfb_driver.c,v 1.7 2010/08/29 14:43:17 matthieu Exp $ */
/* /*
* Copyright (c) 2009 Miodrag Vallat. * Copyright (c) 2009 Miodrag Vallat.
@ -204,18 +204,6 @@ static const OptionInfoRec WildcatFBOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE} { -1, NULL, OPTV_NONE, {0}, FALSE}
}; };
/* Symbols needed from other modules. */
static const char *fbSymbols[] = {
"fbPictureInit",
"fbScreenInit",
NULL
};
static const char *shadowSymbols[] = {
"shadowAdd",
"shadowSetup",
NULL
};
#ifdef XFree86LOADER #ifdef XFree86LOADER
static XF86ModuleVersionInfo WildcatFBVersRec = { static XF86ModuleVersionInfo WildcatFBVersRec = {
"wildcatfb", "wildcatfb",
@ -252,7 +240,6 @@ WildcatFBSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) { if (!setupDone) {
setupDone = TRUE; setupDone = TRUE;
xf86AddDriver(&WILDCATFB, module, HaveDriverFuncs); xf86AddDriver(&WILDCATFB, module, HaveDriverFuncs);
LoaderRefSymLists(fbSymbols, shadowSymbols, NULL);
return (pointer)1; return (pointer)1;
} else { } else {
if (errmaj != NULL) if (errmaj != NULL)
@ -580,14 +567,11 @@ WildcatFBPreInit(ScrnInfoPtr pScrn, int flags)
WildcatFBFreeRec(pScrn); WildcatFBFreeRec(pScrn);
return FALSE; return FALSE;
} }
xf86LoaderReqSymLists(shadowSymbols, NULL);
if (xf86LoadSubModule(pScrn, "fb") == NULL) { if (xf86LoadSubModule(pScrn, "fb") == NULL) {
WildcatFBFreeRec(pScrn); WildcatFBFreeRec(pScrn);
return FALSE; return FALSE;
} }
xf86LoaderReqSymLists(fbSymbols, NULL);
TRACE_EXIT("PreInit"); TRACE_EXIT("PreInit");
return TRUE; return TRUE;
} }