diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2010-05-06 15:11:39 +0200 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-10-18 17:16:46 +0200 |
commit | 2415572ab84da5c822ce5528cf59f5dabb144f53 (patch) | |
tree | 8ec1f0b1ba17472adc5326d2f4c7a720860d9a0e | |
parent | 805e87a3ab14df8ccc45c3c60e443fb8ec6f6e73 (diff) |
update pci_get_lfb_addr for vmware vgapatchrom
vmware vga has the framebuffer at pci region 1 not 0. This patch makes
pci_get_lfb_addr check region 1 too. It also gives names to the
numbered labels to make the code more readable.
-rw-r--r-- | vgabios.c | 23 |
1 files changed, 14 insertions, 9 deletions
@@ -3850,26 +3850,31 @@ _pci_get_lfb_addr: mov dl, #0x00 call pci_read_reg cmp ax, #0xffff - jz pci_get_lfb_addr_5 - pci_get_lfb_addr_3: + jz pci_get_lfb_addr_fail + pci_get_lfb_addr_next_dev: mov dl, #0x00 call pci_read_reg cmp ax, bx ;; check vendor - jz pci_get_lfb_addr_4 + jz pci_get_lfb_addr_found add cx, #0x8 cmp cx, #0x200 ;; search bus #0 and #1 - jb pci_get_lfb_addr_3 - pci_get_lfb_addr_5: + jb pci_get_lfb_addr_next_dev + pci_get_lfb_addr_fail: xor dx, dx ;; no LFB - jmp pci_get_lfb_addr_6 - pci_get_lfb_addr_4: + jmp pci_get_lfb_addr_return + pci_get_lfb_addr_found: mov dl, #0x10 ;; I/O space #0 call pci_read_reg test ax, #0xfff1 - jnz pci_get_lfb_addr_5 + jz pci_get_lfb_addr_success + mov dl, #0x14 ;; I/O space #1 + call pci_read_reg + test ax, #0xfff1 + jnz pci_get_lfb_addr_fail + pci_get_lfb_addr_success: shr eax, #16 mov dx, ax ;; LFB address - pci_get_lfb_addr_6: + pci_get_lfb_addr_return: pop eax mov ax, dx pop dx |