[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] uhci: keep uhci state pointer in async packet
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 10/14] uhci: keep uhci state pointer in async packet struct. |
Date: |
Wed, 4 May 2011 17:41:44 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-uhci.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 2de0cf2..2b63b3f 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -106,6 +106,8 @@ static void dump_data(const uint8_t *data, int len)
static void dump_data(const uint8_t *data, int len) {}
#endif
+typedef struct UHCIState UHCIState;
+
/*
* Pending async transaction.
* 'packet' must be the first field because completion
@@ -113,6 +115,7 @@ static void dump_data(const uint8_t *data, int len) {}
*/
typedef struct UHCIAsync {
USBPacket packet;
+ UHCIState *uhci;
QTAILQ_ENTRY(UHCIAsync) next;
uint32_t td;
uint32_t token;
@@ -127,7 +130,7 @@ typedef struct UHCIPort {
uint16_t ctrl;
} UHCIPort;
-typedef struct UHCIState {
+struct UHCIState {
PCIDevice dev;
USBBus bus;
uint16_t cmd; /* cmd register */
@@ -147,7 +150,7 @@ typedef struct UHCIState {
/* Active packets */
QTAILQ_HEAD(,UHCIAsync) async_pending;
uint8_t num_ports_vmstate;
-} UHCIState;
+};
typedef struct UHCI_TD {
uint32_t link;
@@ -166,6 +169,7 @@ static UHCIAsync *uhci_async_alloc(UHCIState *s)
UHCIAsync *async = qemu_malloc(sizeof(UHCIAsync));
memset(&async->packet, 0, sizeof(async->packet));
+ async->uhci = s;
async->valid = 0;
async->td = 0;
async->token = 0;
@@ -830,8 +834,8 @@ done:
static void uhci_async_complete(USBPacket *packet, void *opaque)
{
- UHCIState *s = opaque;
- UHCIAsync *async = (UHCIAsync *) packet;
+ UHCIAsync *async = container_of(packet, UHCIAsync, packet);
+ UHCIState *s = async->uhci;
DPRINTF("uhci: async complete. td 0x%x token 0x%x\n", async->td,
async->token);
--
1.7.1
- [Qemu-devel] [PULL] usb patch queue, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 01/14] usb-linux: introduce a usb_linux_alt_setting function, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 02/14] usb-linux: Get the alt. setting from sysfs rather then asking the dev, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 07/14] usb-linux: Add support for buffering iso out usb packets, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 03/14] usb-linux: Add support for buffering iso usb packets, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 11/14] ohci: get ohci state via container_of(), Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 06/14] usb-linux: We only need to keep track of 15 endpoints, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 04/14] usb-linux: Refuse packets for endpoints which are not in the usb descriptor, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 05/14] usb-linux: Refuse iso packets when max packet size is 0 (alt setting 0), Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 10/14] uhci: keep uhci state pointer in async packet struct.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/14] usb: control buffer fixes, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 12/14] musb: get musb state via container_of(), Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 14/14] usb: mass storage fix, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 13/14] usb: move complete callback to port ops, Gerd Hoffmann, 2011/05/04
- [Qemu-devel] [PATCH 09/14] uhci: switch to QTAILQ, Gerd Hoffmann, 2011/05/04
- Re: [Qemu-devel] [PULL] usb patch queue, Anthony Liguori, 2011/05/05