vga-isa-mm: remove one #ifdef CONFIG_BOCHS_VBE.
PATCH 1/1 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 <[email protected]>
--- hw/vga-isa-mm.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
hw/vga-isa-mm.c +1 -5
@@ -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 ; }
Signature · 1 line
1.6.6.1
Blue Swirl
AppliedThanks, applied.
Quoted 28 lines · Isaku Yamahata
remove one #ifdef
CONFIG_BOCHS_VBE.
Callvga_init_vbe()instead.Signed-off-by Isaku Yamahata <[email protected]>---
hw/vga-isa-mm.c | 6 +-----1 files changed, 1 insertions(+), 5 deletions(-)hw/vga-isa-mm.c +1
-6@@ -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; } --1.6.6.1