Make the wrapper a generic module to be loaded to supply needed symbols.
authorSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Sun, 13 Jan 2008 03:07:26 +0000 (04:07 +0100)
committerSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Sun, 13 Jan 2008 03:25:01 +0000 (04:25 +0100)
obj/wrap/Makefile
obj/wrap/nvidia_wrap.c

index adac61c..ed5f7b3 100644 (file)
@@ -1,4 +1,4 @@
-SHLIB_NAME= nvidia_wrap_drv.so
+SHLIB_NAME= libnvidia_wrap.so
 SRCS=  nvidia_wrap.c
 NOMAN=
 
index 49b94b7..344998e 100644 (file)
@@ -12,9 +12,9 @@ static XF86ModuleVersionInfo nvidia_wrapVersRec = {
        MODINFOSTRING2,
        XORG_VERSION_CURRENT,
        1, 0, 0,
-       ABI_CLASS_VIDEODRV,
-       ABI_VIDEODRV_VERSION,
-       MOD_CLASS_VIDEODRV
+       ABI_CLASS_NONE,
+       ABI_ANSIC_VERSION,
+       MOD_CLASS_NONE
 };
 
 _X_EXPORT XF86ModuleData nvidia_wrapModuleData = {
@@ -25,16 +25,7 @@ _X_EXPORT XF86ModuleData nvidia_wrapModuleData = {
 static pointer
 nvidia_wrapSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
-       xf86DrvMsg(0, X_INFO, "Nvidia binary wrapper loaded.  Now loading real driver.\n");
-
-       return (LoadSubModule(module,
-                             "nvidia",
-                             NULL,
-                             NULL,
-                             opts,
-                             NULL,
-                             errmaj,
-                             errmin));
+       xf86DrvMsg(0, X_INFO, "Nvidia binary wrapper loaded.\n");
 }
 
 /* Wrapper symbols */