motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/display/sm501: Embed OHCI QOM child in chipset

Browse source 
Note this device doesn't implement unrealize().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20230203145536.17585-11-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-03 15:29:52 +01:00
parent b08bb02bcc
commit 01c400ae43
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hw/display/sm501.c
View file

@ -28,6 +28,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/usb/hcd-ohci.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "ui/console.h" #include "ui/console.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
@ -1945,13 +1946,13 @@ struct SM501SysBusState {
uint32_t vram_size; uint32_t vram_size;
uint32_t base; uint32_t base;
SerialMM serial; SerialMM serial;
OHCISysBusState ohci;
}; };
static void sm501_realize_sysbus(DeviceState *dev, Error **errp) 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;
MemoryRegion *mr; MemoryRegion *mr;
sm501_init(&s->state, dev, s->vram_size); sm501_init(&s->state, dev, s->vram_size);
@ -1964,13 +1965,11 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
sysbus_init_mmio(sbd, &s->state.mmio_region); sysbus_init_mmio(sbd, &s->state.mmio_region);
/* bridge to usb host emulation module */ /* bridge to usb host emulation module */
usb_dev = qdev_new("sysbus-ohci"); qdev_prop_set_uint64(DEVICE(&s->ohci), "dma-offset", s->base);
qdev_prop_set_uint32(usb_dev, "num-ports", 2); sysbus_realize_and_unref(SYS_BUS_DEVICE(&s->ohci), &error_fatal);
qdev_prop_set_uint64(usb_dev, "dma-offset", s->base);
sysbus_realize_and_unref(SYS_BUS_DEVICE(usb_dev), &error_fatal);
memory_region_add_subregion(&s->state.mmio_region, SM501_USB_HOST, memory_region_add_subregion(&s->state.mmio_region, SM501_USB_HOST,
sysbus_mmio_get_region(SYS_BUS_DEVICE(usb_dev), 0)); sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ohci), 0));
sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev)); sysbus_pass_irq(sbd, SYS_BUS_DEVICE(&s->ohci));
/* bridge to serial emulation module */ /* bridge to serial emulation module */
sysbus_realize(SYS_BUS_DEVICE(&s->serial), &error_fatal); sysbus_realize(SYS_BUS_DEVICE(&s->serial), &error_fatal);
@ -2017,8 +2016,12 @@ static void sm501_sysbus_class_init(ObjectClass *klass, void *data)
static void sm501_sysbus_init(Object *o) static void sm501_sysbus_init(Object *o)
{ {
SM501SysBusState *sm501 = SYSBUS_SM501(o); SM501SysBusState *sm501 = SYSBUS_SM501(o);
OHCISysBusState *ohci = &sm501->ohci;
SerialMM *smm = &sm501->serial; SerialMM *smm = &sm501->serial;
object_initialize_child(o, "ohci", ohci, TYPE_SYSBUS_OHCI);
qdev_prop_set_uint32(DEVICE(ohci), "num-ports", 2);
object_initialize_child(o, "serial", smm, TYPE_SERIAL_MM); object_initialize_child(o, "serial", smm, TYPE_SERIAL_MM);
qdev_set_legacy_instance_id(DEVICE(smm), SM501_UART0, 2); qdev_set_legacy_instance_id(DEVICE(smm), SM501_UART0, 2);
qdev_prop_set_uint8(DEVICE(smm), "regshift", 2); qdev_prop_set_uint8(DEVICE(smm), "regshift", 2);