From fb9f9444588d2f7f1af9692499b3953432151e64 Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 22 May 2004 16:27:00 +0000
Subject: [PATCH] PCI BIOS fixes

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@843 c046a42c-6fe2-441c-8c8c-71466251a162
---
 pc-bios/bios.bin  | Bin 65536 -> 65536 bytes
 pc-bios/bios.diff | 174 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 173 insertions(+), 1 deletion(-)

diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index 7d87cb03c1763ebad26a78210f666b2cf76f7da3..6c27175144c3fc711228aba5037b1b7428c0d6dd 100644
GIT binary patch
delta 575
zcmZo@U}<Pz*`PkH{t*KMgAG%u#leRHoEOt}Gccs>XJB}7nSp^JZPy>3x0WYLdDEKz
zF_f~t+yN5vOLI<Z{LR2vdS^@9%Y`7l9Hr7PmM}0d1f_NUN^5?^oYr{g56_#Zj)O1T
zLDHP1QZHH&(oA6Kw6{@dod;iM+HlpE3cN@MOM`5S>OA;5)P}oM;zcl649Ucf6Yrv4
zTiWoHO1&^g$U%+kJdyT3>b0~DZ>hiwNwDm$KRlf$-bcM=-_rOyZSK$022Xyc&HZsY
zXa@sB14CNpje`$3(i)%tXW&lb{GswEZPyQ;_feCTrhC_$rX74Jkj8m&Hv<DGAl5VN
z`ooj<HqG)xDJLixm|xCh@N))-z~jzSX$M~lY-xMh!eGNuD*U3EA*l0L^CM<h0KCq(
z;Vcz?kpmHC0tvqb`7pwUtCasmC_@m~XmCil+HjW&zi?s*a)O%x_OPA}PpR+=Z6p)G
zz7n_LE#-e90x<#Nd6q4WKMxx``EfXCvce2W)~Le_3=EsCW-K?~%y?m`Acw^ET@_3(
zgtkv!_fSumar>?xOfP<K+x3F^#n)}SUNF6QKl%N`+l-qwpMF%w%c7_H{`};RGbA>r
ae&FY0+&#JU-(!}K5V0wfKm6xs6axT^Knq9!

delta 549
zcmZo@U}<Pz*`PkH{u%=VgAG%u#leRHoEOt}Gccs>XJB}7oPmKMZPy>3x0WYLdDEKz
zF_f~tTmusGOLI<Z{LR2vdS^@9%c&r}9Ho*kW`LwRf2B1)Voqy3^oQq7$HAAiAW6<r
zi5JyyNhYvl+S|0wgRc{9xJvn6#Mgr)K^Ao$eC=<;T`Km%7bJpYR>z5VuT5=uN+n(x
z!)2fbb)HCj|60<9x0LUNI7n{SAD+$=?_aZTY5biw_vdMYC%@C?{y4pZfuVsRt@Fmg
z2OMdQ&;K)|asE*GleX&z&-=q^0h5iVd(@kx9egN|#(8l!0|UtOix_tO;YoX&W_hBN
z6XbQ~mpu%A&R}0Z?mU%t@TI_(w$~Ll9HoLU${9L;H9um8`uTOL4QHv~izKih6G-rF
z=fT$jHe98=FMOefb{>3fZ^K<G_`(LP3Z&J92joXB8=g|Z7wTY9uwIZ?L~VFWd0z;D
z^@4rNvZe9oVS^_>4o|k3A<1}nbJUFG=93j>Dr{!FuvC!a$F^M+OfNodo4oF!p76tM
zyM8dexV>%H3+5MBx9xht^y2*F_YZF~PTPF?Q5`Rfkm~#MlLco=Y)<{a&&RlSa_PUv
QELS07Qzn1-&(F9308$$SoB#j-

diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff
index 1ed70484c8..dee62e012a 100644
--- a/pc-bios/bios.diff
+++ b/pc-bios/bios.diff
@@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
 retrieving revision 1.108
 diff -u -w -r1.108 rombios.c
 --- rombios.c	9 Feb 2004 16:48:50 -0000	1.108
-+++ rombios.c	16 May 2004 15:16:57 -0000
++++ rombios.c	22 May 2004 15:47:51 -0000
 @@ -2254,6 +2254,7 @@
        type      = read_byte(get_SS(),buffer+1) & 0x1f;
        removable = (read_byte(get_SS(),buffer+0) & 0x80) ? 1 : 0;
@@ -58,3 +58,175 @@ diff -u -w -r1.108 rombios.c
      }
  
    package_count = mouse_flags_2 & 0x07;
+@@ -8401,57 +8416,69 @@
+   cmp al, #0x08
+   jne pci_pro_f09
+   call pci_pro_select_reg
++  push edx
+   mov dx, di
+   and dx, #0x03
+   add dx, #0x0cfc
+   in  al, dx
++  pop edx
+   mov cl, al
+   jmp pci_pro_ok
+ pci_pro_f09: ;; read configuration word
+   cmp al, #0x09
+   jne pci_pro_f0a
+   call pci_pro_select_reg
++  push edx
+   mov dx, di
+   and dx, #0x02
+   add dx, #0x0cfc
+   in  ax, dx
++  pop edx
+   mov cx, ax
+   jmp pci_pro_ok
+ pci_pro_f0a: ;; read configuration dword
+   cmp al, #0x0a
+   jne pci_pro_f0b
+   call pci_pro_select_reg
++  push edx
+   mov dx, #0x0cfc
+   in  eax, dx
++  pop edx
+   mov ecx, eax
+   jmp pci_pro_ok
+ pci_pro_f0b: ;; write configuration byte
+   cmp al, #0x0b
+   jne pci_pro_f0c
+   call pci_pro_select_reg
++  push edx
+   mov dx, di
+   and dx, #0x03
+   add dx, #0x0cfc
+   mov al, cl
+   out dx, al
++  pop edx
+   jmp pci_pro_ok
+ pci_pro_f0c: ;; write configuration word
+   cmp al, #0x0c
+   jne pci_pro_f0d
+   call pci_pro_select_reg
++  push edx
+   mov dx, di
+   and dx, #0x02
+   add dx, #0x0cfc
+   mov ax, cx
+   out dx, ax
++  pop edx
+   jmp pci_pro_ok
+ pci_pro_f0d: ;; write configuration dword
+   cmp al, #0x0d
+   jne pci_pro_unknown
+   call pci_pro_select_reg
++  push edx
+   mov dx, #0x0cfc
+   mov eax, ecx
+   out dx, eax
++  pop edx
+   jmp pci_pro_ok
+ pci_pro_unknown:
+   mov ah, #0x81
+@@ -8468,6 +8495,7 @@
+   retf
+ 
+ pci_pro_select_reg:
++  push edx
+   mov eax, #0x800000
+   mov ax,  bx
+   shl eax, #8
+@@ -8476,6 +8504,7 @@
+   and al,  #0xfc
+   mov dx, #0x0cf8
+   out dx,  eax
++  pop edx
+   ret
+ 
+ use16 386
+@@ -8536,57 +8565,69 @@
+   cmp al, #0x08
+   jne pci_real_f09
+   call pci_real_select_reg
++  push dx
+   mov dx, di
+   and dx, #0x03
+   add dx, #0x0cfc
+   in  al, dx
++  pop dx
+   mov cl, al
+   jmp pci_real_ok
+ pci_real_f09: ;; read configuration word
+   cmp al, #0x09
+   jne pci_real_f0a
+   call pci_real_select_reg
++  push dx
+   mov dx, di
+   and dx, #0x02
+   add dx, #0x0cfc
+   in  ax, dx
++  pop dx
+   mov cx, ax
+   jmp pci_real_ok
+ pci_real_f0a: ;; read configuration dword
+   cmp al, #0x0a
+   jne pci_real_f0b
+   call pci_real_select_reg
++  push dx
+   mov dx, #0x0cfc
+   in  eax, dx
++  pop dx
+   mov ecx, eax
+   jmp pci_real_ok
+ pci_real_f0b: ;; write configuration byte
+   cmp al, #0x0b
+   jne pci_real_f0c
+   call pci_real_select_reg
++  push dx
+   mov dx, di
+   and dx, #0x03
+   add dx, #0x0cfc
+   mov al, cl
+   out dx, al
++  pop dx
+   jmp pci_real_ok
+ pci_real_f0c: ;; write configuration word
+   cmp al, #0x0c
+   jne pci_real_f0d
+   call pci_real_select_reg
++  push dx
+   mov dx, di
+   and dx, #0x02
+   add dx, #0x0cfc
+   mov ax, cx
+   out dx, ax
++  pop dx
+   jmp pci_real_ok
+ pci_real_f0d: ;; write configuration dword
+   cmp al, #0x0d
+   jne pci_real_unknown
+   call pci_real_select_reg
++  push dx
+   mov dx, #0x0cfc
+   mov eax, ecx
+   out dx, eax
++  pop dx
+   jmp pci_real_ok
+ pci_real_unknown:
+   mov ah, #0x81
+@@ -8599,6 +8640,7 @@
+   ret
+ 
+ pci_real_select_reg:
++  push dx
+   mov eax, #0x800000
+   mov ax,  bx
+   shl eax, #8
+@@ -8607,6 +8649,7 @@
+   and al,  #0xfc
+   mov dx, #0x0cf8
+   out dx,  eax
++  pop dx
+   ret
+   
+ .align 16