gwj / at91sam9263 · Commits

Commit 5b1214a48ed5564e35e367864b744d81a6d4d660

Authored by bellard
1 parent 3f433d2c

int15, ah=86 BIOS fix (aka Solaris x86 hardware probe hang up fix) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@808 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 20 additions and 3 deletions
pc-bios/bios.bin
View file @5b1214a
No preview for this file type
pc-bios/bios.diff
  View file @5b1214a
@@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v @@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
4 retrieving revision 1.108 4 retrieving revision 1.108
5 diff -u -w -r1.108 rombios.c 5 diff -u -w -r1.108 rombios.c
6 --- rombios.c 9 Feb 2004 16:48:50 -0000 1.108 6 --- rombios.c 9 Feb 2004 16:48:50 -0000 1.108
7 -+++ rombios.c 16 May 2004 13:44:26 -0000 7 ++++ rombios.c 16 May 2004 15:16:57 -0000
8 @@ -2254,6 +2254,7 @@ 8 @@ -2254,6 +2254,7 @@
9 type = read_byte(get_SS(),buffer+1) & 0x1f; 9 type = read_byte(get_SS(),buffer+1) & 0x1f;
10 removable = (read_byte(get_SS(),buffer+0) & 0x80) ? 1 : 0; 10 removable = (read_byte(get_SS(),buffer+0) & 0x80) ? 1 : 0;
@@ -13,7 +13,24 @@ diff -u -w -r1.108 rombios.c @@ -13,7 +13,24 @@ diff -u -w -r1.108 rombios.c
13 13
14 write_byte(ebda_seg,&EbdaData->ata.devices[device].device, type); 14 write_byte(ebda_seg,&EbdaData->ata.devices[device].device, type);
15 write_byte(ebda_seg,&EbdaData->ata.devices[device].removable, removable); 15 write_byte(ebda_seg,&EbdaData->ata.devices[device].removable, removable);
16 -@@ -3781,7 +3782,17 @@ 16 +@@ -3378,6 +3379,8 @@
  17 + and al,#0x10
  18 + mov ah, al
  19 +
  20 ++ or ecx, ecx
  21 ++ je int1586_tick_end
  22 + int1586_tick:
  23 + in al, #0x61
  24 + and al,#0x10
  25 +@@ -3386,6 +3389,7 @@
  26 + mov ah, al
  27 + dec ecx
  28 + jnz int1586_tick
  29 ++int1586_tick_end:
  30 + ASM_END
  31 +
  32 + break;
  33 +@@ -3781,7 +3785,17 @@
17 write_word(ebda_seg, 0x0022, mouse_driver_offset); 34 write_word(ebda_seg, 0x0022, mouse_driver_offset);
18 write_word(ebda_seg, 0x0024, mouse_driver_seg); 35 write_word(ebda_seg, 0x0024, mouse_driver_seg);
19 mouse_flags_2 = read_byte(ebda_seg, 0x0027); 36 mouse_flags_2 = read_byte(ebda_seg, 0x0027);
@@ -31,7 +48,7 @@ diff -u -w -r1.108 rombios.c @@ -31,7 +48,7 @@ diff -u -w -r1.108 rombios.c
31 write_byte(ebda_seg, 0x0027, mouse_flags_2); 48 write_byte(ebda_seg, 0x0027, mouse_flags_2);
32 CLEAR_CF(); 49 CLEAR_CF();
33 regs.u.r8.ah = 0; 50 regs.u.r8.ah = 0;
34 -@@ -4409,7 +4420,8 @@ 51 +@@ -4409,7 +4423,8 @@
35 mouse_flags_2 = read_byte(ebda_seg, 0x0027); 52 mouse_flags_2 = read_byte(ebda_seg, 0x0027);
36 53
37 if ( (mouse_flags_2 & 0x80) != 0x80 ) { 54 if ( (mouse_flags_2 & 0x80) != 0x80 ) {