2 ===================================================================
3 RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
4 retrieving revision 1.108
5 diff -u -w -r1.108 rombios.c
6 --- rombios.c 9 Feb 2004 16:48:50 -0000 1.108
7 +++ rombios.c 23 May 2004 15:48:52 -0000
9 type = read_byte(get_SS(),buffer+1) & 0x1f;
10 removable = (read_byte(get_SS(),buffer+0) & 0x80) ? 1 : 0;
11 mode = read_byte(get_SS(),buffer+96) ? ATA_MODE_PIO32 : ATA_MODE_PIO16;
14 write_byte(ebda_seg,&EbdaData->ata.devices[device].device, type);
15 write_byte(ebda_seg,&EbdaData->ata.devices[device].removable, removable);
33 @@ -3781,7 +3785,17 @@
34 write_word(ebda_seg, 0x0022, mouse_driver_offset);
35 write_word(ebda_seg, 0x0024, mouse_driver_seg);
36 mouse_flags_2 = read_byte(ebda_seg, 0x0027);
37 + if (mouse_driver_offset == 0 &&
38 + mouse_driver_seg == 0) {
39 + /* remove handler */
40 + if ( (mouse_flags_2 & 0x80) != 0 ) {
41 + mouse_flags_2 &= ~0x80;
42 + inhibit_mouse_int_and_events(); // disable IRQ12 and packets
45 + /* install handler */
46 mouse_flags_2 |= 0x80;
48 write_byte(ebda_seg, 0x0027, mouse_flags_2);
52 mouse_flags_2 = read_byte(ebda_seg, 0x0027);
54 if ( (mouse_flags_2 & 0x80) != 0x80 ) {
55 - BX_PANIC("int74_function:\n");
56 + // BX_PANIC("int74_function:\n");
60 package_count = mouse_flags_2 & 0x07;
61 @@ -4833,8 +4848,10 @@
62 // ---------------------------------------------------------------------------
65 -int13_cdrom(DI, SI, BP, SP, BX, DX, CX, AX, DS, ES, FLAGS)
66 - Bit16u DI, SI, BP, SP, BX, DX, CX, AX, DS, ES, FLAGS;
67 +int13_cdrom(DI, DIH, SI, SIH, BP, BPH, SP, SPH, BX, BXH, DX, DXH, CX, CXH, AX, AXH,
69 + Bit16u DI, DIH, SI, SIH, BP, BPH, SP, SPH, BX, BXH, DX, DXH, CX, CXH, AX, AXH,
72 Bit16u ebda_seg=read_word(0x0040,0x000E);
73 Bit8u device, status, locks;
74 @@ -7692,9 +7709,12 @@
79 + // ebx is modified: BSD 5.2.1 boot loader problem, so we save all
80 + // the 32 bit registers. It should be done in all the bios or no 32
81 + // bit register should be used without saving it first.
89 @@ -8401,57 +8421,69 @@
92 call pci_pro_select_reg
101 pci_pro_f09: ;; read configuration word
104 call pci_pro_select_reg
113 pci_pro_f0a: ;; read configuration dword
116 call pci_pro_select_reg
123 pci_pro_f0b: ;; write configuration byte
126 call pci_pro_select_reg
135 pci_pro_f0c: ;; write configuration word
138 call pci_pro_select_reg
147 pci_pro_f0d: ;; write configuration dword
150 call pci_pro_select_reg
159 @@ -8468,6 +8500,7 @@
167 @@ -8476,6 +8509,7 @@
175 @@ -8536,57 +8570,69 @@
178 call pci_real_select_reg
187 pci_real_f09: ;; read configuration word
190 call pci_real_select_reg
199 pci_real_f0a: ;; read configuration dword
202 call pci_real_select_reg
209 pci_real_f0b: ;; write configuration byte
212 call pci_real_select_reg
221 pci_real_f0c: ;; write configuration word
224 call pci_real_select_reg
233 pci_real_f0d: ;; write configuration dword
236 call pci_real_select_reg
245 @@ -8599,6 +8645,7 @@
253 @@ -8607,6 +8654,7 @@