gwj / at91sam9263 · Commits

Commit fb9f9444588d2f7f1af9692499b3953432151e64

Authored by bellard
1 parent 92e873b9

PCI BIOS fixes 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@843 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 173 additions and 1 deletions
pc-bios/bios.bin
View file @fb9f944
No preview for this file type
pc-bios/bios.diff
  View file @fb9f944
@@ -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 15:16:57 -0000 7 ++++ rombios.c 22 May 2004 15:47:51 -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;
@@ -58,3 +58,175 @@ diff -u -w -r1.108 rombios.c @@ -58,3 +58,175 @@ diff -u -w -r1.108 rombios.c
58 } 58 }
59 59
60 package_count = mouse_flags_2 & 0x07; 60 package_count = mouse_flags_2 & 0x07;
  61 +@@ -8401,57 +8416,69 @@
  62 + cmp al, #0x08
  63 + jne pci_pro_f09
  64 + call pci_pro_select_reg
  65 ++ push edx
  66 + mov dx, di
  67 + and dx, #0x03
  68 + add dx, #0x0cfc
  69 + in al, dx
  70 ++ pop edx
  71 + mov cl, al
  72 + jmp pci_pro_ok
  73 + pci_pro_f09: ;; read configuration word
  74 + cmp al, #0x09
  75 + jne pci_pro_f0a
  76 + call pci_pro_select_reg
  77 ++ push edx
  78 + mov dx, di
  79 + and dx, #0x02
  80 + add dx, #0x0cfc
  81 + in ax, dx
  82 ++ pop edx
  83 + mov cx, ax
  84 + jmp pci_pro_ok
  85 + pci_pro_f0a: ;; read configuration dword
  86 + cmp al, #0x0a
  87 + jne pci_pro_f0b
  88 + call pci_pro_select_reg
  89 ++ push edx
  90 + mov dx, #0x0cfc
  91 + in eax, dx
  92 ++ pop edx
  93 + mov ecx, eax
  94 + jmp pci_pro_ok
  95 + pci_pro_f0b: ;; write configuration byte
  96 + cmp al, #0x0b
  97 + jne pci_pro_f0c
  98 + call pci_pro_select_reg
  99 ++ push edx
  100 + mov dx, di
  101 + and dx, #0x03
  102 + add dx, #0x0cfc
  103 + mov al, cl
  104 + out dx, al
  105 ++ pop edx
  106 + jmp pci_pro_ok
  107 + pci_pro_f0c: ;; write configuration word
  108 + cmp al, #0x0c
  109 + jne pci_pro_f0d
  110 + call pci_pro_select_reg
  111 ++ push edx
  112 + mov dx, di
  113 + and dx, #0x02
  114 + add dx, #0x0cfc
  115 + mov ax, cx
  116 + out dx, ax
  117 ++ pop edx
  118 + jmp pci_pro_ok
  119 + pci_pro_f0d: ;; write configuration dword
  120 + cmp al, #0x0d
  121 + jne pci_pro_unknown
  122 + call pci_pro_select_reg
  123 ++ push edx
  124 + mov dx, #0x0cfc
  125 + mov eax, ecx
  126 + out dx, eax
  127 ++ pop edx
  128 + jmp pci_pro_ok
  129 + pci_pro_unknown:
  130 + mov ah, #0x81
  131 +@@ -8468,6 +8495,7 @@
  132 + retf
  133 +
  134 + pci_pro_select_reg:
  135 ++ push edx
  136 + mov eax, #0x800000
  137 + mov ax, bx
  138 + shl eax, #8
  139 +@@ -8476,6 +8504,7 @@
  140 + and al, #0xfc
  141 + mov dx, #0x0cf8
  142 + out dx, eax
  143 ++ pop edx
  144 + ret
  145 +
  146 + use16 386
  147 +@@ -8536,57 +8565,69 @@
  148 + cmp al, #0x08
  149 + jne pci_real_f09
  150 + call pci_real_select_reg
  151 ++ push dx
  152 + mov dx, di
  153 + and dx, #0x03
  154 + add dx, #0x0cfc
  155 + in al, dx
  156 ++ pop dx
  157 + mov cl, al
  158 + jmp pci_real_ok
  159 + pci_real_f09: ;; read configuration word
  160 + cmp al, #0x09
  161 + jne pci_real_f0a
  162 + call pci_real_select_reg
  163 ++ push dx
  164 + mov dx, di
  165 + and dx, #0x02
  166 + add dx, #0x0cfc
  167 + in ax, dx
  168 ++ pop dx
  169 + mov cx, ax
  170 + jmp pci_real_ok
  171 + pci_real_f0a: ;; read configuration dword
  172 + cmp al, #0x0a
  173 + jne pci_real_f0b
  174 + call pci_real_select_reg
  175 ++ push dx
  176 + mov dx, #0x0cfc
  177 + in eax, dx
  178 ++ pop dx
  179 + mov ecx, eax
  180 + jmp pci_real_ok
  181 + pci_real_f0b: ;; write configuration byte
  182 + cmp al, #0x0b
  183 + jne pci_real_f0c
  184 + call pci_real_select_reg
  185 ++ push dx
  186 + mov dx, di
  187 + and dx, #0x03
  188 + add dx, #0x0cfc
  189 + mov al, cl
  190 + out dx, al
  191 ++ pop dx
  192 + jmp pci_real_ok
  193 + pci_real_f0c: ;; write configuration word
  194 + cmp al, #0x0c
  195 + jne pci_real_f0d
  196 + call pci_real_select_reg
  197 ++ push dx
  198 + mov dx, di
  199 + and dx, #0x02
  200 + add dx, #0x0cfc
  201 + mov ax, cx
  202 + out dx, ax
  203 ++ pop dx
  204 + jmp pci_real_ok
  205 + pci_real_f0d: ;; write configuration dword
  206 + cmp al, #0x0d
  207 + jne pci_real_unknown
  208 + call pci_real_select_reg
  209 ++ push dx
  210 + mov dx, #0x0cfc
  211 + mov eax, ecx
  212 + out dx, eax
  213 ++ pop dx
  214 + jmp pci_real_ok
  215 + pci_real_unknown:
  216 + mov ah, #0x81
  217 +@@ -8599,6 +8640,7 @@
  218 + ret
  219 +
  220 + pci_real_select_reg:
  221 ++ push dx
  222 + mov eax, #0x800000
  223 + mov ax, bx
  224 + shl eax, #8
  225 +@@ -8607,6 +8649,7 @@
  226 + and al, #0xfc
  227 + mov dx, #0x0cf8
  228 + out dx, eax
  229 ++ pop dx
  230 + ret
  231 +
  232 + .align 16