Revision dc828ca1 hw/sun4m.c

b/hw/sun4m.c
382 382
    qemu_irq *esp_reset, *le_reset;
383 383
    qemu_irq *fdc_tc;
384 384
    qemu_irq *cpu_halt;
385
    ram_addr_t ram_offset, prom_offset, tcx_offset, idreg_offset;
385
    ram_addr_t ram_offset, prom_offset, idreg_offset;
386 386
    unsigned long kernel_size;
387 387
    int ret;
388 388
    char buf[1024];
......
478 478
        fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth);
479 479
        exit (1);
480 480
    }
481
    tcx_offset = qemu_ram_alloc(hwdef->vram_size);
482
    tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
483
             hwdef->vram_size, graphic_width, graphic_height, graphic_depth);
481
    tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height,
482
             graphic_depth);
484 483

  
485 484
    lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset);
486 485

  
......
1183 1182
    qemu_irq *cpu_irqs[MAX_CPUS], *sbi_irq, *sbi_cpu_irq,
1184 1183
        *espdma_irq, *ledma_irq;
1185 1184
    qemu_irq *esp_reset, *le_reset;
1186
    ram_addr_t ram_offset, prom_offset, tcx_offset;
1185
    ram_addr_t ram_offset, prom_offset;
1187 1186
    unsigned long kernel_size;
1188 1187
    int ret;
1189 1188
    char buf[1024];
......
1264 1263
        fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth);
1265 1264
        exit (1);
1266 1265
    }
1267
    tcx_offset = qemu_ram_alloc(hwdef->vram_size);
1268
    tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
1269
             hwdef->vram_size, graphic_width, graphic_height, graphic_depth);
1266
    tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height,
1267
             graphic_depth);
1270 1268

  
1271 1269
    lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset);
1272 1270

  
......
1409 1407
    qemu_irq *cpu_irqs, *slavio_irq, *espdma_irq, *ledma_irq;
1410 1408
    qemu_irq *esp_reset, *le_reset;
1411 1409
    qemu_irq *fdc_tc;
1412
    ram_addr_t ram_offset, prom_offset, tcx_offset;
1410
    ram_addr_t ram_offset, prom_offset;
1413 1411
    unsigned long kernel_size;
1414 1412
    int ret;
1415 1413
    char buf[1024];
......
1481 1479
        fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth);
1482 1480
        exit (1);
1483 1481
    }
1484
    tcx_offset = qemu_ram_alloc(hwdef->vram_size);
1485
    tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
1486
             hwdef->vram_size, graphic_width, graphic_height, graphic_depth);
1482
    tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height,
1483
             graphic_depth);
1487 1484

  
1488 1485
    lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset);
1489 1486

  

Also available in: Unified diff