[mach64] Drop symbol lists.

egrep LOADER\|SymLists\|Symbols src/*.[hc]

not needed after server commit bca9364f3f4a2376edbcf57a34f704ce28be21ba, i.e.
xserver 1.2

compile-tested only

12 files changed, 9 insertions, 346 deletions

diff --git a/configure.ac b/configure.ac
index 409796dd..cc2b01ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e95dd7c..f8847c14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,7 +179,6 @@ EXTRA_DIST = \
 	atimach64io.h \
 	atimach64probe.h \
 	atimode.h \
-	atimodule.h \
 	atioption.h \
 	atipreinit.h \
 	atiprint.h \
diff --git a/src/ati.c b/src/ati.c
index ada165f1..8eb61a27 100644
--- a/src/ati.c
+++ b/src/ati.c
@@ -63,7 +63,6 @@
 #include "atipcirename.h"
 
 #include "ati.h"
-#include "atimodule.h"
 #include "ativersion.h"
 #include "atimach64probe.h"
 
@@ -193,8 +192,6 @@ ATIProbe
             return FALSE;
         }
 
-        xf86LoaderReqSymLists(RADEONSymbols, NULL);
-
         RADEONIdentify(flags);
 
         if (RADEONProbe(pDriver, flags))
@@ -215,8 +212,6 @@ ATIProbe
             return FALSE;
         }
 
-        xf86LoaderReqSymLists(R128Symbols, NULL);
-
         R128Identify(flags);
 
         if (R128Probe(pDriver, flags))
@@ -237,8 +232,6 @@ ATIProbe
             return FALSE;
         }
 
-        xf86LoaderReqSymLists(ATISymbols, NULL);
-
         Mach64Identify(flags);
 
         if (Mach64Probe(pDriver, flags))
diff --git a/src/aticonsole.c b/src/aticonsole.c
index bd5ec9c5..f8f20329 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -51,11 +51,6 @@
 #include "atioption.h"
 #include "vbe.h"
 
-static const char *vbeSymbols[] = {
-    "VBEGetVBEMode",
-    NULL
-};
-
 #endif /* TV_OUT */
 
 /*
@@ -131,8 +126,6 @@ ATIProbeAndSetActiveDisplays
     int disp_request;
     ATITVStandard tv_std, tv_std_request;
 
-    xf86LoaderRefSymLists(vbeSymbols, NULL);
-
     if (xf86GetVerbosity() > 3) {
 	xf86ErrorFVerb(4, "\n Before TV-Out queries\n\n");
 	ATIPrintRegisters(pATI);
@@ -539,8 +532,6 @@ ATIEnterGraphics
 #ifdef TV_OUT
     if (pATI->OptionTvOut) {
 
-	xf86LoaderRefSymLists(vbeSymbols, NULL);
-
 	if (pATI->pVBE) {
 	    if (VBEGetVBEMode(pATI->pVBE, &pATI->vbemode)) {
 		xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Saving VESA mode: 0x%x\n", 
diff --git a/src/atii2c.c b/src/atii2c.c
index 73febf7a..a13d6477 100644
--- a/src/atii2c.c
+++ b/src/atii2c.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "atii2c.h"
-#include "atiload.h"
 #include "atimach64i2c.h"
 #include "atistruct.h"
 
@@ -365,7 +364,7 @@ ATII2CPreInit
     ATIPtr      pATI
 )
 {
-            if (!ATILoadModule(pScreenInfo, "i2c", ATIi2cSymbols))
+            if (!xf86LoadSubModule(pScreenInfo, "i2c"))
                 return;
 
             ATIMach64I2CPreInit(pScreenInfo, pATI);
diff --git a/src/atiload.c b/src/atiload.c
index 0001ced9..621b0b07 100644
--- a/src/atiload.c
+++ b/src/atiload.c
@@ -18,179 +18,18 @@
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- *    Leif Delgass <ldelgass@retinalburn.net>
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef XFree86LOADER
-
 #include "ati.h"
 #include "aticursor.h"
 #include "atiload.h"
 #include "atistruct.h"
 
 /*
- * All symbol lists belong here.  They are externalised so that they can be
- * referenced elsewhere.  Note the naming convention for these things...
- */
-
-const char *ATIint10Symbols[] =
-{
-    "xf86FreeInt10",
-    "xf86InitInt10",
-    "xf86int10Addr",
-    NULL
-};
-
-const char *ATIddcSymbols[] =
-{
-    "xf86PrintEDID",
-    "xf86SetDDCproperties",
-    NULL
-};
-
-const char *ATIvbeSymbols[] =
-{
-    "VBEInit",
-    "vbeDoEDID",
-    "vbeFree",
-    NULL
-};
-
-#ifdef XF86DRI_DEVEL
-
-const char *ATIdrmSymbols[] = {
-    "drmAddBufs",
-    "drmAddMap",
-    "drmAgpAcquire",
-    "drmAgpAlloc",
-    "drmAgpBase",
-    "drmAgpBind",
-    "drmAgpDeviceId",
-    "drmAgpEnable",
-    "drmAgpFree",
-    "drmAgpGetMode",
-    "drmAgpRelease",
-    "drmAgpUnbind",
-    "drmAgpVendorId",
-    "drmAvailable",
-    "drmCommandNone",
-    "drmCommandRead",
-    "drmCommandWrite",
-    "drmCommandWriteRead",
-    "drmCtlInstHandler",
-    "drmCtlUninstHandler",
-    "drmFreeVersion",
-    "drmGetInterruptFromBusID",
-    "drmGetLibVersion",
-    "drmGetVersion",
-    "drmMap",
-    "drmMapBufs",
-    "drmDMA",
-    "drmUnmap",
-    "drmUnmapBufs",
-    NULL
-};
-
-const char *ATIdriSymbols[] = {
-    "DRICloseScreen",
-    "DRICreateInfoRec",
-    "DRIDestroyInfoRec",
-    "DRIFinishScreenInit",
-    "DRIGetSAREAPrivate",
-    "DRILock",
-    "DRIQueryVersion",
-    "DRIScreenInit",
-    "DRIUnlock",
-    "GlxSetVisualConfigs",
-    "DRICreatePCIBusID",
-    NULL
-};
-
-#endif /* XF86DRI_DEVEL */
-
-const char *ATIfbSymbols[] =
-{
-    "fbPictureInit",
-    "fbScreenInit",
-    NULL
-};
-
-const char *ATIshadowfbSymbols[] =
-{
-    "ShadowFBInit",
-    NULL
-};
-
-#ifdef USE_EXA
-const char *ATIexaSymbols[] =
-{
-    "exaDriverAlloc",
-    "exaDriverInit",
-    "exaDriverFini",
-    "exaOffscreenAlloc",
-    "exaOffscreenFree",
-    NULL
-};
-#endif
-
-#ifdef USE_XAA
-const char *ATIxaaSymbols[] =
-{
-    "XAACreateInfoRec",
-    "XAADestroyInfoRec",
-    "XAAInit",
-    NULL
-};
-#endif
-
-const char *ATIramdacSymbols[] =
-{
-    "xf86CreateCursorInfoRec",
-    "xf86DestroyCursorInfoRec",
-    "xf86InitCursor",
-    NULL
-};
-
-const char *ATIi2cSymbols[] =
-{
-    "xf86CreateI2CBusRec",
-    "xf86DestroyI2CBusRec",
-    "xf86I2CBusInit",
-    "xf86I2CDevInit",
-    "xf86I2CFindDev",
-    "xf86I2CGetScreenBuses",
-    NULL
-};
-
-/*
- * ATILoadModule --
- *
- * Load a specific module and register with the loader those of its entry
- * points that are referenced by this driver.
- */
-pointer
-ATILoadModule
-(
-    ScrnInfoPtr  pScreenInfo,
-    const char  *Module,
-    const char **SymbolList
-)
-{
-    pointer pModule = xf86LoadSubModule(pScreenInfo, Module);
-
-    if (pModule)
-        xf86LoaderReqSymLists(SymbolList, NULL);
-
-    return pModule;
-}
-
-/*
  * ATILoadModules --
  *
  * This function loads other modules required for a screen.
@@ -206,7 +45,7 @@ ATILoadModules
 
     /* Load shadow frame buffer code if needed */
     if (pATI->OptionShadowFB &&
-        !ATILoadModule(pScreenInfo, "shadowfb", ATIshadowfbSymbols))
+        !xf86LoadSubModule(pScreenInfo, "shadowfb"))
         return NULL;
 
     /* Load depth-specific entry points */
