hw/isa/vt82c686: Instantiate USB functions in host device
The USB functions can be enabled/disabled through the ISA function. Also its interrupt routing can be influenced there. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Acked-by: Daniel Henrique Barboza <danielhb413@gmail.com> Message-Id: <20220901114127.53914-9-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
65c69e9a9f
commit
1a99ddbe35
@ -23,6 +23,7 @@
|
|||||||
#include "hw/intc/i8259.h"
|
#include "hw/intc/i8259.h"
|
||||||
#include "hw/irq.h"
|
#include "hw/irq.h"
|
||||||
#include "hw/dma/i8257.h"
|
#include "hw/dma/i8257.h"
|
||||||
|
#include "hw/usb/hcd-uhci.h"
|
||||||
#include "hw/timer/i8254.h"
|
#include "hw/timer/i8254.h"
|
||||||
#include "hw/rtc/mc146818rtc.h"
|
#include "hw/rtc/mc146818rtc.h"
|
||||||
#include "migration/vmstate.h"
|
#include "migration/vmstate.h"
|
||||||
@ -546,6 +547,7 @@ struct ViaISAState {
|
|||||||
qemu_irq *isa_irqs;
|
qemu_irq *isa_irqs;
|
||||||
ViaSuperIOState via_sio;
|
ViaSuperIOState via_sio;
|
||||||
PCIIDEState ide;
|
PCIIDEState ide;
|
||||||
|
UHCIState uhci[2];
|
||||||
};
|
};
|
||||||
|
|
||||||
static const VMStateDescription vmstate_via = {
|
static const VMStateDescription vmstate_via = {
|
||||||
@ -563,6 +565,8 @@ static void via_isa_init(Object *obj)
|
|||||||
ViaISAState *s = VIA_ISA(obj);
|
ViaISAState *s = VIA_ISA(obj);
|
||||||
|
|
||||||
object_initialize_child(obj, "ide", &s->ide, TYPE_VIA_IDE);
|
object_initialize_child(obj, "ide", &s->ide, TYPE_VIA_IDE);
|
||||||
|
object_initialize_child(obj, "uhci1", &s->uhci[0], TYPE_VT82C686B_USB_UHCI);
|
||||||
|
object_initialize_child(obj, "uhci2", &s->uhci[1], TYPE_VT82C686B_USB_UHCI);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo via_isa_info = {
|
static const TypeInfo via_isa_info = {
|
||||||
@ -629,6 +633,14 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
|
|||||||
if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) {
|
if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Functions 2-3: USB Ports */
|
||||||
|
for (i = 0; i < ARRAY_SIZE(s->uhci); i++) {
|
||||||
|
qdev_prop_set_int32(DEVICE(&s->uhci[i]), "addr", d->devfn + 2 + i);
|
||||||
|
if (!qdev_realize(DEVICE(&s->uhci[i]), BUS(pci_bus), errp)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TYPE_VT82C686B_ISA */
|
/* TYPE_VT82C686B_ISA */
|
||||||
|
@ -208,9 +208,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
|
|||||||
dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
|
dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
|
||||||
pci_ide_create_devs(dev);
|
pci_ide_create_devs(dev);
|
||||||
|
|
||||||
pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), TYPE_VT82C686B_USB_UHCI);
|
|
||||||
pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), TYPE_VT82C686B_USB_UHCI);
|
|
||||||
|
|
||||||
dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM);
|
dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM);
|
||||||
*i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
|
*i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
|
||||||
|
|
||||||
|
@ -168,10 +168,6 @@ static void pegasos2_init(MachineState *machine)
|
|||||||
dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
|
dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
|
||||||
pci_ide_create_devs(dev);
|
pci_ide_create_devs(dev);
|
||||||
|
|
||||||
/* VT8231 function 2-3: USB Ports */
|
|
||||||
pci_create_simple(pci_bus, PCI_DEVFN(12, 2), TYPE_VT82C686B_USB_UHCI);
|
|
||||||
pci_create_simple(pci_bus, PCI_DEVFN(12, 3), TYPE_VT82C686B_USB_UHCI);
|
|
||||||
|
|
||||||
/* VT8231 function 4: Power Management Controller */
|
/* VT8231 function 4: Power Management Controller */
|
||||||
dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 4), TYPE_VT8231_PM);
|
dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 4), TYPE_VT8231_PM);
|
||||||
i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
|
i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
|
||||||
|
Loading…
Reference in New Issue
Block a user