configure.ac | 2 - man/neomagic.man | 2 - src/neo_driver.c | 95 ------------------------------------------------------- 3 files changed, 2 insertions(+), 97 deletions(-)
New commits: commit 33997831f0ffe61452fac111b51dabffef348b76 Author: Adam Jackson <[email protected]> Date: Thu Jul 2 11:24:20 2009 -0400 neomagic 1.2.3 diff --git a/configure.ac b/configure.ac index 2f7843a..4fb509d 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-neomagic], - 1.2.2, + 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-neomagic) commit d97ccdfef1107c7721c838f0cd3fbed5f456dc13 Author: Adam Jackson <[email protected]> Date: Thu May 28 15:07:11 2009 -0400 Remove useless loader symbol lists. diff --git a/src/neo_driver.c b/src/neo_driver.c index f472601..686fc05 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -412,79 +412,6 @@ static const OptionInfoRec NEOOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -/* - * List of symbols from other modules that this module references. This - * list is used to tell the loader that it is OK for symbols here to be - * unresolved providing that it hasn't been told that they haven't been - * told that they are essential via a call to xf86LoaderReqSymbols() or - * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about - * unresolved symbols that are not required. - */ - -static const char *vgahwSymbols[] = { - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWLock", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreenWeak", - "vgaHWSetStdFuncs", - "vgaHWUnlock", - "vgaHWddc1SetSpeedWeak", - NULL -}; - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -static const char *shadowSymbols[] = { - "shadowInit", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86DoEDID_DDC1", - "xf86DoEDID_DDC2", - "xf86PrintEDID", - "xf86SetDDCproperties", - NULL -}; - -static const char *vbeSymbols[] = { - "VBEInit", - "vbeDoEDID", - "vbeFree", - NULL -}; - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86I2CBusInit", - NULL -}; - #ifdef XFree86LOADER static MODULESETUPPROTO(neoSetup); @@ -519,18 +446,6 @@ neoSetup(pointer module, pointer opts, int *errmaj, int *errmin) xf86AddDriver(&NEOMAGIC, module, 0); /* - * Modules that this driver always requires can be loaded here - * by calling LoadSubModule(). - */ - - /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, - ramdacSymbols, shadowSymbols, - ddcSymbols, vbeSymbols, i2cSymbols, NULL); - /* * The return value must be non-NULL on success even though there * is no TearDownProc. */ @@ -744,8 +659,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* * Allocate a vgaHWRec. */ @@ -965,7 +878,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) pScrn->monitor = pScrn->confScreen->monitor; if (xf86LoadSubModule(pScrn, "ddc")) { - xf86LoaderReqSymLists(ddcSymbols, NULL); #if 1 /* for DDC1 testing */ if (!neoDoDDCVBE(pScrn)) if (!neoDoDDC2(pScrn)) @@ -1411,25 +1323,20 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) RETURN; } - xf86LoaderReqSymLists(fbSymbols, NULL); - if (!nPtr->noLinear) { if (!xf86LoadSubModule(pScrn, "xaa")) RETURN; - xf86LoaderReqSymLists(xaaSymbols, NULL); } if (nPtr->shadowFB) { if (!xf86LoadSubModule(pScrn, "shadow")) { RETURN; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } if (!nPtr->swCursor) { if (!xf86LoadSubModule(pScrn, "ramdac")) RETURN; - xf86LoaderReqSymLists(ramdacSymbols, NULL); } return TRUE; } @@ -3208,7 +3115,6 @@ neoDoDDC2(ScrnInfoPtr pScrn) VGAwGR(0x09,0x26); if (xf86LoadSubModule(pScrn, "i2c")) { - xf86LoaderReqSymLists(i2cSymbols, NULL); if (neo_I2CInit(pScrn)) { ret = xf86SetDDCproperties(pScrn,xf86PrintEDID(xf86DoEDID_DDC2( pScrn->scrnIndex,nPtr->I2C))); @@ -3229,7 +3135,6 @@ neoDoDDCVBE(ScrnInfoPtr pScrn) VGAwGR(0x09,0x26); if (xf86LoadSubModule(pScrn, "vbe")) { - xf86LoaderReqSymLists(vbeSymbols, NULL); if ((pVbe = VBEInit(NULL,nPtr->pEnt->index))) { ret = xf86SetDDCproperties( pScrn,xf86PrintEDID(vbeDoEDID(pVbe,NULL))); commit 31e1e1e4a789295545d6924031ba6d56078f9afa Author: Alan Coopersmith <[email protected]> Date: Fri Jan 9 16:31:03 2009 -0800 Remove xorgconfig & xorgcfg from See Also list in man page diff --git a/man/neomagic.man b/man/neomagic.man index e5d59bf..9daffe5 100644 --- a/man/neomagic.man +++ b/man/neomagic.man @@ -90,7 +90,7 @@ following options are needed to avoid a lock-up of the graphic engine: .fi .SH "SEE ALSO" -__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__) +__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors include: Jens Owen, Kevin E. Martin, and also Egbert Eich, Mark Vojkovich, Alan Hourihane. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
