From patchwork Mon Dec 12 20:18:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 130827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 660ED1007DD for ; Tue, 13 Dec 2011 07:25:39 +1100 (EST) Received: from localhost ([::1]:56799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCRM-0008BR-8i for incoming@patchwork.ozlabs.org; Mon, 12 Dec 2011 15:25:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCRE-00085a-5w for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaCRC-0001P7-Qf for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:28 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:55924 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCRC-0001P3-Cg for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:26 -0500 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id pBCKPIVu032762; Mon, 12 Dec 2011 14:25:19 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id pBCKPGPq032761; Mon, 12 Dec 2011 14:25:16 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 12 Dec 2011 14:18:41 -0600 Message-Id: <1323721273-32404-46-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> References: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH v3 045/197] usb: get rid of info pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- hw/usb-bus.c | 154 ++++++++++++++++++++++++++++++++------------------------- hw/usb.h | 1 - 2 files changed, 86 insertions(+), 69 deletions(-) diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 24a805d..8d9c82d 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -67,21 +67,103 @@ USBBus *usb_bus_find(int busnr) static int usb_device_init(USBDevice *dev) { - if (dev->info->init) { - return dev->info->init(dev); + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->init) { + return info->init(dev); } return 0; } +static void usb_device_handle_destroy(USBDevice *dev) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->handle_destroy) { + info->handle_destroy(dev); + } +} + +int usb_device_handle_packet(USBDevice *dev, USBPacket *p) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->handle_packet) { + return info->handle_packet(dev, p); + } + return -ENOSYS; +} + +void usb_device_cancel_packet(USBDevice *dev, USBPacket *p) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->cancel_packet) { + info->cancel_packet(dev, p); + } +} + +void usb_device_handle_attach(USBDevice *dev) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->handle_attach) { + info->handle_attach(dev); + } +} + +void usb_device_handle_reset(USBDevice *dev) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->handle_reset) { + info->handle_reset(dev); + } +} + +int usb_device_handle_control(USBDevice *dev, USBPacket *p, int request, + int value, int index, int length, uint8_t *data) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->handle_control) { + return info->handle_control(dev, p, request, value, index, length, + data); + } + return -ENOSYS; +} + +int usb_device_handle_data(USBDevice *dev, USBPacket *p) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + if (info->handle_data) { + return info->handle_data(dev, p); + } + return -ENOSYS; +} + +const char *usb_device_get_product_desc(USBDevice *dev) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + return info->product_desc; +} + +const USBDesc *usb_device_get_usb_desc(USBDevice *dev) +{ + USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, + qdev_get_info(DEVICE(dev))); + return info->usb_desc; +} + static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base) { USBDevice *dev = USB_DEVICE(qdev); - USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, base); int rc; pstrcpy(dev->product_desc, sizeof(dev->product_desc), usb_device_get_product_desc(dev)); - dev->info = info; dev->auto_attach = 1; QLIST_INIT(&dev->strings); rc = usb_claim_port(dev); @@ -105,13 +187,6 @@ err: return rc; } -static void usb_device_handle_destroy(USBDevice *dev) -{ - if (dev->info->handle_destroy) { - dev->info->handle_destroy(dev); - } -} - static int usb_qdev_exit(DeviceState *qdev) { USBDevice *dev = USB_DEVICE(qdev); @@ -495,63 +570,6 @@ USBDevice *usbdevice_create(const char *cmdline) return usb->usbdevice_init(params); } -int usb_device_handle_packet(USBDevice *dev, USBPacket *p) -{ - if (dev->info->handle_packet) { - return dev->info->handle_packet(dev, p); - } - return -ENOSYS; -} - -void usb_device_cancel_packet(USBDevice *dev, USBPacket *p) -{ - if (dev->info->cancel_packet) { - dev->info->cancel_packet(dev, p); - } -} - -void usb_device_handle_attach(USBDevice *dev) -{ - if (dev->info->handle_attach) { - dev->info->handle_attach(dev); - } -} - -void usb_device_handle_reset(USBDevice *dev) -{ - if (dev->info->handle_reset) { - dev->info->handle_reset(dev); - } -} - -int usb_device_handle_control(USBDevice *dev, USBPacket *p, int request, - int value, int index, int length, uint8_t *data) -{ - if (dev->info->handle_control) { - return dev->info->handle_control(dev, p, request, value, index, length, - data); - } - return -ENOSYS; -} - -int usb_device_handle_data(USBDevice *dev, USBPacket *p) -{ - if (dev->info->handle_data) { - return dev->info->handle_data(dev, p); - } - return -ENOSYS; -} - -const char *usb_device_get_product_desc(USBDevice *dev) -{ - return dev->info->product_desc; -} - -const USBDesc *usb_device_get_usb_desc(USBDevice *dev) -{ - return dev->info->usb_desc; -} - static TypeInfo usb_device_type_info = { .name = TYPE_USB_DEVICE, .parent = TYPE_DEVICE, diff --git a/hw/usb.h b/hw/usb.h index e05c00d..ee780b0 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -179,7 +179,6 @@ typedef struct USBDeviceClass { /* definition of a USB device */ struct USBDevice { DeviceState qdev; - USBDeviceInfo *info; USBPort *port; char *port_path; void *opaque;