Annotation of /trunk/vgabios/patches/0001-Re-add-complete-defines-for-PCI-IDs.patch
Parent Directory | Revision Log
Revision 1800 -
(hide annotations)
(download)
Fri Jun 8 11:18:34 2012 UTC (12 years, 3 months ago) by niro
File size: 2158 byte(s)
Fri Jun 8 11:18:34 2012 UTC (12 years, 3 months ago) by niro
File size: 2158 byte(s)
-added patches for vgabios
1 | niro | 1800 | From ac29d6eed18acbee4816c109fee9d1ac70695669 Mon Sep 17 00:00:00 2001 |
2 | From: Doug Goldstein <cardoe@cardoe.com> | ||
3 | Date: Tue, 24 Jan 2012 21:18:02 -0600 | ||
4 | Subject: [PATCH 1/4] Re-add complete defines for PCI IDs. | ||
5 | |||
6 | Based on the patch from Gerd Hoffmann <kraxel@redhat.com> bb44e12f, | ||
7 | upstream appears to have accepted his patch but with modifications which | ||
8 | make his further patches for qxl, vmware and stdvga builds of the BIOS | ||
9 | not work. This commit just tweaks the code back to how he patched it | ||
10 | originally. | ||
11 | --- | ||
12 | Makefile | 4 ++-- | ||
13 | vbe.c | 2 +- | ||
14 | vgabios.c | 5 +---- | ||
15 | 3 files changed, 4 insertions(+), 7 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile b/Makefile | ||
18 | index bdc0abd..4411cb2 100644 | ||
19 | --- a/Makefile | ||
20 | +++ b/Makefile | ||
21 | @@ -31,8 +31,8 @@ VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h | ||
22 | VBE_FILES := vbe.h vbe.c vbetables.h | ||
23 | |||
24 | # build flags | ||
25 | -vgabios.bin : VGAFLAGS := -DVBE -DPCIBIOS | ||
26 | -vgabios.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DDEBUG | ||
27 | +vgabios.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111 | ||
28 | +vgabios.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111 -DDEBUG | ||
29 | vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS | ||
30 | vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG | ||
31 | |||
32 | diff --git a/vbe.c b/vbe.c | ||
33 | index 5636758..ae4488d 100644 | ||
34 | --- a/vbe.c | ||
35 | +++ b/vbe.c | ||
36 | @@ -928,7 +928,7 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI; | ||
37 | #ifdef PCI_VID | ||
38 | lfb_addr = pci_get_lfb_addr(PCI_VID); | ||
39 | #else | ||
40 | - lfb_addr = pci_get_lfb_addr(0x1234); // experimental vendor | ||
41 | + lfb_addr = 0; | ||
42 | #endif | ||
43 | if (lfb_addr > 0) { | ||
44 | info.PhysBasePtr = ((Bit32u)lfb_addr << 16); | ||
45 | diff --git a/vgabios.c b/vgabios.c | ||
46 | index 48c10f2..3588f7d 100644 | ||
47 | --- a/vgabios.c | ||
48 | +++ b/vgabios.c | ||
49 | @@ -210,12 +210,9 @@ vgabios_pci_data: | ||
50 | #ifdef CIRRUS | ||
51 | .word 0x1013 | ||
52 | .word 0x00b8 // CLGD5446 | ||
53 | -#elif defined(PCI_VID) && defined(PCI_DID) | ||
54 | +#elif defined(PCI_VID) | ||
55 | .word PCI_VID | ||
56 | .word PCI_DID | ||
57 | -#elif defined(VBE) | ||
58 | -.word 0x1234 | ||
59 | -.word 0x1111 // Bochs VBE support | ||
60 | #else | ||
61 | #error "Unknown PCI vendor and device id" | ||
62 | #endif | ||
63 | -- | ||
64 | 1.7.8.4 | ||
65 |