[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/14] uhci: pass addr to uhci_async_alloc
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 06/14] uhci: pass addr to uhci_async_alloc |
Date: |
Tue, 13 Mar 2012 13:20:03 +0100 |
Also do async->td initialization in uhci_async_alloc now.
Prepares for adding tracepoints.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-uhci.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 5c708cf..476db1f 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -198,11 +198,12 @@ static void uhci_queue_free(UHCIQueue *queue)
g_free(queue);
}
-static UHCIAsync *uhci_async_alloc(UHCIQueue *queue)
+static UHCIAsync *uhci_async_alloc(UHCIQueue *queue, uint32_t addr)
{
UHCIAsync *async = g_new0(UHCIAsync, 1);
async->queue = queue;
+ async->td = addr;
usb_packet_init(&async->packet);
pci_dma_sglist_init(&async->sgl, &queue->uhci->dev, 1);
@@ -814,7 +815,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr,
UHCI_TD *td, uint32_t *in
}
/* Allocate new packet */
- async = uhci_async_alloc(uhci_queue_get(s, td));
+ async = uhci_async_alloc(uhci_queue_get(s, td), addr);
if (!async)
return 1;
@@ -822,7 +823,6 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr,
UHCI_TD *td, uint32_t *in
* for initial isochronous requests
*/
async->queue->valid = 32;
- async->td = addr;
async->isoc = td->ctrl & TD_CTRL_IOS;
max_len = ((td->token >> 21) + 1) & 0x7ff;
--
1.7.1
- [Qemu-devel] [PATCH 03/14] usb-ehci: drop unused isoch_pause variable, (continued)
- [Qemu-devel] [PATCH 03/14] usb-ehci: drop unused isoch_pause variable, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 11/14] uhci: renumber uhci_handle_td return codes, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 14/14] Endian fix an assertion in usb-msd, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 02/14] usb: zap hw/ush-{ohic, uhci}.h + init wrappers, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 01/14] usb: the big rename, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 04/14] usb-ohci: DMA writeback bug fixes, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 07/14] uhci: fix uhci_async_cancel_all, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 13/14] uhci: alloc can't fail, drop check., Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 09/14] uhci: tracing support, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 06/14] uhci: pass addr to uhci_async_alloc,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/14] uhci: cancel on schedule stop., Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 05/14] usb: improve packet state sanity checks, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 12/14] uhci: new uhci_handle_td return code for tds still in flight, Gerd Hoffmann, 2012/03/13
- [Qemu-devel] [PATCH 10/14] uhci: use enum for uhci_handle_td return codes, Gerd Hoffmann, 2012/03/13
- Re: [Qemu-devel] [PULL 00/14] usb patch queue, Anthony Liguori, 2012/03/13