2 ===================================================================
3 RCS file: /cvsroot/bochs/bochs/bios/apmbios.S,v
4 retrieving revision 1.4
5 diff -u -w -r1.4 apmbios.S
6 --- apmbios.S 26 Dec 2005 10:35:51 -0000 1.4
7 +++ apmbios.S 3 May 2006 21:22:46 -0000
17 ===================================================================
18 RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
19 retrieving revision 1.160
20 diff -u -w -r1.160 rombios.c
21 --- rombios.c 25 Jan 2006 17:51:49 -0000 1.160
22 +++ rombios.c 3 May 2006 21:22:48 -0000
25 printf(BX_APPNAME" BIOS - build: %s\n%s\nOptions: ",
26 BIOS_BUILD_DATE, bios_cvs_version_string);
36 + printf("apmbios pcibios eltorito \n\n");
40 //--------------------------------------------------------------------------
41 @@ -3999,6 +4003,29 @@
46 +void set_e820_range(ES, DI, start, end, type)
53 + write_word(ES, DI, start);
54 + write_word(ES, DI+2, start >> 16);
55 + write_word(ES, DI+4, 0x00);
56 + write_word(ES, DI+6, 0x00);
59 + write_word(ES, DI+8, end);
60 + write_word(ES, DI+10, end >> 16);
61 + write_word(ES, DI+12, 0x0000);
62 + write_word(ES, DI+14, 0x0000);
64 + write_word(ES, DI+16, type);
65 + write_word(ES, DI+18, 0x0);
69 int15_function32(regs, ES, DS, FLAGS)
70 pushad_regs_t regs; // REGS pushed via pushad
71 @@ -4063,19 +4090,8 @@
75 - write_word(ES, regs.u.r16.di, 0x00);
76 - write_word(ES, regs.u.r16.di+2, 0x00);
77 - write_word(ES, regs.u.r16.di+4, 0x00);
78 - write_word(ES, regs.u.r16.di+6, 0x00);
80 - write_word(ES, regs.u.r16.di+8, 0xFC00);
81 - write_word(ES, regs.u.r16.di+10, 0x0009);
82 - write_word(ES, regs.u.r16.di+12, 0x0000);
83 - write_word(ES, regs.u.r16.di+14, 0x0000);
85 - write_word(ES, regs.u.r16.di+16, 0x1);
86 - write_word(ES, regs.u.r16.di+18, 0x0);
88 + set_e820_range(ES, regs.u.r16.di,
89 + 0x0000000L, 0x0009fc00L, 1);
91 regs.u.r32.eax = 0x534D4150;
92 regs.u.r32.ecx = 0x14;
93 @@ -4083,6 +4099,24 @@
97 + set_e820_range(ES, regs.u.r16.di,
98 + 0x0009fc00L, 0x000a0000L, 2);
100 + regs.u.r32.eax = 0x534D4150;
101 + regs.u.r32.ecx = 0x14;
106 + set_e820_range(ES, regs.u.r16.di,
107 + 0x000e8000L, 0x00100000L, 2);
108 + regs.u.r32.ebx = 3;
109 + regs.u.r32.eax = 0x534D4150;
110 + regs.u.r32.ecx = 0x14;
115 extended_memory_size = inb_cmos(0x35);
116 extended_memory_size <<= 8;
117 extended_memory_size |= inb_cmos(0x34);
118 @@ -4092,9 +4126,9 @@
119 extended_memory_size = 0x3bc000; // everything after this is reserved memory until we get to 0x100000000
121 extended_memory_size *= 1024;
122 - extended_memory_size += 15728640; // make up for the 16mb of memory that is chopped off
123 + extended_memory_size += (16L * 1024 * 1024);
125 - if(extended_memory_size <= 15728640)
126 + if(extended_memory_size <= (16L * 1024 * 1024))
128 extended_memory_size = inb_cmos(0x31);
129 extended_memory_size <<= 8;
130 @@ -4102,28 +4136,23 @@
131 extended_memory_size *= 1024;
134 - write_word(ES, regs.u.r16.di, 0x0000);
135 - write_word(ES, regs.u.r16.di+2, 0x0010);
136 - write_word(ES, regs.u.r16.di+4, 0x0000);
137 - write_word(ES, regs.u.r16.di+6, 0x0000);
139 - write_word(ES, regs.u.r16.di+8, extended_memory_size);
140 - extended_memory_size >>= 16;
141 - write_word(ES, regs.u.r16.di+10, extended_memory_size);
142 - extended_memory_size >>= 16;
143 - write_word(ES, regs.u.r16.di+12, extended_memory_size);
144 - extended_memory_size >>= 16;
145 - write_word(ES, regs.u.r16.di+14, extended_memory_size);
147 - write_word(ES, regs.u.r16.di+16, 0x1);
148 - write_word(ES, regs.u.r16.di+18, 0x0);
150 - regs.u.r32.ebx = 0;
151 + set_e820_range(ES, regs.u.r16.di,
152 + 0x00100000L, extended_memory_size, 1);
153 + regs.u.r32.ebx = 4;
154 regs.u.r32.eax = 0x534D4150;
155 regs.u.r32.ecx = 0x14;
160 + /* 256KB BIOS area at the end of 4 GB */
161 + set_e820_range(ES, regs.u.r16.di,
162 + 0xfffc0000L, 0x00000000L, 2);
163 + regs.u.r32.ebx = 0;
164 + regs.u.r32.eax = 0x534D4150;
165 + regs.u.r32.ecx = 0x14;
168 default: /* AX=E820, DX=534D4150, BX unrecognized */
169 goto int15_unimplemented;
171 @@ -8713,6 +8742,7 @@
175 + and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
179 @@ -8823,17 +8853,17 @@
186 + and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
195 + and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
199 @@ -8971,7 +9001,7 @@
201 pci_real_f0d: ;; write configuration dword
203 - jne pci_real_unknown
205 call pci_real_select_reg
208 @@ -8979,6 +9009,46 @@
212 +pci_real_f0e: ;; get irq routing options
214 + jne pci_real_unknown
216 + cmp word ptr [di], #pci_routing_table_structure_end - pci_routing_table_structure_start
217 + jb pci_real_too_small
219 + mov word ptr [di], #pci_routing_table_structure_end - pci_routing_table_structure_start
227 + mov si, #pci_routing_table_structure_start
235 + mov cx, #pci_routing_table_structure_end - pci_routing_table_structure_start
244 + mov bx, #(1 << 9) | (1 << 11) ;; irq 9 and 11 are used
248 + mov word ptr [di], #pci_routing_table_structure_end - pci_routing_table_structure_start
255 @@ -9019,6 +9089,7 @@
256 dw 0,0 ;; Miniport data
257 db 0,0,0,0,0,0,0,0,0,0,0 ;; reserved
259 +pci_routing_table_structure_start:
260 ;; first slot entry PCI-to-ISA (embedded)
261 db 0 ;; pci bus number
262 db 0x08 ;; pci device number (bit 7-3)
263 @@ -9097,6 +9168,7 @@
264 dw 0xdef8 ;; IRQ bitmap INTD#
265 db 5 ;; physical slot (0 = embedded)
267 +pci_routing_table_structure_end: