From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Thu, 27 May 2010 05:37:53 +0000 (+0900)
Subject: vga-isa-mm: remove one #ifdef CONFIG_BOCHS_VBE.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~17^2~4029
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe7f9567a6934566641751df233cb45675a9130c;p=sdk%2Femulator%2Fqemu.git

vga-isa-mm: remove one #ifdef CONFIG_BOCHS_VBE.

remove one #ifdef CONFIG_BOCHS_VBE.
Call vga_init_vbe() instead.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c
index 2faefa51b1..8e31e36ea5 100644
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -121,10 +121,6 @@ int isa_vga_mm_init(target_phys_addr_t vram_base,
     s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
                                      s->vga.screen_dump, s->vga.text_update, s);
 
-#ifdef CONFIG_BOCHS_VBE
-    /* XXX: use optimized standard vga accesses */
-    cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS,
-                                 VGA_RAM_SIZE, s->vga.vram_offset);
-#endif
+    vga_init_vbe(&s->vga);
     return 0;
 }