[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/31] usb-ehci: split trace calls to handle arg cou
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 17/31] usb-ehci: split trace calls to handle arg count limits |
Date: |
Mon, 6 Jun 2011 14:39:08 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-ehci.c | 48 +++++++++++++++++++++++++++---------------------
trace-events | 8 ++++++--
2 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index d807245..b151b48 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -600,31 +600,37 @@ static int ehci_get_fetch_addr(EHCIState *s, int async)
static void ehci_trace_qh(EHCIQueue *q, target_phys_addr_t addr, EHCIqh *qh)
{
- trace_usb_ehci_qh(q, addr, qh->next,
- qh->current_qtd, qh->next_qtd, qh->altnext_qtd,
- get_field(qh->epchar, QH_EPCHAR_RL),
- get_field(qh->epchar, QH_EPCHAR_MPLEN),
- get_field(qh->epchar, QH_EPCHAR_EPS),
- get_field(qh->epchar, QH_EPCHAR_EP),
- get_field(qh->epchar, QH_EPCHAR_DEVADDR),
- (bool)(qh->epchar & QH_EPCHAR_C),
- (bool)(qh->epchar & QH_EPCHAR_H),
- (bool)(qh->epchar & QH_EPCHAR_DTC),
- (bool)(qh->epchar & QH_EPCHAR_I));
+ /* need three here due to argument count limits */
+ trace_usb_ehci_qh_ptrs(q, addr, qh->next,
+ qh->current_qtd, qh->next_qtd, qh->altnext_qtd);
+ trace_usb_ehci_qh_fields(addr,
+ get_field(qh->epchar, QH_EPCHAR_RL),
+ get_field(qh->epchar, QH_EPCHAR_MPLEN),
+ get_field(qh->epchar, QH_EPCHAR_EPS),
+ get_field(qh->epchar, QH_EPCHAR_EP),
+ get_field(qh->epchar, QH_EPCHAR_DEVADDR));
+ trace_usb_ehci_qh_bits(addr,
+ (bool)(qh->epchar & QH_EPCHAR_C),
+ (bool)(qh->epchar & QH_EPCHAR_H),
+ (bool)(qh->epchar & QH_EPCHAR_DTC),
+ (bool)(qh->epchar & QH_EPCHAR_I));
}
static void ehci_trace_qtd(EHCIQueue *q, target_phys_addr_t addr, EHCIqtd *qtd)
{
- trace_usb_ehci_qtd(q, addr, qtd->next, qtd->altnext,
- get_field(qtd->token, QTD_TOKEN_TBYTES),
- get_field(qtd->token, QTD_TOKEN_CPAGE),
- get_field(qtd->token, QTD_TOKEN_CERR),
- get_field(qtd->token, QTD_TOKEN_PID),
- (bool)(qtd->token & QTD_TOKEN_IOC),
- (bool)(qtd->token & QTD_TOKEN_ACTIVE),
- (bool)(qtd->token & QTD_TOKEN_HALT),
- (bool)(qtd->token & QTD_TOKEN_BABBLE),
- (bool)(qtd->token & QTD_TOKEN_XACTERR));
+ /* need three here due to argument count limits */
+ trace_usb_ehci_qtd_ptrs(q, addr, qtd->next, qtd->altnext);
+ trace_usb_ehci_qtd_fields(addr,
+ get_field(qtd->token, QTD_TOKEN_TBYTES),
+ get_field(qtd->token, QTD_TOKEN_CPAGE),
+ get_field(qtd->token, QTD_TOKEN_CERR),
+ get_field(qtd->token, QTD_TOKEN_PID));
+ trace_usb_ehci_qtd_bits(addr,
+ (bool)(qtd->token & QTD_TOKEN_IOC),
+ (bool)(qtd->token & QTD_TOKEN_ACTIVE),
+ (bool)(qtd->token & QTD_TOKEN_HALT),
+ (bool)(qtd->token & QTD_TOKEN_BABBLE),
+ (bool)(qtd->token & QTD_TOKEN_XACTERR));
}
static void ehci_trace_itd(EHCIState *s, target_phys_addr_t addr, EHCIitd *itd)
diff --git a/trace-events b/trace-events
index dd69702..f1230f1 100644
--- a/trace-events
+++ b/trace-events
@@ -201,8 +201,12 @@ disable usb_ehci_mmio_writel(uint32_t addr, const char
*str, uint32_t val) "wr m
disable usb_ehci_mmio_change(uint32_t addr, const char *str, uint32_t new,
uint32_t old) "ch mmio %04x [%s] = %x (old: %x)"
disable usb_ehci_usbsts(const char *sts, int state) "usbsts %s %d"
disable usb_ehci_state(const char *schedule, const char *state) "%s schedule
%s"
-disable usb_ehci_qh(void *q, 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) "q %p - 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(void *q, 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) "q %p - QTD @ %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_qh_ptrs(void *q, uint32_t addr, uint32_t next, uint32_t
c_qtd, uint32_t n_qtd, uint32_t a_qtd) "q %p - QH @ %08x: next %08x qtds
%08x,%08x,%08x"
+disable usb_ehci_qh_fields(uint32_t addr, int rl, int mplen, int eps, int ep,
int devaddr) "QH @ %08x - rl %d, mplen %d, eps %d, ep %d, dev %d"
+disable usb_ehci_qh_bits(uint32_t addr, int c, int h, int dtc, int i) "QH @
%08x - c %d, h %d, dtc %d, i %d"
+disable usb_ehci_qtd_ptrs(void *q, uint32_t addr, uint32_t next, uint32_t
altnext) "q %p - QTD @ %08x: next %08x altnext %08x"
+disable usb_ehci_qtd_fields(uint32_t addr, int tbytes, int cpage, int cerr,
int pid) "QTD @ %08x - tbytes %d, cpage %d, cerr %d, pid %d"
+disable usb_ehci_qtd_bits(uint32_t addr, int ioc, int active, int halt, int
babble, int xacterr) "QTD @ %08x - ioc %d, active %d, halt %d, babble %d,
xacterr %d"
disable usb_ehci_itd(uint32_t addr, uint32_t next, uint32_t mplen, uint32_t
mult, uint32_t ep, uint32_t devaddr) "ITD @ %08x: next %08x - mplen %d, mult
%d, ep %d, dev %d"
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"
--
1.7.1
- [Qemu-devel] [PATCH 22/31] usb-linux: Ensure devep != 0, (continued)
- [Qemu-devel] [PATCH 22/31] usb-linux: Ensure devep != 0, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 21/31] usb-linux: Don't do perror when errno is not set, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 20/31] usb-linux: Teach about super speed, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 16/31] usb-ehci: itd handling fixes., Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 25/31] usb: don't call usb_host_device_open from vl.c, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 28/31] usb-bus: Don't detach non attached devices on device exit, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 24/31] usb-linux: only cleanup in host_close when host_open was successful., Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 27/31] usb-bus: Add knowledge of USB_SPEED_SUPER to usb_speed helper, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 26/31] usb-linux: Enlarge buffer for descriptors to 8192 bytes, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 15/31] The USB tablet should not claim boot protocol support., Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 17/31] usb-ehci: split trace calls to handle arg count limits,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 29/31] usb: Add defines for USB Serial Bus Release Number register, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 30/31] usb: Use defines for serial bus release number register for UHCI, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 31/31] usb: Use defines for serial bus release number register for EHCI, Gerd Hoffmann, 2011/06/06