1 --- XFree86-4.2.1/xc42/programs/Xserver/hw/xfree86/drivers/i740/i740.h Fri May 4 15:05:39 2001
2 +++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/i740/i740.h Fri Jan 25 16:56:02 2002
5 typedef struct _I740Rec *I740Ptr;
7 -typedef void (*I740WriteIndexedByteFunc)(I740Ptr pI740, int addr,
8 +typedef void (*I740WriteIndexedByteFunc)(I740Ptr pI740, IOADDRESS addr,
9 unsigned char index, char value);
10 -typedef char (*I740ReadIndexedByteFunc)(I740Ptr pI740, int addr,
11 +typedef char (*I740ReadIndexedByteFunc)(I740Ptr pI740, IOADDRESS addr,
13 -typedef void (*I740WriteByteFunc)(I740Ptr pI740, int addr, unsigned char value);
14 -typedef char (*I740ReadByteFunc)(I740Ptr pI740, int addr);
15 +typedef void (*I740WriteByteFunc)(I740Ptr pI740, IOADDRESS addr,
16 + unsigned char value);
17 +typedef char (*I740ReadByteFunc)(I740Ptr pI740, IOADDRESS addr);
20 unsigned char DisplayControl;
22 I740WriteByteFunc writeStandard;
23 I740ReadByteFunc readStandard;
24 OptionInfoPtr Options;
28 #define I740PTR(p) ((I740Ptr)((p)->driverPrivate))
29 --- XFree86-4.2.1/xc42/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c Sat Mar 3 17:26:12 2001
30 +++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/i740/i740_accel.c Fri Jan 25 16:56:02 2002
34 I740SyncPIO(ScrnInfoPtr pScrn) {
35 + I740Ptr pI740 = I740PTR(pScrn);
36 WAIT_ENGINE_IDLE_PIO();
39 --- XFree86-4.2.1/xc42/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c Fri Jan 4 16:22:31 2002
40 +++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c Fri Jan 25 16:56:02 2002
43 /* Allocate a vgaHWRec */
44 if (!vgaHWGetHWRec(pScrn)) return FALSE;
45 + hwp = VGAHWPTR(pScrn);
46 + pI740->ioBase = hwp->PIOOffset;
48 pI740->PciInfo = xf86GetPciInfoForEntity(pI740->pEnt->index);
49 pI740->PciTag = pciTag(pI740->PciInfo->bus, pI740->PciInfo->device,
51 /* We use a programmable clock */
52 pScrn->progClock = TRUE;
54 - hwp = VGAHWPTR(pScrn);
55 pI740->cpp = pScrn->bitsPerPixel/8;
57 /* We have to use PIO to probe, because we haven't mappend yet */
58 @@ -1736,11 +1737,6 @@
60 I740SaveScreen(ScreenPtr pScreen, int mode)
63 - Bool unblack = xf86IsUnblank(mode);
64 - if (unblack) outw(SRX, 0x0300);
65 - else outw(SRX, 0x0100);
67 return vgaHWSaveScreen(pScreen, mode);
70 --- XFree86-4.2.1/xc42/programs/Xserver/hw/xfree86/drivers/i740/i740_io.c Tue Feb 22 23:47:14 2000
71 +++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/i740/i740_io.c Fri Jan 25 16:56:03 2002
76 -static void I740WriteControlPIO(I740Ptr pI740, int addr, unsigned char index, char val) {
78 +I740WriteControlPIO(I740Ptr pI740, IOADDRESS addr,
79 + unsigned char index, char val)
81 + addr += pI740->ioBase;
86 -static char I740ReadControlPIO(I740Ptr pI740, int addr, unsigned char index) {
88 +I740ReadControlPIO(I740Ptr pI740, IOADDRESS addr, unsigned char index)
90 + addr += pI740->ioBase;
95 -static void I740WriteStandardPIO(I740Ptr pI740, int addr, unsigned char val) {
98 +I740WriteStandardPIO(I740Ptr pI740, IOADDRESS addr, unsigned char val)
100 + outb(pI740->ioBase + addr, val);
103 -static char I740ReadStandardPIO(I740Ptr pI740, int addr) {
106 +I740ReadStandardPIO(I740Ptr pI740, IOADDRESS addr)
108 + return inb(pI740->ioBase + addr);
111 -void I740SetPIOAccess(I740Ptr pI740) {
113 +I740SetPIOAccess(I740Ptr pI740)
115 pI740->writeControl=I740WriteControlPIO;
116 pI740->readControl=I740ReadControlPIO;
117 pI740->writeStandard=I740WriteStandardPIO;
118 pI740->readStandard=I740ReadStandardPIO;
121 -static void I740WriteControlMMIO(I740Ptr pI740, int addr, unsigned char index, char val) {
123 +I740WriteControlMMIO(I740Ptr pI740, IOADDRESS addr,
124 + unsigned char index, char val)
130 -static char I740ReadControlMMIO(I740Ptr pI740, int addr, unsigned char index) {
132 +I740ReadControlMMIO(I740Ptr pI740, IOADDRESS addr, unsigned char index)
138 -static void I740WriteStandardMMIO(I740Ptr pI740, int addr, unsigned char val) {
140 +I740WriteStandardMMIO(I740Ptr pI740, IOADDRESS addr, unsigned char val)
145 -static char I740ReadStandardMMIO(I740Ptr pI740, int addr) {
147 +I740ReadStandardMMIO(I740Ptr pI740, IOADDRESS addr)
152 -void I740SetMMIOAccess(I740Ptr pI740) {
154 +I740SetMMIOAccess(I740Ptr pI740)
156 pI740->writeControl=I740WriteControlMMIO;
157 pI740->readControl=I740ReadControlMMIO;
158 pI740->writeStandard=I740WriteStandardMMIO;
159 pI740->readStandard=I740ReadStandardMMIO;
162 --- XFree86-4.2.1/xc42/programs/Xserver/hw/xfree86/drivers/i740/i740_macros.h Tue Feb 22 23:47:14 2000
163 +++ XFree86-4.2.1/xc/programs/Xserver/hw/xfree86/drivers/i740/i740_macros.h Fri Jan 25 16:56:03 2002
167 #define WAIT_ENGINE_IDLE_PIO() { \
168 - outb(XRX, BITBLT_CNTL); \
169 - while (inb(XRX+1) & BITBLT_STATUS) \
170 - outb(XRX, BITBLT_CNTL); \
171 + outb(pI740->ioBase + XRX, BITBLT_CNTL); \
172 + while (inb(pI740->ioBase + XRX + 1) & BITBLT_STATUS) \
173 + outb(pI740->ioBase + XRX, BITBLT_CNTL); \
176 #define WAIT_ENGINE_IDLE_MMIO() { \