@@ -216,7 +55,7 @@ ATILoadModules
         case 16:
         case 24:
         case 32:
-            fbPtr = ATILoadModule(pScreenInfo, "fb", ATIfbSymbols);
+            fbPtr = xf86LoadSubModule(pScreenInfo, "fb");
             break;
 
         default:
@@ -227,14 +66,13 @@ ATILoadModules
 
     /* Load ramdac module if needed */
     if ((pATI->Cursor > ATI_CURSOR_SOFTWARE) &&
-        !ATILoadModule(pScreenInfo, "ramdac", ATIramdacSymbols))
+        !xf86LoadSubModule(pScreenInfo, "ramdac"))
         return NULL;
 
 #ifdef USE_EXA
     /* Load EXA if needed */
     if (pATI->useEXA && pATI->OptionAccel)
     {
-        /* Cannot use ATILoadModule(), because of version checking */
         XF86ModReqInfo req;
         int errmaj, errmin;
 
@@ -247,17 +85,14 @@ ATILoadModules
             LoaderErrorMsg(NULL, "exa", errmaj, errmin);
             return NULL;
         }
-        xf86LoaderReqSymLists(ATIexaSymbols, NULL);
     }
 #endif
 #ifdef USE_XAA
     /* Load XAA if needed */
     if (!pATI->useEXA && pATI->OptionAccel &&
-        !ATILoadModule(pScreenInfo, "xaa", ATIxaaSymbols))
+        !xf86LoadSubModule(pScreenInfo, "xaa"))
         return NULL;
 #endif
 
     return fbPtr;
 }
