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

Revert "xfree86: loader: drop unused LoaderGetABIVersion()" 

This reverts commit f3887956ec.

Proprietary NVidia drivers still needs it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1773>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-07 14:16:22 +01:00
parent e3cbde9914
commit ea118d3897
2 changed files with 25 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

@ -154,6 +154,7 @@ extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **,
extern _X_EXPORT void *LoaderSymbol(const char *); extern _X_EXPORT void *LoaderSymbol(const char *);
extern _X_EXPORT void *LoaderSymbolFromModule(void *, const char *); extern _X_EXPORT void *LoaderSymbolFromModule(void *, const char *);
extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int); extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);
extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);
typedef void *(*ModuleSetupProc) (void *, void *, int *, int *); typedef void *(*ModuleSetupProc) (void *, void *, int *, int *);
typedef void (*ModuleTearDownProc) (void *); typedef void (*ModuleTearDownProc) (void *);

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

@ -153,3 +153,27 @@ LoaderSetOptions(unsigned long opts)
{ {
LoaderOptions |= opts; LoaderOptions |= opts;
} }
int
LoaderGetABIVersion(const char *abiclass)
{
struct {
const char *name;
int version;
} classes[] = {
{ABI_CLASS_ANSIC, LoaderVersionInfo.ansicVersion},
{ABI_CLASS_VIDEODRV, LoaderVersionInfo.videodrvVersion},
{ABI_CLASS_XINPUT, LoaderVersionInfo.xinputVersion},
{ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion},
{NULL, 0}
};
int i;
for (i = 0; classes[i].name; i++) {
if (!strcmp(classes[i].name, abiclass)) {
return classes[i].version;
}
}
return 0;
}