ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sm501: make SerialMM a child, export chardev property 

Embed the SerialMM sybus device, and re-export its "chardev" property.
That way, we can get rid of PROP_PTR "chr-state" and better track
devices relationship.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Marc-André Lureau 2019-10-23 16:06:23 +02:00
parent d9259178fe
commit 0ed40f16a1
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/display/sm501.c
View File

@ -1930,7 +1930,7 @@ typedef struct {
SM501State state; SM501State state;
uint32_t vram_size; uint32_t vram_size;
uint32_t base; uint32_t base;
void *chr_state; SerialMM serial;
} SM501SysBusState; } SM501SysBusState;
static void sm501_realize_sysbus(DeviceState *dev, Error **errp) static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
@ -1938,6 +1938,7 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
SM501SysBusState *s = SYSBUS_SM501(dev); SM501SysBusState *s = SYSBUS_SM501(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
DeviceState *usb_dev; DeviceState *usb_dev;
MemoryRegion *mr;
sm501_init(&s->state, dev, s->vram_size); sm501_init(&s->state, dev, s->vram_size);
if (get_local_mem_size(&s->state) != s->vram_size) { if (get_local_mem_size(&s->state) != s->vram_size) {
@ -1958,15 +1959,15 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev)); sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev));
/* bridge to serial emulation module */ /* bridge to serial emulation module */
serial_mm_init(&s->state.mmio_region, SM501_UART0, 2, qdev_init_nofail(DEVICE(&s->serial));
NULL, /* TODO : chain irq to IRL */ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->serial), 0);
115200, s->chr_state, DEVICE_LITTLE_ENDIAN); memory_region_add_subregion(&s->state.mmio_region, SM501_UART0, mr);
/* TODO : chain irq to IRL */
} }
static Property sm501_sysbus_properties[] = { static Property sm501_sysbus_properties[] = {
DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0),
DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0), DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0),
DEFINE_PROP_PTR("chr-state", SM501SysBusState, chr_state),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -1997,9 +1998,20 @@ static void sm501_sysbus_class_init(ObjectClass *klass, void *data)
dc->props = sm501_sysbus_properties; dc->props = sm501_sysbus_properties;
dc->reset = sm501_reset_sysbus; dc->reset = sm501_reset_sysbus;
dc->vmsd = &vmstate_sm501_sysbus; dc->vmsd = &vmstate_sm501_sysbus;
/* Note: pointer property "chr-state" may remain null, thus }
* no need for dc->user_creatable = false;
*/ static void sm501_sysbus_init(Object *o)
{
SM501SysBusState *sm501 = SYSBUS_SM501(o);
SerialMM *smm = &sm501->serial;
sysbus_init_child_obj(o, "serial", smm, sizeof(SerialMM), TYPE_SERIAL_MM);
qdev_set_legacy_instance_id(DEVICE(smm), SM501_UART0, 2);
qdev_prop_set_uint8(DEVICE(smm), "regshift", 2);
qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN);
object_property_add_alias(o, "chardev",
OBJECT(smm), "chardev", &error_abort);
} }
static const TypeInfo sm501_sysbus_info = { static const TypeInfo sm501_sysbus_info = {
@ -2007,6 +2019,7 @@ static const TypeInfo sm501_sysbus_info = {
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SM501SysBusState), .instance_size = sizeof(SM501SysBusState),
.class_init = sm501_sysbus_class_init, .class_init = sm501_sysbus_class_init,
.instance_init = sm501_sysbus_init,
}; };
#define TYPE_PCI_SM501 "sm501" #define TYPE_PCI_SM501 "sm501"

2
hw/sh4/r2d.c
View File

@ -272,7 +272,7 @@ static void r2d_init(MachineState *machine)
busdev = SYS_BUS_DEVICE(dev); busdev = SYS_BUS_DEVICE(dev);
qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE); qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE);
qdev_prop_set_uint32(dev, "base", 0x10000000); qdev_prop_set_uint32(dev, "base", 0x10000000);
qdev_prop_set_ptr(dev, "chr-state", serial_hd(2)); qdev_prop_set_chr(dev, "chardev", serial_hd(2));
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_mmio_map(busdev, 0, 0x10000000); sysbus_mmio_map(busdev, 0, 0x10000000);
sysbus_mmio_map(busdev, 1, 0x13e00000); sysbus_mmio_map(busdev, 1, 0x13e00000);