diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-02-10 10:18:42 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-02-10 10:18:42 +0000 |
| commit | e55d464c59070f52bd9011118c121b64ee30b00e (patch) | |
| tree | f17b4d5eb42ef8174d791a2235e8f03365d2cdfb /driver/xf86-video-i740/src | |
| parent | 649b0f19c8eaf5aaab16376501214f798380b348 (diff) | |
Update to xf86-video-i740 1.4.0
Diffstat (limited to 'driver/xf86-video-i740/src')
| -rw-r--r-- | driver/xf86-video-i740/src/i740.h | 6 | ||||
| -rw-r--r-- | driver/xf86-video-i740/src/i740_accel.c | 1 | ||||
| -rw-r--r-- | driver/xf86-video-i740/src/i740_dga.c | 1 | ||||
| -rw-r--r-- | driver/xf86-video-i740/src/i740_driver.c | 2 | ||||
| -rw-r--r-- | driver/xf86-video-i740/src/i740_i2c.c | 1 | ||||
| -rw-r--r-- | driver/xf86-video-i740/src/i740_video.c | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/driver/xf86-video-i740/src/i740.h b/driver/xf86-video-i740/src/i740.h index 3723e57a0..3439d7d9b 100644 --- a/driver/xf86-video-i740/src/i740.h +++ b/driver/xf86-video-i740/src/i740.h @@ -37,7 +37,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i740_pcirename.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "i740_reg.h" @@ -58,6 +57,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define OUTREG16(addr, val) *(volatile CARD16 *)(pI740->MMIOBase + (addr)) = (val) #define OUTREG(addr, val) *(volatile CARD32 *)(pI740->MMIOBase + (addr)) = (val) +#define PCI_VENDOR_REAL3D 0x003D +#define PCI_CHIP_I740_PCI 0x00D1 +#define PCI_VENDOR_INTEL 0x8086 +#define PCI_CHIP_I740_AGP 0x7800 + typedef struct _I740Rec *I740Ptr; typedef void (*I740WriteIndexedByteFunc)(I740Ptr pI740, int addr, diff --git a/driver/xf86-video-i740/src/i740_accel.c b/driver/xf86-video-i740/src/i740_accel.c index de06e07ab..b1e982c09 100644 --- a/driver/xf86-video-i740/src/i740_accel.c +++ b/driver/xf86-video-i740/src/i740_accel.c @@ -42,7 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "compiler.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "vgaHW.h" diff --git a/driver/xf86-video-i740/src/i740_dga.c b/driver/xf86-video-i740/src/i740_dga.c index c16cce381..f1103adb1 100644 --- a/driver/xf86-video-i740/src/i740_dga.c +++ b/driver/xf86-video-i740/src/i740_dga.c @@ -29,7 +29,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "vgaHW.h" #include "xf86xv.h" #include "i740.h" diff --git a/driver/xf86-video-i740/src/i740_driver.c b/driver/xf86-video-i740/src/i740_driver.c index 7c1051d5b..a3675b64b 100644 --- a/driver/xf86-video-i740/src/i740_driver.c +++ b/driver/xf86-video-i740/src/i740_driver.c @@ -780,7 +780,9 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { static Bool I740MapMem(ScrnInfoPtr pScrn) { +#ifndef XSERVER_LIBPCIACCESS int mmioFlags; +#endif I740Ptr pI740; pI740 = I740PTR(pScrn); diff --git a/driver/xf86-video-i740/src/i740_i2c.c b/driver/xf86-video-i740/src/i740_i2c.c index e57c7b09b..0ad504e96 100644 --- a/driver/xf86-video-i740/src/i740_i2c.c +++ b/driver/xf86-video-i740/src/i740_i2c.c @@ -33,7 +33,6 @@ #include "compiler.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "vgaHW.h" diff --git a/driver/xf86-video-i740/src/i740_video.c b/driver/xf86-video-i740/src/i740_video.c index fc2d137c3..89d94a63c 100644 --- a/driver/xf86-video-i740/src/i740_video.c +++ b/driver/xf86-video-i740/src/i740_video.c @@ -60,7 +60,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "compiler.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86fbman.h" #include "regionstr.h" |