diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-09 22:21:07 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-09 22:21:07 +0000 |
| commit | dc828ca1b59b0c390a6994c78e9658174f821f74 (patch) | |
| tree | 6c2ecf0899c5d699d6056495ad55d89e8cf7d248 /hw/sun4m.c | |
| parent | 7ffa47675c3b0c7ee1deddb1d78bbf5f968f0cb0 (diff) | |
| download | qemu-dc828ca1b59b0c390a6994c78e9658174f821f74.tar.gz qemu-dc828ca1b59b0c390a6994c78e9658174f821f74.tar.bz2 qemu-dc828ca1b59b0c390a6994c78e9658174f821f74.zip | |
Cleanup SPARC/TCX framebuffer allocation.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7059 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sun4m.c')
| -rw-r--r-- | hw/sun4m.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index 9b3bab1de7..a459055704 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -382,7 +382,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, qemu_irq *esp_reset, *le_reset; qemu_irq *fdc_tc; qemu_irq *cpu_halt; - ram_addr_t ram_offset, prom_offset, tcx_offset, idreg_offset; + ram_addr_t ram_offset, prom_offset, idreg_offset; unsigned long kernel_size; int ret; char buf[1024]; @@ -478,9 +478,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth); exit (1); } - tcx_offset = qemu_ram_alloc(hwdef->vram_size); - tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset, - hwdef->vram_size, graphic_width, graphic_height, graphic_depth); + tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height, + graphic_depth); lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset); @@ -1183,7 +1182,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, qemu_irq *cpu_irqs[MAX_CPUS], *sbi_irq, *sbi_cpu_irq, *espdma_irq, *ledma_irq; qemu_irq *esp_reset, *le_reset; - ram_addr_t ram_offset, prom_offset, tcx_offset; + ram_addr_t ram_offset, prom_offset; unsigned long kernel_size; int ret; char buf[1024]; @@ -1264,9 +1263,8 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth); exit (1); } - tcx_offset = qemu_ram_alloc(hwdef->vram_size); - tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset, - hwdef->vram_size, graphic_width, graphic_height, graphic_depth); + tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height, + graphic_depth); lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset); @@ -1409,7 +1407,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, qemu_irq *cpu_irqs, *slavio_irq, *espdma_irq, *ledma_irq; qemu_irq *esp_reset, *le_reset; qemu_irq *fdc_tc; - ram_addr_t ram_offset, prom_offset, tcx_offset; + ram_addr_t ram_offset, prom_offset; unsigned long kernel_size; int ret; char buf[1024]; @@ -1481,9 +1479,8 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, fprintf(stderr, "qemu: Unsupported depth: %d\n", graphic_depth); exit (1); } - tcx_offset = qemu_ram_alloc(hwdef->vram_size); - tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset, - hwdef->vram_size, graphic_width, graphic_height, graphic_depth); + tcx_init(hwdef->tcx_base, hwdef->vram_size, graphic_width, graphic_height, + graphic_depth); lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset); |