| Message ID | 20100527053753.GC31807@valinux.co.jp |
|---|---|
| State | New |
| Headers | show |
Thanks, applied. On Thu, May 27, 2010 at 5:37 AM, Isaku Yamahata <yamahata@valinux.co.jp> wrote: > remove one #ifdef CONFIG_BOCHS_VBE. > Call vga_init_vbe() instead. > > Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> > --- > hw/vga-isa-mm.c | 6 +----- > 1 files changed, 1 insertions(+), 5 deletions(-) > > diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c > index 2faefa5..8e31e36 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; > } > -- > 1.6.6.1 > >
diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c index 2faefa5..8e31e36 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; }
remove one #ifdef CONFIG_BOCHS_VBE. Call vga_init_vbe() instead. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/vga-isa-mm.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)