mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uhci: QOMify

Browse Source 
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gonglei 2015-05-06 20:55:23 +08:00 committed by Gerd Hoffmann
parent df0f1692db
commit 49184b6253
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hw/usb/hcd-uhci.c
View File

@ -154,6 +154,9 @@ static void uhci_async_cancel(UHCIAsync *async);
static void uhci_queue_fill(UHCIQueue *q, UHCI_TD *td); static void uhci_queue_fill(UHCIQueue *q, UHCI_TD *td);
static void uhci_resume(void *opaque); static void uhci_resume(void *opaque);
#define TYPE_UHCI "pci-uhci-usb"
#define UHCI(obj) OBJECT_CHECK(UHCIState, (obj), TYPE_UHCI)
static inline int32_t uhci_queue_token(UHCI_TD *td) static inline int32_t uhci_queue_token(UHCI_TD *td)
{ {
if ((td->token & (0xf << 15)) == 0) { if ((td->token & (0xf << 15)) == 0) {
@ -351,7 +354,7 @@ static void uhci_update_irq(UHCIState *s)
static void uhci_reset(DeviceState *dev) static void uhci_reset(DeviceState *dev)
{ {
PCIDevice *d = PCI_DEVICE(dev); PCIDevice *d = PCI_DEVICE(dev);
UHCIState *s = DO_UPCAST(UHCIState, dev, d); UHCIState *s = UHCI(d);
uint8_t *pci_conf; uint8_t *pci_conf;
int i; int i;
UHCIPort *port; UHCIPort *port;
@ -1196,7 +1199,7 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
Error *err = NULL; Error *err = NULL;
PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev); PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
UHCIPCIDeviceClass *u = container_of(pc, UHCIPCIDeviceClass, parent_class); UHCIPCIDeviceClass *u = container_of(pc, UHCIPCIDeviceClass, parent_class);
UHCIState *s = DO_UPCAST(UHCIState, dev, dev); UHCIState *s = UHCI(dev);
uint8_t *pci_conf = s->dev.config; uint8_t *pci_conf = s->dev.config;
int i; int i;
@ -1241,7 +1244,7 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
static void usb_uhci_vt82c686b_realize(PCIDevice *dev, Error **errp) static void usb_uhci_vt82c686b_realize(PCIDevice *dev, Error **errp)
{ {
UHCIState *s = DO_UPCAST(UHCIState, dev, dev); UHCIState *s = UHCI(dev);
uint8_t *pci_conf = s->dev.config; uint8_t *pci_conf = s->dev.config;
/* USB misc control 1/2 */ /* USB misc control 1/2 */
@ -1256,7 +1259,7 @@ static void usb_uhci_vt82c686b_realize(PCIDevice *dev, Error **errp)
static void usb_uhci_exit(PCIDevice *dev) static void usb_uhci_exit(PCIDevice *dev)
{ {
UHCIState *s = DO_UPCAST(UHCIState, dev, dev); UHCIState *s = UHCI(dev);
trace_usb_uhci_exit(); trace_usb_uhci_exit();
@ -1294,6 +1297,26 @@ static void uhci_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->class_id = PCI_CLASS_SERIAL_USB;
dc->vmsd = &vmstate_uhci;
dc->reset = uhci_reset;
set_bit(DEVICE_CATEGORY_USB, dc->categories);
}
static const TypeInfo uhci_pci_type_info = {
.name = TYPE_UHCI,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(UHCIState),
.class_size = sizeof(UHCIPCIDeviceClass),
.abstract = true,
.class_init = uhci_class_init,
};
static void uhci_data_class_init(ObjectClass *klass, void *data)
{
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
UHCIPCIDeviceClass *u = container_of(k, UHCIPCIDeviceClass, parent_class); UHCIPCIDeviceClass *u = container_of(k, UHCIPCIDeviceClass, parent_class);
UHCIInfo *info = data; UHCIInfo *info = data;
@ -1302,9 +1325,6 @@ static void uhci_class_init(ObjectClass *klass, void *data)
k->vendor_id = info->vendor_id; k->vendor_id = info->vendor_id;
k->device_id = info->device_id; k->device_id = info->device_id;
k->revision = info->revision; k->revision = info->revision;
k->class_id = PCI_CLASS_SERIAL_USB;
dc->vmsd = &vmstate_uhci;
dc->reset = uhci_reset;
if (!info->unplug) { if (!info->unplug) {
/* uhci controllers in companion setups can't be hotplugged */ /* uhci controllers in companion setups can't be hotplugged */
dc->hotpluggable = false; dc->hotpluggable = false;
@ -1312,7 +1332,6 @@ static void uhci_class_init(ObjectClass *klass, void *data)
} else { } else {
dc->props = uhci_properties_standalone; dc->props = uhci_properties_standalone;
} }
set_bit(DEVICE_CATEGORY_USB, dc->categories);
u->info = *info; u->info = *info;
} }
@ -1387,13 +1406,13 @@ static UHCIInfo uhci_info[] = {
static void uhci_register_types(void) static void uhci_register_types(void)
{ {
TypeInfo uhci_type_info = { TypeInfo uhci_type_info = {
.parent = TYPE_PCI_DEVICE, .parent = TYPE_UHCI,
.instance_size = sizeof(UHCIState), .class_init = uhci_data_class_init,
.class_size = sizeof(UHCIPCIDeviceClass),
.class_init = uhci_class_init,
}; };
int i; int i;
type_register_static(&uhci_pci_type_info);
for (i = 0; i < ARRAY_SIZE(uhci_info); i++) { for (i = 0; i < ARRAY_SIZE(uhci_info); i++) {
uhci_type_info.name = uhci_info[i].name; uhci_type_info.name = uhci_info[i].name;
uhci_type_info.class_data = uhci_info + i; uhci_type_info.class_data = uhci_info + i;