-
-#endif /* XFree86LOADER */
diff --git a/src/atiload.h b/src/atiload.h
index ebccd758..168224c7 100644
--- a/src/atiload.h
+++ b/src/atiload.h
@@ -18,52 +18,15 @@
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- *    Leif Delgass <ldelgass@retinalburn.net>
  */
 
 #ifndef ___ATILOAD_H___
 #define ___ATILOAD_H___ 1
 
-#ifdef XFree86LOADER
-
 #include "atipriv.h"
 
 #include "xf86str.h"
 
-extern const char *ATIint10Symbols[], *ATIddcSymbols[], *ATIvbeSymbols[],
-
-#ifdef XF86DRI_DEVEL
- 
-                  *ATIdrmSymbols[], *ATIdriSymbols[],
- 
-#endif /* XF86DRI_DEVEL */
-
-                  *ATIfbSymbols[], *ATIshadowfbSymbols[],
-
-#ifdef USE_EXA
- 
-                  *ATIexaSymbols[],
-
-#endif /* USE_EXA */
-
-#ifdef USE_XAA
- 
-                  *ATIxaaSymbols[],
-
-#endif /* USE_XAA */
-
-                  *ATIramdacSymbols[], *ATIi2cSymbols[];
-
-extern pointer ATILoadModule(ScrnInfoPtr, const char *, const char **);
 extern pointer ATILoadModules(ScrnInfoPtr, ATIPtr);
 
-#else /* XFree86LOADER */
-
-#define ATILoadModule(pScreenInfo, Module, SymboList) ((pointer)1)
-#define ATILoadModules(pScreenInfo, pATI)             ((pointer)1)
-
-#endif /* XFree86LOADER */
-
 #endif /* ___ATILOAD_H___ */
diff --git a/src/atimisc.c b/src/atimisc.c
index e6012ecd..b10d08fa 100644
--- a/src/atimisc.c
+++ b/src/atimisc.c
@@ -18,19 +18,13 @@
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- *    Leif Delgass <ldelgass@retinalburn.net>
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef XFree86LOADER
-
 #include "ati.h"
-#include "atiload.h"
 #include "ativersion.h"
 
 /* Module loader interface for subsidiary driver module */
@@ -101,41 +95,6 @@ ATISetup
             } while (0);
         }
 
-        /*
-         * Tell loader about symbols from other modules that this module might
-         * refer to.
-         */
-        xf86LoaderRefSymLists(
-            ATIint10Symbols,
-            ATIddcSymbols,
-            ATIvbeSymbols,
-
-#ifdef XF86DRI_DEVEL
-
-            ATIdrmSymbols,
-            ATIdriSymbols,
-
-#endif /* XF86DRI_DEVEL */
-
-            ATIfbSymbols,
-            ATIshadowfbSymbols,
-
-#ifdef USE_EXA
-
-            ATIexaSymbols,
-
-#endif /* USE_EXA */
-
-#ifdef USE_XAA
-
-            ATIxaaSymbols,
-
-#endif /* USE_XAA */
-
-            ATIramdacSymbols,
-            ATIi2cSymbols,
-            NULL);
-
         Inited = TRUE;
     }
 
