[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/11] usb/ehci: Debug mode compile fixes
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v2 10/11] usb/ehci: Debug mode compile fixes |
Date: |
Fri, 26 Oct 2012 15:47:50 +1000 |
A few debug messages in EHCI must have missed out on updates during incremental
developments. Fixed.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/usb/hcd-ehci.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 7de3e54..26086b2 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -1486,8 +1486,8 @@ static void ehci_execute_complete(EHCIQueue *q)
assert(p->async == EHCI_ASYNC_INITIALIZED ||
p->async == EHCI_ASYNC_FINISHED);
- DPRINTF("execute_complete: qhaddr 0x%x, next %x, qtdaddr 0x%x, status
%d\n",
- q->qhaddr, q->qh.next, q->qtdaddr, q->usb_status);
+ DPRINTF("execute_complete: qhaddr 0x%x, next %x, qtdaddr 0x%x\n",
+ q->qhaddr, q->qh.next, q->qtdaddr);
if (p->usb_status < 0) {
switch (p->usb_status) {
@@ -1546,6 +1546,7 @@ static int ehci_execute(EHCIPacket *p, const char *action)
USBEndpoint *ep;
int ret;
int endp;
+ EHCIQueue *q = p->queue;
assert(p->async == EHCI_ASYNC_NONE ||
p->async == EHCI_ASYNC_INITIALIZED);
@@ -1557,7 +1558,7 @@ static int ehci_execute(EHCIPacket *p, const char *action)
p->tbytes = (p->qtd.token & QTD_TOKEN_TBYTES_MASK) >> QTD_TOKEN_TBYTES_SH;
if (p->tbytes > BUFF_SIZE) {
- ehci_trace_guest_bug(p->queue->ehci,
+ ehci_trace_guest_bug(q->ehci,
"guest requested more bytes than allowed");
return USB_RET_PROCERR;
}
@@ -1578,8 +1579,8 @@ static int ehci_execute(EHCIPacket *p, const char *action)
break;
}
- endp = get_field(p->queue->qh.epchar, QH_EPCHAR_EP);
- ep = usb_ep_get(p->queue->dev, p->pid, endp);
+ endp = get_field(q->qh.epchar, QH_EPCHAR_EP);
+ ep = usb_ep_get(q->dev, p->pid, endp);
if (p->async == EHCI_ASYNC_NONE) {
if (ehci_init_transfer(p) != 0) {
@@ -1591,12 +1592,10 @@ static int ehci_execute(EHCIPacket *p, const char
*action)
p->async = EHCI_ASYNC_INITIALIZED;
}
- trace_usb_ehci_packet_action(p->queue, p, action);
- ret = usb_handle_packet(p->queue->dev, &p->packet);
- DPRINTF("submit: qh %x next %x qtd %x pid %x len %zd "
- "(total %d) endp %x ret %d\n",
- q->qhaddr, q->qh.next, q->qtdaddr, q->pid,
- q->packet.iov.size, q->tbytes, endp, ret);
+ trace_usb_ehci_packet_action(q, p, action);
+ ret = usb_handle_packet(q->dev, &p->packet);
+ DPRINTF("submit: qh %x next %x qtd %x pid %x (total %d) endp %x ret %d\n",
+ q->qhaddr, q->qh.next, q->qtdaddr, p->pid, p->tbytes, endp, ret);
if (ret > BUFF_SIZE) {
fprintf(stderr, "ret from usb_handle_packet > BUFF_SIZE\n");
--
1.7.0.4
- [Qemu-devel] [PATCH v2 06/11] usb/ehci: Add Sysbus Infrastructure, (continued)
[Qemu-devel] [PATCH v2 10/11] usb/ehci: Debug mode compile fixes,
Peter Crosthwaite <=
[Qemu-devel] [PATCH v2 08/11] xilinx_zynq: add USB controllers, Peter Crosthwaite, 2012/10/26