[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] update pci_get_lfb_addr for vmware vga
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/5] update pci_get_lfb_addr for vmware vga |
Date: |
Fri, 7 May 2010 12:09:46 +0200 |
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.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
vgabios.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/vgabios.c b/vgabios.c
index a575b7b..ed89334 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -3852,26 +3852,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
--
1.6.6.1
- [Qemu-devel] [PATCH 1/5] Makefile cleanup, Gerd Hoffmann, 2010/05/07
- [Qemu-devel] [PATCH 4/5] update pci_get_lfb_addr for vmware vga,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs., Gerd Hoffmann, 2010/05/07
- [Qemu-devel] [PATCH 3/5] Add qemu stdvga pci bios, Gerd Hoffmann, 2010/05/07
- [Qemu-devel] [PATCH 5/5] Add qemu vmware vga pci bios, Gerd Hoffmann, 2010/05/07
- Re: [Qemu-devel] [PATCH 1/5] Makefile cleanup, Isaku Yamahata, 2010/05/07
- [Qemu-devel] vgabios plans ( Re: [PATCH 1/5] Makefile cleanup), Gerd Hoffmann, 2010/05/20