falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcx: move initialisation from realizefn to initfn 

Initialisation cleanup as suggested by Andreas.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Mark Cave-Ayland 2014-05-24 12:44:53 +01:00
parent d4ad9dec14
commit 01b91ac2be
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hw/display/tcx.c
View File

@ -530,6 +530,33 @@ static const GraphicHwOps tcx24_ops = {
.gfx_update = tcx24_update_display, .gfx_update = tcx24_update_display,
}; };
static void tcx_initfn(Object *obj)
{
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
TCXState *s = TCX(obj);
memory_region_init_ram(&s->rom, NULL, "tcx.prom", FCODE_MAX_ROM_SIZE);
memory_region_set_readonly(&s->rom, true);
sysbus_init_mmio(sbd, &s->rom);
/* DAC */
memory_region_init_io(&s->dac, OBJECT(s), &tcx_dac_ops, s,
"tcx.dac", TCX_DAC_NREGS);
sysbus_init_mmio(sbd, &s->dac);
/* TEC (dummy) */
memory_region_init_io(&s->tec, OBJECT(s), &dummy_ops, s,
"tcx.tec", TCX_TEC_NREGS);
sysbus_init_mmio(sbd, &s->tec);
/* THC: NetBSD writes here even with 8-bit display: dummy */
memory_region_init_io(&s->thc24, OBJECT(s), &dummy_ops, s, "tcx.thc24",
TCX_THC_NREGS_24);
sysbus_init_mmio(sbd, &s->thc24);
return;
}
static void tcx_realizefn(DeviceState *dev, Error **errp) static void tcx_realizefn(DeviceState *dev, Error **errp)
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
@ -545,11 +572,7 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
vram_base = memory_region_get_ram_ptr(&s->vram_mem); vram_base = memory_region_get_ram_ptr(&s->vram_mem);
/* FCode ROM */ /* FCode ROM */
memory_region_init_ram(&s->rom, NULL, "tcx.prom", FCODE_MAX_ROM_SIZE);
vmstate_register_ram_global(&s->rom); vmstate_register_ram_global(&s->rom);
memory_region_set_readonly(&s->rom, true);
sysbus_init_mmio(sbd, &s->rom);
fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE); fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE);
if (fcode_filename) { if (fcode_filename) {
ret = load_image_targphys(fcode_filename, s->prom_addr, ret = load_image_targphys(fcode_filename, s->prom_addr,
@ -568,20 +591,6 @@ static void tcx_realizefn(DeviceState *dev, Error **errp)
vram_offset += size; vram_offset += size;
vram_base += size; vram_base += size;
/* DAC */
memory_region_init_io(&s->dac, OBJECT(s), &tcx_dac_ops, s,
"tcx.dac", TCX_DAC_NREGS);
sysbus_init_mmio(sbd, &s->dac);
/* TEC (dummy) */
memory_region_init_io(&s->tec, OBJECT(s), &dummy_ops, s,
"tcx.tec", TCX_TEC_NREGS);
sysbus_init_mmio(sbd, &s->tec);
/* THC: NetBSD writes here even with 8-bit display: dummy */
memory_region_init_io(&s->thc24, OBJECT(s), &dummy_ops, s, "tcx.thc24",
TCX_THC_NREGS_24);
sysbus_init_mmio(sbd, &s->thc24);
if (s->depth == 24) { if (s->depth == 24) {
/* 24-bit plane */ /* 24-bit plane */
size = s->vram_size * 4; size = s->vram_size * 4;
@ -637,6 +646,7 @@ static const TypeInfo tcx_info = {
.name = TYPE_TCX, .name = TYPE_TCX,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(TCXState), .instance_size = sizeof(TCXState),
.instance_init = tcx_initfn,
.class_init = tcx_class_init, .class_init = tcx_class_init,
}; };

10
hw/sparc/sun4m.c
View File

@ -543,14 +543,14 @@ static void tcx_init(hwaddr addr, int vram_size, int width,
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
/* FCode ROM */ /* FCode ROM */
sysbus_mmio_map(s, 0, addr); sysbus_mmio_map(s, 0, addr);
/* 8-bit plane */
sysbus_mmio_map(s, 1, addr + 0x00800000ULL);
/* DAC */ /* DAC */
sysbus_mmio_map(s, 2, addr + 0x00200000ULL); sysbus_mmio_map(s, 1, addr + 0x00200000ULL);
/* TEC (dummy) */ /* TEC (dummy) */
sysbus_mmio_map(s, 3, addr + 0x00700000ULL); sysbus_mmio_map(s, 2, addr + 0x00700000ULL);
/* THC 24 bit: NetBSD writes here even with 8-bit display: dummy */ /* THC 24 bit: NetBSD writes here even with 8-bit display: dummy */
sysbus_mmio_map(s, 4, addr + 0x00301000ULL); sysbus_mmio_map(s, 3, addr + 0x00301000ULL);
/* 8-bit plane */
sysbus_mmio_map(s, 4, addr + 0x00800000ULL);
if (depth == 24) { if (depth == 24) {
/* 24-bit plane */ /* 24-bit plane */
sysbus_mmio_map(s, 5, addr + 0x02000000ULL); sysbus_mmio_map(s, 5, addr + 0x02000000ULL);