diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:41 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:41 +0000 |
| commit | bb8ec8f8d979f53c683020b66dddb250e63fca07 (patch) | |
| tree | acf00238f12c54d87ddbc7050b8071cc5db69add | |
| parent | 4c8db25829e320eaf9c85f9a0b6442a931bd4840 (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge
| -rw-r--r-- | src/ark.h | 2 | ||||
| -rw-r--r-- | src/ark_accel.c | 2 | ||||
| -rw-r--r-- | src/ark_driver.c | 8 | ||||
| -rw-r--r-- | src/ark_reg.h | 2 |
4 files changed, 6 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */ /* * ark */ diff --git a/src/ark_accel.c b/src/ark_accel.c index 9b68479..11b478c 100644 --- a/src/ark_accel.c +++ b/src/ark_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */ /* * Copyright 2000 Ani Joshi <ajoshi@unixbox.com> * diff --git a/src/ark_driver.c b/src/ark_driver.c index 604766b..444e3c5 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -148,7 +148,7 @@ static XF86ModuleVersionInfo ARKVersRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XORG_VERSION_CURRENT, + XF86_VERSION_CURRENT, VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -391,10 +391,8 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) + (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24); - pScrn->memPhysBase = pARK->FBAddress; - - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n", - (unsigned long)pARK->FBAddress); + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%x\n", + pARK->FBAddress); if (!xf86SetGamma(pScrn, gzeros)) return FALSE; diff --git a/src/ark_reg.h b/src/ark_reg.h index 727dbdf..91a9301 100644 --- a/src/ark_reg.h +++ b/src/ark_reg.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.1 2000/11/14 17:28:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */ #ifndef _ARK_REG_H #define _ARK_REG_H |