diff options
| -rw-r--r-- | hw/usb-ehci.c | 8 | ||||
| -rw-r--r-- | trace-events | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c index b9204ab457..d89cb28ab6 100644 --- a/hw/usb-ehci.c +++ b/hw/usb-ehci.c @@ -901,8 +901,6 @@ static int ehci_qh_do_overlay(EHCIState *ehci, EHCIqh *qh, EHCIqtd *qtd) dtoggle = qh->token & QTD_TOKEN_DTOGGLE; ping = qh->token & QTD_TOKEN_PING; - DPRINTF("setting qh.current from %08X to 0x%08X\n", qh->current_qtd, - ehci->qtdaddr); qh->current_qtd = ehci->qtdaddr; qh->next_qtd = qtd->next; qh->altnext_qtd = qtd->altnext; @@ -955,8 +953,6 @@ static int ehci_buffer_rw(uint8_t *buffer, EHCIqh *qh, int bytes, int rw) } offset = qh->bufptr[0] & ~QTD_BUFPTR_MASK; - DPRINTF("ehci_buffer_rw: %sing %d bytes %08x cpage %d offset %d\n", - rw ? "writ" : "read", bytes, qh->bufptr[0], cpage, offset); do { /* start and end of this page */ @@ -969,9 +965,7 @@ static int ehci_buffer_rw(uint8_t *buffer, EHCIqh *qh, int bytes, int rw) tail = head + bytes; } - DPRINTF("DATA %s cpage:%d head:%08X tail:%08X target:%08X\n", - rw ? "WRITE" : "READ ", cpage, head, tail, bufpos); - + trace_usb_ehci_data(rw, cpage, offset, head, tail-head, bufpos); cpu_physical_memory_rw(head, &buffer[bufpos], tail - head, rw); bufpos += (tail - head); diff --git a/trace-events b/trace-events index 1ee711ede6..3426e14f7c 100644 --- a/trace-events +++ b/trace-events @@ -207,6 +207,7 @@ disable usb_ehci_itd(uint32_t addr, uint32_t next) "ITD @ %08x: next %08x" disable usb_ehci_port_attach(uint32_t port, const char *device) "attach port #%d - %s" disable usb_ehci_port_detach(uint32_t port) "detach port #%d" disable usb_ehci_port_reset(uint32_t port, int enable) "reset port #%d - %d" +disable usb_ehci_data(int rw, uint32_t cpage, uint32_t offset, uint32_t addr, uint32_t len, uint32_t bufpos) "write %d, cpage %d, offset 0x%03x, addr 0x%08x, len %d, bufpos %d" # hw/usb-desc.c disable usb_desc_device(int addr, int len, int ret) "dev %d query device, len %d, ret %d" |