@@ -149,5 +108,3 @@ _X_EXPORT XF86ModuleData atimiscModuleData =
     ATISetup,
     NULL
 };
-
-#endif /* XFree86LOADER */
diff --git a/src/atimode.c b/src/atimode.c
index 68c13426..d1b31981 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -43,12 +43,6 @@
 
 #include "vbe.h"
 
-static const char *vbeSymbols[] = {
-    "VBESetVBEMode",
-    "vbeFree",
-    NULL
-};
-
 #endif /* TV_OUT */
 
 #ifndef AVOID_CPIO
@@ -733,9 +727,6 @@ ATISetVBEMode
     ATIHWPtr    pATIHW
 )
 {
-
-    xf86LoaderRefSymLists(vbeSymbols, NULL);
-
     if (pATIHW->crtc == ATI_CRTC_MACH64) {
 	int vbemode, modekey;
 
diff --git a/src/atimodule.c b/src/atimodule.c
index 6aa9a2e7..12b4ffd9 100644
--- a/src/atimodule.c
+++ b/src/atimodule.c
@@ -24,38 +24,11 @@
 #include "config.h"
 #endif
 
-#ifdef XFree86LOADER
-
 #include "ati.h"
-#include "atimodule.h"
 #include "ativersion.h"
 
 /* Module loader interface */
 
-const char *ATISymbols[] =
-{
-    "Mach64Identify",
-    "Mach64Probe",
-    "Mach64AvailableOptions",
-    NULL
-};
-
-const char *R128Symbols[] =
-{
-    "R128Identify",
-    "R128Probe",
-    "R128AvailableOptions",
-    NULL
-};
-
-const char *RADEONSymbols[] =
-{
-    "RADEONIdentify",
-    "RADEONProbe",
-    "RADEONAvailableOptions",
-    NULL
-};
-
 static XF86ModuleVersionInfo ATIVersionRec =
 {
     ATI_DRIVER_NAME,
@@ -90,12 +63,6 @@ ATISetup
     {
         Inited = TRUE;
         xf86AddDriver(&ATI, Module, 0);
-
-        xf86LoaderRefSymLists(
-            ATISymbols,
-            R128Symbols,
-            RADEONSymbols,
-            NULL);
     }
 
     return (pointer)1;
@@ -108,5 +75,3 @@ _X_EXPORT XF86ModuleData atiModuleData =
     ATISetup,
     NULL
 };
-
-#endif /* XFree86LOADER */
diff --git a/src/atimodule.h b/src/atimodule.h
deleted file mode 100644
index d33b01d7..00000000
--- a/src/atimodule.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(XFree86LOADER) && !defined(___ATIMODULE_H___)
-#define ___ATIMODULE_H___ 1
-
-extern const char *ATISymbols[];
-extern const char *R128Symbols[];
-extern const char *RADEONSymbols[];
-
-#endif /* ___ATIMODULE_H___ */
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 8114f512..2420b9f8 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -301,7 +301,7 @@ ATIPreInit
      * If there is an ix86-style BIOS, ensure its initialisation entry point
      * has been executed, and retrieve DDC and VBE information from it.
      */
-    if (!(pInt10Module = ATILoadModule(pScreenInfo, "int10", ATIint10Symbols)))
+    if (!(pInt10Module = xf86LoadSubModule(pScreenInfo, "int10")))
     {
         xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
             "Unable to load int10 module.\n");
@@ -313,13 +313,13 @@ ATIPreInit
     }
     else
     {
-        if (!(pDDCModule = ATILoadModule(pScreenInfo, "ddc", ATIddcSymbols)))
+        if (!(pDDCModule = xf86LoadSubModule(pScreenInfo, "ddc")))
         {
             xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
                 "Unable to load ddc module.\n");
         }
         else
-        if (!(pVBEModule = ATILoadModule(pScreenInfo, "vbe", ATIvbeSymbols)))
+        if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, "vbe")))
         {
             xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
                 "Unable to load vbe module.\n");