diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-06-25 21:16:52 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-06-25 21:16:52 +0000 |
| commit | 827e5d59662065d4caff6b1db52a6672217c06c6 (patch) | |
| tree | 9ea5cc7fba94a613292fe8421e2000b40767e605 /src | |
| parent | e0cc898635fe405bc16ce915942e37623180aeb1 (diff) | |
Bug #3626: _X_EXPORT tags for video and input drivers.XORG-6_8_99_14XORG-6_8_99_13
Diffstat (limited to 'src')
| -rw-r--r-- | src/ark_driver.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ark_driver.c b/src/ark_driver.c index 444e3c5..ac490c7 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -76,7 +76,7 @@ static unsigned char get_daccomm(IOADDRESS); static unsigned char set_daccom(IOADDRESS, unsigned char comm); -DriverRec ARK = +_X_EXPORT DriverRec ARK = { ARK_VERSION, DRIVER_NAME, @@ -148,7 +148,7 @@ static XF86ModuleVersionInfo ARKVersRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -156,7 +156,7 @@ static XF86ModuleVersionInfo ARKVersRec = { {0, 0, 0, 0} }; -XF86ModuleData arkModuleData = { &ARKVersRec, ARKSetup, NULL }; +_X_EXPORT XF86ModuleData arkModuleData = { &ARKVersRec, ARKSetup, NULL }; pointer ARKSetup(pointer module, pointer opts, int *errmaj, int *errmin) { @@ -391,8 +391,10 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) + (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24); - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%x\n", - pARK->FBAddress); + pScrn->memPhysBase = pARK->FBAddress; + + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n", + (unsigned long)pARK->FBAddress); if (!xf86SetGamma(pScrn, gzeros)) return FALSE; |