Revision 7138fcfb hw/vga.c

b/hw/vga.c
223 223
VGAState vga_state;
224 224
int vga_io_memory;
225 225

  
226
static uint32_t vga_ioport_read(CPUX86State *env, uint32_t addr)
226
static uint32_t vga_ioport_read(CPUState *env, uint32_t addr)
227 227
{
228 228
    VGAState *s = &vga_state;
229 229
    int val, index;
......
319 319
    return val;
320 320
}
321 321

  
322
static void vga_ioport_write(CPUX86State *env, uint32_t addr, uint32_t val)
322
static void vga_ioport_write(CPUState *env, uint32_t addr, uint32_t val)
323 323
{
324 324
    VGAState *s = &vga_state;
325 325
    int index, v;
......
1350 1350
    vga_mem_writel,
1351 1351
};
1352 1352

  
1353
int vga_init(DisplayState *ds, uint8_t *vga_ram_base, 
1354
             unsigned long vga_ram_offset, int vga_ram_size)
1353
int vga_initialize(DisplayState *ds, uint8_t *vga_ram_base, 
1354
                   unsigned long vga_ram_offset, int vga_ram_size)
1355 1355
{
1356 1356
    VGAState *s = &vga_state;
1357 1357
    int i, j, v, b;
......
1417 1417
    register_ioport_read(0x3da, 1, vga_ioport_read, 1);
1418 1418

  
1419 1419
    vga_io_memory = cpu_register_io_memory(0, vga_mem_read, vga_mem_write);
1420
    cpu_register_physical_memory(0xa0000, 0x20000, vga_io_memory);
1420
#if defined (TARGET_I386)
1421
    cpu_register_physical_memory(0x000a0000, 0x20000, vga_io_memory);
1422
#elif defined (TARGET_PPC)
1423
    cpu_register_physical_memory(0xf00a0000, 0x20000, vga_io_memory);
1424
#endif
1421 1425
    return 0;
1422 1426
}

Also available in: Unified diff