xserver-xorg-video-ark: Changes to 'upstream-unstable'
configure.ac | 19 ++
src/Makefile.am |1
src/ark.h|7 +++
src/ark_accel.c | 12 +++---
src/ark_driver.c | 60 -
src/compat-api.h | 99 +++
6 files changed, 160 insertions(+), 38 deletions(-)
New commits:
commit 8d63c607ceab903dbe36eccf2315065e6830a47e
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-ark: bump to version 0.7.5
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/configure.ac b/configure.ac
index 752ead8..c5fd78f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-ark],
-[0.7.4],
+[0.7.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorgcomponent=Driver/ark],
[xf86-video-ark])
AC_CONFIG_SRCDIR([Makefile.am])
commit daf57a350326ff886de77609702944ec939a3495
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 17 14:51:38 2012 +1000
convert to new X screen conversion api
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 2ec5070..d279b2f 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -189,7 +189,7 @@ static void ARKSubsequentScreenToScreenCopy(ScrnInfoPtr
pScrn,
Bool ARKAccelInit(ScreenPtr pScreen)
{
#ifdef HAVE_XAA_H
- ScrnInfoPtr pScrn = xf86Screens[pScreen-myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ARKPtr pARK = ARKPTR(pScrn);
XAAInfoRecPtr pXAA;
commit 8c29d34510d7dfd786660827a09d1d60454ea32a
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 17 13:59:15 2012 +1000
ark: update for compat X server ABI.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/Makefile.am b/src/Makefile.am
index fdc7bea..813234b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,6 +32,7 @@ ark_drv_la_LDFLAGS = -module -avoid-version
ark_drv_ladir = @moduledir@/drivers
ark_drv_la_SOURCES = \
+ compat-api.h \
ark_accel.c \
ark_driver.c \
ark.h \
diff --git a/src/ark.h b/src/ark.h
index bee8d1a..ba94b1a 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -12,6 +12,7 @@
#endif
#include vgaHW.h
+#include compat-api.h
#define PCI_VENDOR_ARK 0xEDD8
#define PCI_CHIP_1000PV0xA091
#define PCI_CHIP_2000PV0xA099
@@ -58,7 +59,7 @@ typedef struct _ARKRec {
int ramdac;
ARKRegRec SavedRegs; /* original mode */
ARKRegRec ModeRegs; /* current mode */
- Bool(*CloseScreen)(int, ScreenPtr);
+ Bool(*CloseScreen)(CLOSE_SCREEN_ARGS_DECL);
} ARKRec, *ARKPtr;
diff --git a/src/ark_driver.c b/src/ark_driver.c
index d550f2e..b7c287c 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -62,19 +62,18 @@ static const OptionInfoRec * ARKAvailableOptions(int
chipid, int busid);
static void ARKIdentify(int flags);
static Bool ARKProbe(DriverPtr drv, int flags);
static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags);
-static Bool ARKEnterVT(int scrnIndex, int flags);
-static void ARKLeaveVT(int scrnIndex, int flags);
+static Bool ARKEnterVT(VT_FUNC_ARGS_DECL);
+static void ARKLeaveVT(VT_FUNC_ARGS_DECL);
static void ARKSave(ScrnInfoPtr pScrn);
-static Bool ARKScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
- char **argv);
+static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL);
static Bool ARKMapMem(ScrnInfoPtr pScrn);
static void ARKUnmapMem(ScrnInfoPtr pScrn);
static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
-static void ARKAdjustFrame(int scrnIndex, int x, int y, int flags);
-Bool ARKSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-Bool ARKCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static void ARKAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+Bool ARKSwitchMode(SWITCH_MODE_ARGS_DECL);
+Bool ARKCloseScreen(CLOSE_SCREEN_ARGS_DECL);
Bool ARKSaveScreen(ScreenPtr pScreen, int mode);
-static void ARKFreeScreen(int scrnIndex, int flags);
+static void ARKFreeScreen(FREE_SCREEN_ARGS_DECL);
static void ARKLoadPalette(ScrnInfoPtr pScrn, int numColors,
int *indicies, LOCO *colors,
VisualPtr pVisual);
@@ -476,10 +475,9 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
return TRUE;
}
-static Bool ARKScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
- char **argv)
+static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen-myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ARKPtr pARK = ARKPTR(pScrn);
pScrn-fbOffset = 0;
@@ -498,7 +496,7 @@ static Bool ARKScreenInit(int scrnIndex, ScreenPtr pScreen,
int argc,
ARKSaveScreen(pScreen,
xserver-xorg-video-ark: Changes to 'upstream-unstable'
.gitignore | 70 ---
COPYING | 26 +
ChangeLog| 48
Makefile.am | 11 +
configure.ac | 56 +++-
src/.gitignore |6 ---
src/Makefile.am |3 +
src/ark.h| 12 --
src/ark_accel.c |6 ++-
src/ark_driver.c | 108 +++
10 files changed, 192 insertions(+), 154 deletions(-)
New commits:
commit da0262acee5ea37ea8c69ebadbf5e9e34d83b5f3
Author: Matt Turner matts...@gmail.com
Date: Thu Feb 16 18:39:50 2012 -0500
Don't check for unneeded proto headers.
Signed-off-by: Matt Turner matts...@gmail.com
diff --git a/configure.ac b/configure.ac
index f859488..8d3d470 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,6 @@ AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
AC_SUBST(moduledir)
# Store the list of server defined optional extensions in REQUIRED_MODULES
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Obtain compiler/linker options for the driver dependencies
commit e7baf1df0bbc45e1cd697f5df959586ab27103f9
Author: Matt Turner matts...@gmail.com
Date: Thu Jan 26 18:04:34 2012 -0500
xf86-video-ark 0.7.4
Signed-off-by: Matt Turner matts...@gmail.com
diff --git a/configure.ac b/configure.ac
index 0eb7121..f859488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-ark],
-[0.7.3],
+[0.7.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorgcomponent=Driver/ark],
[xf86-video-ark])
AC_CONFIG_SRCDIR([Makefile.am])
commit c2667fb882429f9393b0700a2befe6dde4523f02
Author: Matt Turner matts...@gmail.com
Date: Thu Jan 26 18:03:16 2012 -0500
Change types of FBBase/MMIOBase to pointer, remove casts
Signed-off-by: Matt Turner matts...@gmail.com
diff --git a/src/ark.h b/src/ark.h
index f1bdb35..7462876 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -39,8 +39,8 @@ typedef struct _ARKRec {
#endif
EntityInfoPtr pEnt;
CARD32 IOAddress;
- unsigned char * FBBase;
- unsigned char * MMIOBase;
+ pointer FBBase;
+ pointer MMIOBase;
unsigned long videoRam;
OptionInfoPtr Options;
unsigned intFlags;
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 1f4589c..cda8cdc 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1037,10 +1037,10 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
(void) pci_device_map_legacy(pARK-PciInfo, 0xb8000, 0x8000,
PCI_DEV_MAP_FLAG_WRITABLE,
-(void **)pARK-MMIOBase);
+pARK-MMIOBase);
{
- void** result = (void**)pARK-FBBase;
+ void** result = pARK-FBBase;
int err = pci_device_map_range(pARK-PciInfo,
pARK-PciInfo-regions[0].base_addr,
pScrn-videoRam * 1024,
@@ -1074,7 +1074,7 @@ static void ARKUnmapMem(ScrnInfoPtr pScrn)
vgaHWUnmapMem(pScrn);
#ifndef XSERVER_LIBPCIACCESS
- xf86UnMapVidMem(pScrn-scrnIndex, (pointer)pARK-FBBase,
+ xf86UnMapVidMem(pScrn-scrnIndex, pARK-FBBase,
pScrn-videoRam * 1024);
#else
pci_device_unmap_range(pARK-PciInfo, pARK-FBBase, pScrn-videoRam *
1024);
commit 99ed41779e28bace7c3321a6d05e6436d4784c48
Author: Matt Turner matts...@gmail.com
Date: Thu Jan 26 17:57:42 2012 -0500
Use pci_device_map_legacy rather than xf86MapDomainMemory
Signed-off-by: Matt Turner matts...@gmail.com
diff --git a/configure.ac b/configure.ac
index cbd61e3..0eb7121 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
CPPFLAGS=$SAVE_CPPFLAGS
if test x$XSERVER_LIBPCIACCESS = xyes; then
-PKG_CHECK_MODULES([PCIACCESS], [pciaccess = 0.8.0])
+PKG_CHECK_MODULES([PCIACCESS], [pciaccess = 0.12.901])
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
diff --git a/src/ark_driver.c b/src/ark_driver.c
index cf0242c..1f4589c 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1035,8 +1035,9 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
pScrn-videoRam * 1024);
#else
- pARK-MMIOBase = xf86MapDomainMemory(pScrn-scrnIndex, VIDMEM_MMIO,
-pARK-PciInfo, 0xb8000, 0x8000);
+ (void) pci_device_map_legacy(pARK-PciInfo, 0xb8000, 0x8000,
+PCI_DEV_MAP_FLAG_WRITABLE,
+(void **)pARK-MMIOBase);
xserver-xorg-video-ark: Changes to 'upstream-unstable'
README | 20
configure.ac |2 +-
src/ark_driver.c | 55 ---
3 files changed, 29 insertions(+), 48 deletions(-)
New commits:
commit 9d2a2c6b8de41c39f59602e04aac68644dadf45e
Author: Dave Airlie airl...@redhat.com
Date: Mon Sep 7 14:47:47 2009 +1000
ark: fix make distcheck
diff --git a/src/ark_driver.c b/src/ark_driver.c
index ee94a14..5de3b9a 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -45,6 +45,10 @@
#include fb.h
#include ark.h
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
+#include xf86Resources.h
+#endif
+
#include string.h
/*
commit 93856287f1e753d7df0ebfc51b12b425447138cf
Author: Dave Airlie airl...@redhat.com
Date: Mon Sep 7 14:44:22 2009 +1000
bump release to 0.7.2
diff --git a/configure.ac b/configure.ac
index 5d8ec8b..7267f4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ark],
-0.7.1,
+0.7.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit e521e8240c1acc49a514db123cb67beb669dea81
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 13:32:28 2009 +1000
ark: update for resources/RAC API removal
diff --git a/src/ark_driver.c b/src/ark_driver.c
index db5303c..ee94a14 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -35,7 +35,6 @@
#include xf86_OSproc.h
#include xf86Pci.h
#include xf86PciInfo.h
-#include xf86Resources.h
#include xf86fbman.h
#include xf86cmap.h
#include compiler.h
@@ -313,16 +312,7 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
}
pEnt = xf86GetEntityInfo(pScrn-entityList[0]);
- if (pEnt-resources) {
- xfree(pEnt);
- ARKFreeRec(pScrn);
- return FALSE;
- }
-
pARK-PciInfo = xf86GetPciInfoForEntity(pEnt-index);
- xf86RegisterResources(pEnt-index, NULL, ResNone);
- xf86SetOperatingState(resVgaIo, pEnt-index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pEnt-index, ResDisableOpr);
if (pEnt-device-chipset *pEnt-device-chipset) {
pScrn-chipset = pEnt-device-chipset;
commit 150d86dd0fff038db660f993d080cc3f7a09f6c5
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 10:03:50 2009 +1000
ark: switch to using pci config instead of active
diff --git a/src/ark_driver.c b/src/ark_driver.c
index e69250b..db5303c 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -207,7 +207,10 @@ static Bool ARKProbe(DriverPtr drv, int flags)
if (flags PROBE_DETECT)
foundScreen = TRUE;
else for (i=0; inumUsed; i++) {
- ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0);
+ ScrnInfoPtr pScrn = NULL;
+
+ pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
ARKPciChipsets,
+ NULL, NULL, NULL, NULL, NULL);
pScrn-driverVersion = VERSION_MAJOR;
pScrn-driverName = DRIVER_NAME;
@@ -221,8 +224,6 @@ static Bool ARKProbe(DriverPtr drv, int flags)
pScrn-LeaveVT = ARKLeaveVT;
pScrn-FreeScreen = ARKFreeScreen;
foundScreen = TRUE;
- xf86ConfigActivePciEntity(pScrn, usedChips[i], ARKPciChipsets,
- NULL, NULL, NULL, NULL, NULL);
}
xfree(usedChips);
commit 05ce888200307d9c6f16fbdbf732cbae8b5a3dae
Author: Adam Jackson a...@redhat.com
Date: Thu May 28 14:46:19 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 67eb076..e69250b 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -113,34 +113,6 @@ static const OptionInfoRec ARKOptions[] = {
{ -1, NULL, OPTV_NONE,{0}, FALSE }
};
-static const char *fbSymbols[] = {
- fbPictureInit,
- fbScreenInit,
- NULL
-};
-
-static const char *vgaHWSymbols[] = {
- vgaHWFreeHWRec,
- vgaHWGetHWRec,
- vgaHWGetIOBase,
- vgaHWGetIndex,
- vgaHWInit,
- vgaHWLock,
- vgaHWProtect,
- vgaHWRestore,
- vgaHWSave,
- vgaHWSaveScreen,
- vgaHWUnlock,
- vgaHWUnmapMem,
- NULL
-};
-
-static const char *xaaSymbols[] = {
- XAACreateInfoRec,
- XAAInit,
- NULL
-};
-
#ifdef XFree86LOADER
MODULESETUPPROTO(ARKSetup);
@@ -167,7 +139,6 @@ pointer ARKSetup(pointer module, pointer opts, int *errmaj,
int *errmin)
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(ARK, module, 0);
- LoaderRefSymLists(fbSymbols, vgaHWSymbols, xaaSymbols, NULL);
return (pointer) 1;
} else {
if (errmaj)
@@ -277,8 +248,6 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, vgahw))
return FALSE;
-
xserver-xorg-video-ark: Changes to 'upstream-unstable'
configure.ac |2 +- src/ark_driver.c |1 - 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit e686088ac1c4517184bbd676ec16c9bf5d010469 Author: Dave Airlie airl...@redhat.com Date: Mon Dec 22 15:24:57 2008 +1000 ark 0.7.1 diff --git a/configure.ac b/configure.ac index 987ae70..5d8ec8b 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ark], -0.7.0, +0.7.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-ark) commit b8dc5d7f4529dfddaa0ddeac68d96de4361b05cb Author: Adam Jackson a...@redhat.com Date: Fri Aug 15 14:02:34 2008 -0400 Uninclude xf86Version.h diff --git a/src/ark_driver.c b/src/ark_driver.c index 9b0f797..67eb076 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -35,7 +35,6 @@ #include xf86_OSproc.h #include xf86Pci.h #include xf86PciInfo.h -#include xf86Version.h #include xf86Resources.h #include xf86fbman.h #include xf86cmap.h -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-ark: Changes to 'upstream-unstable'
.cvsignore | 19 ---
.gitignore | 20
configure.ac | 15 ++-
src/.cvsignore |6 --
src/.gitignore |6 ++
src/ark.h| 13 -
src/ark_accel.c |1 -
src/ark_driver.c | 39 ---
src/ark_reg.h|1 -
9 files changed, 84 insertions(+), 36 deletions(-)
New commits:
commit 2a5d9ade17e5d084b25bf2afdc42d9d2d2147f49
Author: Adam Jackson [EMAIL PROTECTED]
Date: Wed Mar 19 13:17:03 2008 -0400
ark 0.7.0
diff --git a/configure.ac b/configure.ac
index 71a35cc..987ae70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ark],
-0.6.0,
+0.7.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit d6bed919dd458459079ff88a61665a0fb21be7ba
Author: Adam Jackson [EMAIL PROTECTED]
Date: Wed Mar 19 13:15:33 2008 -0400
Death to RCS tags.
diff --git a/src/ark.h b/src/ark.h
index fbbef48..de301dc 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29
15:15:44 keithp Exp $ */
/*
* ark
*/
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 315226d..8963e16 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6
2002/01/25 21:55:56 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi [EMAIL PROTECTED]
*
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 24418ff..9b0f797 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.22
2003/08/23 15:02:53 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi [EMAIL PROTECTED]
*
diff --git a/src/ark_reg.h b/src/ark_reg.h
index 91a9301..f773244 100644
--- a/src/ark_reg.h
+++ b/src/ark_reg.h
@@ -1,4 +1,3 @@
-/* $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
commit c87ab37ba6b06d81f024800f776cd20ff5a3a5b1
Author: Dave Airlie [EMAIL PROTECTED]
Date: Mon Mar 10 10:13:42 2008 +1000
ark: add basic pciaccess support
diff --git a/configure.ac b/configure.ac
index 87a7472..71a35cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,23 @@ AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
# Checks for libraries.
+SAVE_CPPFLAGS=$CPPFLAGS
+CPPFLAGS=$CPPFLAGS $XORG_CFLAGS
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include xorg-server.h])
+CPPFLAGS=$SAVE_CPPFLAGS
# Checks for header files.
AC_HEADER_STDC
+if test x$XSERVER_LIBPCIACCESS = xyes; then
+PKG_CHECK_MODULES([PCIACCESS], [pciaccess = 0.8.0])
+XORG_CFLAGS=$XORG_CFLAGS $PCIACCESS_CFLAGS
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
+
+
DRIVER_NAME=ark
AC_SUBST([DRIVER_NAME])
diff --git a/src/ark.h b/src/ark.h
index eed1553..fbbef48 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -27,8 +27,12 @@ typedef struct _ARKRegRec {
typedef struct _ARKRec {
+#ifndef XSERVER_LIBPCIACCESS
pciVideoPtr PciInfo;
PCITAG PciTag;
+#else
+ struct pci_device *PciInfo;
+#endif
EntityInfoPtr pEnt;
CARD32 IOAddress;
CARD32 FBAddress;
diff --git a/src/ark_driver.c b/src/ark_driver.c
index e5ee7e5..24418ff 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -366,7 +366,11 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn-scrnIndex, X_CONFIG, ChipID override:
0x%04X\n,
pARK-Chipset);
} else {
+#ifndef XSERVER_LIBPCIACCESS
pARK-Chipset = pARK-PciInfo-chipType;
+#else
+ pARK-Chipset = pARK-PciInfo-device_id;
+#endif
pScrn-chipset = (char *)xf86TokenToString(ARKChipsets,
pARK-Chipset);
}
@@ -375,15 +379,21 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
pARK-ChipRev = pEnt-device-chipRev;
xf86DrvMsg(pScrn-scrnIndex, X_CONFIG, ChipRev override: %d\n,
pARK-ChipRev);
- } else
+ } else {
+#ifndef XSERVER_LIBPCIACCESS
pARK-ChipRev = pARK-PciInfo-chipRev;
-
+#else
+ pARK-ChipRev = pARK-PciInfo-revision;
+#endif
+ }
xfree(pEnt);
xf86DrvMsg(pScrn-scrnIndex, X_CONFIG, Chipset: \%s\\n,
pScrn-chipset);
+#ifndef XSERVER_LIBPCIACCESS
pARK-PciTag = pciTag(pARK-PciInfo-bus, pARK-PciInfo-device,
pARK-PciInfo-func);
+#endif
/* unlock CRTC[0-7] */
outb(hwp-PIOOffset + hwp-IOBase + 4, 0x11);
@@ -1048,12 +1058,32 @@
xserver-xorg-video-ark: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 1e341ca5f80f603e0d139bf464ba0143249f32cb Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:37:02 2006 + Unlibcwrap. Bump server version requirement. Bump to 0.6.0. commit 8a81f9ec9d1faaeb4913596961c39a9b7400e230 Author: Luc Verhaegen [EMAIL PROTECTED] Date: Wed Feb 8 17:50:15 2006 + ARK: Remove wrong usage of pScrn-clock. commit 4d52b618aa10ebbb32ad9fc771cb1c1545cbb55c Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:29:59 2005 + Update package version for X11R7 release. commit 2fcf9c5df5d395d2e2e43949737303b0089bdb99 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 19 16:25:52 2005 + Stub COPYING files commit ccd9dc62d76526de1db316e2a548b1b4de199b3a Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:16 2005 + Update package version number for final X11R7 release candidate. commit 98973a0e64e801cec02f63c10660b9c1a69df68a Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:32 2005 + Update package version number for X11R7 RC3 release. commit d1a212a4e9d926a362665d0403ad3600a53b9345 Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Dec 2 02:16:07 2005 + Remove extraneous AC_MSG_RESULT. commit 6b41442a3d68b290442b5edb5094e60ef81606d8 Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Nov 29 23:29:57 2005 + Only build dlloader modules by default. commit 54808bc14a348f36cabac2168e18b4cf4244ba34 Author: Eric Anholt [EMAIL PROTECTED] Date: Mon Nov 21 10:49:09 2005 + Add .cvsignores for drivers. commit cccff99ea1f6d2483ba1c9c3ac438a609ca4cdf9 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:15:14 2005 + Update package version number for X11R7 RC2 release. commit 6a4e3fb5854ebaaa8a054ca8f28867b925844b25 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 1 15:08:52 2005 + Update pkgcheck depedencies to work with separate build roots. commit 69326ffc469a8b1c34dec1a8b6a426694bf199ac Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:48:02 2005 + Update package version number for RC1 release. commit e49525d59684b50255d07fe0d88960de891f6e13 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Oct 17 00:09:01 2005 + Use sed cpp to substitute variables in driver man pages commit 78879585f2a82d90b7cd64ee2fce05cac182f066 Author: Daniel Stone [EMAIL PROTECTED] Date: Thu Aug 18 09:03:45 2005 + Update autogen.sh to one that does objdir != srcdir. commit 25a5746b57a841c69c7c03ee217b8596f695b243 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Aug 10 14:07:24 2005 + Don\'t lose existing CFLAGS in all the input drivers and some of the video drivers commit ca9eb203e79ce1aaef5ae6fe6bdcb5f11ffe84c5 Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Jul 29 21:22:42 2005 + Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version commit 0092febd5aba5c208bee3b86dc4fcb27b2ffe1b6 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Thu Jul 14 00:28:44 2005 + - Add build system for xf86-video-ati - Add build system for xserver/xorg/hw/xfree86/dri - Add glcore.h to symlink.sh - Symlink.sh: add some more DRI files, symlink glcore.h from extras/Mesa/include/GL/internal to proto/GL - proto/GL/Makefile.am: install glcore.h - xf86-video-ark: s/module-dir/xorg-module-dir/ commit 2a195bccdc39b5e0241c03e0485a8afe1f0d2571 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Jul 13 22:02:27 2005 + driver/xf86-video-ark/src: Add Makefile.am commit 9cf05e94f77f859615b4cb35a6fb52b3939836aa Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Jul 13 18:08:41 2005 + Add accidentally left out PKG_CHECK_MODULES commit 6a04dd93ad508915ae8f263ab54b80fb9acec4df Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Jul 13 17:39:31 2005 + Build system for ark video driver commit 65141896d5bc62e71208eafa5160c21ff7e302f5 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Jul 11 02:29:44 2005 + Prep for modular builds by adding guarded #include config.h everywhere. commit 827e5d59662065d4caff6b1db52a6672217c06c6 Author: Adam Jackson [EMAIL PROTECTED] Date: Sat Jun 25 21:16:52 2005 + Bug #3626: _X_EXPORT tags for video and input drivers. commit e0cc898635fe405bc16ce915942e37623180aeb1 Author: Daniel Stone [EMAIL PROTECTED] Date: Wed Apr 20 12:25:22 2005 + Fix includes right throughout the Xserver tree:
