vga-isa-mm: remove one #ifdef CONFIG_BOCHS_VBE.
authorIsaku Yamahata <yamahata@valinux.co.jp>
Thu, 27 May 2010 05:37:53 +0000 (14:37 +0900)
committerBlue Swirl <blauwirbel@gmail.com>
Thu, 10 Jun 2010 16:48:32 +0000 (16:48 +0000)
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>
hw/vga-isa-mm.c

index 2faefa51b12a8b4467fbffac3691454ada99df1c..8e31e36ea5151850c68c817f3bd97c42a4cb74a9 100644 (file)
@@ -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;
 }