xserver-xorg-video-i740: Changes to 'upstream-unstable'
.cvsignore | 19 -------
.gitignore | 20 ++++++++
configure.ac | 15 +++++-
man/Makefile.am | 1
src/Makefile.am | 1
src/i740.h | 5 +-
src/i740_accel.c | 1
src/i740_cursor.c | 1
src/i740_dga.c | 1
src/i740_dga.h | 1
src/i740_driver.c | 59 ++++++++++++++++++++----
src/i740_i2c.c | 1
src/i740_io.c | 1
src/i740_macros.h | 1
src/i740_pcirename.h | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/i740_reg.h | 1
src/i740_video.c | 1
17 files changed, 211 insertions(+), 40 deletions(-)
New commits:
commit fceb711ffe910bcea3177b883dd1a8c036582876
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 14:34:00 2008 -0400
i128 1.2.0
diff --git a/configure.ac b/configure.ac
index bf213be..04939fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i740],
- 1.1.0,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i740)
commit f13467f7fbedc4b6d3386ee1ac590783823e4fe6
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 14:31:45 2008 -0400
Fix distcheck
diff --git a/src/Makefile.am b/src/Makefile.am
index 39470b2..6f084aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,5 +38,6 @@ i740_drv_la_SOURCES = \
i740_i2c.c \
i740_io.c \
i740_macros.h \
+ i740_pcirename.h \
i740_reg.h \
i740_video.c
commit 3ce42de1932ddc9087ac501da7ff3867910c4fde
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 19 14:18:21 2008 -0400
Death to RCS tags.
diff --git a/src/i740.h b/src/i740.h
index aa31e3c..12a5597 100644
--- a/src/i740.h
+++ b/src/i740.h
@@ -25,7 +25,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740.h,v 1.8 2003/08/23 16:09:17 dawes Exp $ */
/*
* Authors:
diff --git a/src/i740_accel.c b/src/i740_accel.c
index c11bf84..81c7565 100644
--- a/src/i740_accel.c
+++ b/src/i740_accel.c
@@ -25,7 +25,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c,v 1.6 2002/01/25 21:56:02 tsi Exp $ */
/*
* Authors:
diff --git a/src/i740_cursor.c b/src/i740_cursor.c
index f3160b8..b61fc5b 100644
--- a/src/i740_cursor.c
+++ b/src/i740_cursor.c
@@ -25,7 +25,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_cursor.c,v 1.4 2000/02/23 04:47:13 martin Exp $ */
/*
* Authors:
diff --git a/src/i740_dga.c b/src/i740_dga.c
index 170e38f..19a6d0d 100644
--- a/src/i740_dga.c
+++ b/src/i740_dga.c
@@ -21,7 +21,6 @@
*
* Authors: Patrick LERDA
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.c,v 1.1tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/i740_dga.h b/src/i740_dga.h
index ea00de2..4a4f8e8 100644
--- a/src/i740_dga.h
+++ b/src/i740_dga.h
@@ -21,6 +21,5 @@
*
* Authors: Patrick LERDA
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.h,v 1.1 2002/10/21 13:32:58 alanh Exp $ */
Bool I740DGAInit(ScreenPtr pScreen);
diff --git a/src/i740_driver.c b/src/i740_driver.c
index f118637..8d66f22 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -25,7 +25,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c,v 1.49tsi Exp $ */
/*
* Authors:
diff --git a/src/i740_i2c.c b/src/i740_i2c.c
index e741eeb..e57c7b0 100644
--- a/src/i740_i2c.c
+++ b/src/i740_i2c.c
@@ -21,7 +21,6 @@
*
* Authors: Patrick LERDA
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/i740_io.c b/src/i740_io.c
index bfa6a10..2464d98 100644
--- a/src/i740_io.c
+++ b/src/i740_io.c
@@ -24,7 +24,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_io.c,v 1.4 2002/01/25 21:56:03 tsi Exp $ */
/*
* Authors:
diff --git a/src/i740_macros.h b/src/i740_macros.h
index 797b89f..7b06d0d 100644
--- a/src/i740_macros.h
+++ b/src/i740_macros.h
@@ -25,7 +25,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_macros.h,v 1.4 2002/10/21 13:32:58 alanh Exp $ */
/*
* Authors:
diff --git a/src/i740_reg.h b/src/i740_reg.h
index 0366d7e..e14de53 100644
--- a/src/i740_reg.h
+++ b/src/i740_reg.h
@@ -25,7 +25,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_reg.h,v 1.2 2000/02/23 04:47:14 martin Exp $ */
/*
* Authors:
diff --git a/src/i740_video.c b/src/i740_video.c
index e1aa5d0..ad6c5f9 100644
--- a/src/i740_video.c
+++ b/src/i740_video.c
@@ -44,7 +44,6 @@
* 12 September 2002 - Better software scaling with some averaging, giving a
* nicer picture.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_video.c,v 1.5tsi Exp $ */
/*
commit e26359a603d502d44081941fe566a47c5690bc91
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Mar 10 01:15:50 2008 -0300
Minor fixes to compile with pciaccess.
o Fix a typo
o Protect call to xf86GetPciVideoInfo with ifndef XSERVER_LIBPCIACCESS
o Some minor consistency in macro names in i740_pcirename.h
diff --git a/src/i740_driver.c b/src/i740_driver.c
index ee25967..f118637 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -378,11 +378,13 @@ I740Probe(DriverPtr drv, int flags) {
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
/*
Since these Probing is just checking the PCI data the server already
collected.
*/
if (!xf86GetPciVideoInfo()) return FALSE;
+#endif
/* Look for Intel based chips */
numUsed = xf86MatchPciInstances(I740_NAME, PCI_VENDOR_INTEL,
@@ -600,7 +602,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
pI740->pEnt->device->chipID);
} else {
from = X_PROBED;
- pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVIE_ID(pI740->PciInfo));
+ pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVICE_ID(pI740->PciInfo));
}
if (pI740->pEnt->device->chipRev >= 0) {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
diff --git a/src/i740_pcirename.h b/src/i740_pcirename.h
index cbd3dcf..e783713 100644
--- a/src/i740_pcirename.h
+++ b/src/i740_pcirename.h
@@ -26,8 +26,8 @@
* library. The main purpose being to facilitate source code compatibility.
*/
-#ifndef ASTPCIRENAME_H
-#define ASTPCIRENAME_H
+#ifndef I740PCIRENAME_H
+#define I740PCIRENAME_H
enum region_type {
REGION_MEM,
@@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr;
#endif /* XSERVER_LIBPCIACCESS */
-#endif /* CIRPCIRENAME_H */
+#endif /* i740PCIRENAME_H */
commit 8c31b2e40951c62d362e9a95d8a7b29018626ef2
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Mar 10 12:08:10 2008 +1000
i740: pciaccess conversion
diff --git a/configure.ac b/configure.ac
index e5524fb..bf213be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,10 +58,23 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# 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)
+
+
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff --git a/src/i740.h b/src/i740.h
index 267c13c..aa31e3c 100644
--- a/src/i740.h
+++ b/src/i740.h
@@ -36,6 +36,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _I740_H_
#define _I740_H_
+#include "i740_pcirename.h"
+
#include "xf86PciInfo.h"
#include "xf86Pci.h"
@@ -99,7 +101,9 @@ typedef struct _I740Rec {
unsigned long MMIOAddr;
EntityInfoPtr pEnt;
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
int HasSGRAM;
I740RegRec SavedReg;
I740RegRec ModeReg;
diff --git a/src/i740_driver.c b/src/i740_driver.c
index 21651a2..ee25967 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -508,8 +508,10 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
if (!vgaHWGetHWRec(pScrn)) return FALSE;
pI740->PciInfo = xf86GetPciInfoForEntity(pI740->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pI740->PciTag = pciTag(pI740->PciInfo->bus, pI740->PciInfo->device,
pI740->PciInfo->func);
+#endif
if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone))
return FALSE;
@@ -598,7 +600,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
pI740->pEnt->device->chipID);
} else {
from = X_PROBED;
- pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, pI740->PciInfo->chipType);
+ pScrn->chipset = (char *)xf86TokenToString(I740Chipsets, PCI_DEV_DEVIE_ID(pI740->PciInfo));
}
if (pI740->pEnt->device->chipRev >= 0) {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
@@ -611,8 +613,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
pI740->LinearAddr = pI740->pEnt->device->MemBase;
from = X_CONFIG;
} else {
- if (pI740->PciInfo->memBase[1] != 0) {
- pI740->LinearAddr = pI740->PciInfo->memBase[0]&0xFF000000;
+ if (PCI_REGION_BASE(pI740->PciInfo, 0, REGION_MEM) != 0) {
+ pI740->LinearAddr = PCI_REGION_BASE(pI740->PciInfo, 0, REGION_MEM)&0xFF000000;
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -628,8 +630,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
pI740->MMIOAddr = pI740->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- if (pI740->PciInfo->memBase[1]) {
- pI740->MMIOAddr = pI740->PciInfo->memBase[1]&0xFFF80000;
+ if (PCI_REGION_BASE(pI740->PciInfo, 1, REGION_MEM)) {
+ pI740->MMIOAddr = PCI_REGION_BASE(pI740->PciInfo, 1, REGION_MEM)&0xFFF80000;
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -871,18 +873,48 @@ static Bool I740MapMem(ScrnInfoPtr pScrn)
pI740 = I740PTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT;
pI740->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
pI740->PciTag,
pI740->MMIOAddr,
0x80000);
+#else
+ {
+ void** result = (void**)&pI740->MMIOBase;
+ int err = pci_device_map_range(pI740->PciInfo,
+ pI740->MMIOAddr,
+ 0x80000,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+
+#endif
if (!pI740->MMIOBase) return FALSE;
+#ifndef XSERVER_LIBPCIACCESS
pI740->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pI740->PciTag,
pI740->LinearAddr,
pI740->FbMapSize);
+#else
+ {
+ void** result = (void**)&pI740->FbBase;
+ int err = pci_device_map_range(pI740->PciInfo,
+ pI740->LinearAddr,
+ pI740->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (!pI740->FbBase) return FALSE;
return TRUE;
@@ -894,10 +926,18 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn)
pI740 = I740PTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pI740->MMIOBase, 0x80000);
+#else
+ pci_device_unmap_range(pI740->PciInfo, pI740->MMIOBase, 0x80000);
+#endif
pI740->MMIOBase=0;
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pI740->FbBase, pI740->FbMapSize);
+#else
+ pci_device_unmap_range(pI740->PciInfo, pI740->FbBase, pI740->FbMapSize);
+#endif
pI740->FbBase = 0;
return TRUE;
}
diff --git a/src/i740_pcirename.h b/src/i740_pcirename.h
new file mode 100644
index 0000000..cbd3dcf
--- /dev/null
+++ b/src/i740_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef ASTPCIRENAME_H
+#define ASTPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
commit 870eb9fe825917b2bec48ec2b95ad794e585bf09
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:31:47 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 5241aee2f633bab3c22b44d6b5f907973924fcd8
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 11:28:16 2007 +0200
Define I740_*_VERSION* using PACKAGE_VERSION_*
diff --git a/src/i740_driver.c b/src/i740_driver.c
index c21163d..21651a2 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -142,9 +142,9 @@ static Bool I740UnmapMem(ScrnInfoPtr pScrn);
#define I740_VERSION 4000
#define I740_NAME "I740"
#define I740_DRIVER_NAME "i740"
-#define I740_MAJOR_VERSION 1
-#define I740_MINOR_VERSION 1
-#define I740_PATCHLEVEL 0
+#define I740_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define I740_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define I740_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
_X_EXPORT DriverRec I740 = {
I740_VERSION,
commit 87f355c3d5b007c5ae24c0fcc1c2c2c97b2dc7ef
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 10:46:32 2007 -0800
renamed: .cvsignore -> .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2df4a8d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+*~
Reply to: