[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] usb-ehci: trace port state
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 04/12] usb-ehci: trace port state |
Date: |
Thu, 26 May 2011 12:44:06 +0200 |
Trace usb port operations (attach, detach, reset),
drop a few obsolete DPRINTF's.
No change in behavior.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-ehci.c | 10 ++++------
trace-events | 3 +++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index 40a447b..85e5ed9 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -604,8 +604,7 @@ static void ehci_attach(USBPort *port)
EHCIState *s = port->opaque;
uint32_t *portsc = &s->portsc[port->index];
- DPRINTF("ehci_attach invoked for index %d, portsc 0x%x, desc %s\n",
- port->index, *portsc, port->dev->product_desc);
+ trace_usb_ehci_port_attach(port->index, port->dev->product_desc);
*portsc |= PORTSC_CONNECT;
*portsc |= PORTSC_CSC;
@@ -625,8 +624,7 @@ static void ehci_detach(USBPort *port)
EHCIState *s = port->opaque;
uint32_t *portsc = &s->portsc[port->index];
- DPRINTF("ehci_attach invoked for index %d, portsc 0x%x\n",
- port->index, *portsc);
+ trace_usb_ehci_port_detach(port->index);
*portsc &= ~PORTSC_CONNECT;
*portsc |= PORTSC_CSC;
@@ -733,11 +731,11 @@ static void handle_port_status_write(EHCIState *s, int
port, uint32_t val)
*portsc &= ~rwc;
if ((val & PORTSC_PRESET) && !(*portsc & PORTSC_PRESET)) {
- DPRINTF("port_status_write: USBTRAN Port %d reset begin\n", port);
+ trace_usb_ehci_port_reset(port, 1);
}
if (!(val & PORTSC_PRESET) &&(*portsc & PORTSC_PRESET)) {
- DPRINTF("port_status_write: USBTRAN Port %d reset done\n", port);
+ trace_usb_ehci_port_reset(port, 0);
usb_attach(&s->ports[port], dev);
// TODO how to handle reset of ports with no device
diff --git a/trace-events b/trace-events
index 33adbab..22f93c7 100644
--- a/trace-events
+++ b/trace-events
@@ -203,6 +203,9 @@ disable usb_ehci_state(const char *schedule, const char
*state) "%s schedule %s"
disable usb_ehci_qh(uint32_t addr, uint32_t next, uint32_t c_qtd, uint32_t
n_qtd, uint32_t a_qtd, int rl, int mplen, int eps, int ep, int devaddr, int c,
int h, int dtc, int i) "QH @ %08x: next %08x qtds %08x,%08x,%08x - rl %d, mplen
%d, eps %d, ep %d, dev %d, c %d, h %d, dtc %d, i %d"
disable usb_ehci_qtd(uint32_t addr, uint32_t next, uint32_t altnext, int
tbytes, int cpage, int cerr, int pid, int ioc, int active, int halt, int
babble, int xacterr) "QH @ %08x: next %08x altnext %08x - tbytes %d, cpage %d,
cerr %d, pid %d, ioc %d, active %d, halt %d, babble %d, xacterr %d"
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"
# hw/usb-desc.c
disable usb_desc_device(int addr, int len, int ret) "dev %d query device, len
%d, ret %d"
--
1.7.1
- [Qemu-devel] [PATCH 00/12] ehci: tracing, multiqueue, bugfixes., Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 04/12] usb-ehci: trace port state,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 01/12] usb-linux: catch NODEV in more places., Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 02/12] usb-ehci: trace mmio and usbsts, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 03/12] usb-ehci: trace state machine changes, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 06/12] usb-ehci: trace buffer copy, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 09/12] usb-ehci: fix offset writeback in ehci_buffer_rw, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 05/12] usb-ehci: improve mmio tracing, Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 10/12] usb-ehci: fix error handling., Gerd Hoffmann, 2011/05/26
- [Qemu-devel] [PATCH 11/12] ehci: fix a number of unused-but-set-variable warnings (new with gcc-4.6), Gerd Hoffmann, 2011/05/26