]>
Commit | Line | Data |
---|---|---|
3d715510 JB |
1 | diff -u orig/regs3v.h xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/regs3v.h |
2 | --- orig/regs3v.h Thu Nov 18 16:57:17 1999 | |
3 | +++ xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/regs3v.h Thu May 25 14:16:00 2000 | |
4 | @@ -46,13 +46,15 @@ | |
5 | ||
6 | ||
7 | #define VerticalRetraceWait() \ | |
8 | -{ \ | |
9 | +{ unsigned char tmp; \ | |
10 | + tmp = inb(vgaCRIndex); \ | |
11 | outb(vgaCRIndex, 0x17); \ | |
12 | if ( inb(vgaCRReg) & 0x80 ) { \ | |
13 | while ((inb(vgaIOBase + 0x0A) & 0x08) == 0x00) ; \ | |
14 | while ((inb(vgaIOBase + 0x0A) & 0x08) == 0x08) ; \ | |
15 | while ((inb(vgaIOBase + 0x0A) & 0x08) == 0x00) ; \ | |
16 | }\ | |
17 | + outb(vgaCRIndex, tmp); \ | |
18 | } | |
19 | ||
20 | #if 0 /* currently not used at all */ | |
21 | diff -u orig/s3v_accel.c xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/s3v_accel.c | |
22 | --- orig/s3v_accel.c Mon May 10 18:51:13 1999 | |
23 | +++ xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/s3v_accel.c Thu May 25 14:17:54 2000 | |
24 | @@ -321,7 +321,8 @@ | |
25 | S3VGEReset(int from_timeout, int line, char *file) | |
26 | { | |
27 | unsigned long gs1, gs2; /* -- debug info for graphics state -- */ | |
28 | - unsigned char tmp, sr1, resetidx; | |
29 | + /* HK: resetidx doesn't work yet, use read-only register for fake */ | |
30 | + unsigned char tmp, sr1, resetidx=0x2e; | |
31 | int r; | |
32 | int ge_was_on = 0; | |
33 | int32 fifo_control, miu_control, streams_timeout, misc_timeout; | |
34 | @@ -411,6 +412,7 @@ | |
35 | ||
36 | if(tmp & 0x01) { | |
37 | tmp &= ~0x01; | |
38 | + outb(vgaCRIndex,resetidx); | |
39 | outb(vgaCRReg, tmp); | |
40 | ge_was_on = 1; | |
41 | usleep(10000); | |
42 | @@ -421,6 +423,7 @@ | |
43 | usleep(10000); | |
44 | ||
45 | VerticalRetraceWait(); | |
46 | + outb(vgaCRIndex,resetidx); | |
47 | outb(vgaCRReg, (tmp & ~0x02)); | |
48 | usleep(10000); | |
49 |