frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add LoaderShouldIgnoreABI to allow drivers that roll their own ABI checks (i.e. nvidia) to perform the check before ScreenInit.

This commit is contained in:
Aaron Plattner 2008-07-10 14:38:34 -07:00
parent c42427f63f
commit ebd70c82fd
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/common/xf86Module.h
View File

@ -209,6 +209,7 @@ void LoaderReqSymLists(const char **, ...);
void LoaderReqSymbols(const char *, ...); void LoaderReqSymbols(const char *, ...);
int LoaderCheckUnresolved(int); int LoaderCheckUnresolved(int);
void LoaderGetOS(const char **name, int *major, int *minor, int *teeny); void LoaderGetOS(const char **name, int *major, int *minor, int *teeny);
Bool LoaderShouldIgnoreABI(void);
int LoaderGetABIVersion(const char *abiclass); int LoaderGetABIVersion(const char *abiclass);
typedef pointer (*ModuleSetupProc)(pointer, pointer, int *, int *); typedef pointer (*ModuleSetupProc)(pointer, pointer, int *, int *);

6
hw/xfree86/loader/loader.c
View File

@ -363,6 +363,12 @@ LoaderSetOptions(unsigned long opts)
LoaderOptions |= opts; LoaderOptions |= opts;
} }
_X_EXPORT Bool
LoaderShouldIgnoreABI(void)
{
return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;
}
_X_EXPORT int _X_EXPORT int
LoaderGetABIVersion(const char *abiclass) LoaderGetABIVersion(const char *abiclass)
{ {

1
hw/xfree86/loader/xf86sym.c
View File

@ -713,6 +713,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(LoaderListDirs) SYMFUNC(LoaderListDirs)
SYMFUNC(LoaderFreeDirList) SYMFUNC(LoaderFreeDirList)
SYMFUNC(LoaderGetOS) SYMFUNC(LoaderGetOS)
SYMFUNC(LoaderShouldIgnoreABI)
SYMFUNC(LoaderGetABIVersion) SYMFUNC(LoaderGetABIVersion)
#ifdef XF86DRI #ifdef XF86DRI