From 61d3cf93e2676282ba1a8d568b2406257f208b26 Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Mon, 5 Apr 2010 19:57:40 +0100 Subject: OHCI qdev conversion Convert remaining OHCI devices to QDEV interface. Signed-off-by: Paul Brook --- hw/sm501.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'hw/sm501.c') diff --git a/hw/sm501.c b/hw/sm501.c index 1a342bd..9310014 100644 --- a/hw/sm501.c +++ b/hw/sm501.c @@ -27,6 +27,8 @@ #include "pc.h" #include "console.h" #include "devices.h" +#include "sysbus.h" +#include "qdev-addr.h" /* * Status: 2008/11/02 @@ -1190,6 +1192,7 @@ void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq, CharDriverState *chr) { SM501State * s; + DeviceState *dev; int sm501_system_config_index; int sm501_disp_ctrl_index; @@ -1222,8 +1225,13 @@ void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq, 0x1000, sm501_disp_ctrl_index); /* bridge to usb host emulation module */ - usb_ohci_init_sm501(base + MMIO_BASE_OFFSET + SM501_USB_HOST, base, - 2, -1, irq); + dev = qdev_create(NULL, "sysbus-ohci"); + qdev_prop_set_uint32(dev, "num-ports", 2); + qdev_prop_set_taddr(dev, "dma-offset", base); + qdev_init_nofail(dev); + sysbus_mmio_map(sysbus_from_qdev(dev), 0, + base + MMIO_BASE_OFFSET + SM501_USB_HOST); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); /* bridge to serial emulation module */ if (chr) { -- cgit v1.1