Signed-off-by: Hongren (Zenithal) Zheng <i...@zenithal.me>
---
hw/usb/canokey.c | 13 +++++++++++++
hw/usb/trace-events | 16 ++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c
index 3c2efa43fc..1753a30be9 100644
--- a/hw/usb/canokey.c
+++ b/hw/usb/canokey.c
@@ -14,6 +14,7 @@
#include "qapi/error.h"
#include "hw/usb.h"
#include "hw/qdev-properties.h"
+#include "trace.h"
#include "desc.h"
#include "canokey.h"
@@ -65,6 +66,7 @@ static const USBDesc desc_canokey = {
*/
int canokey_emu_stall_ep(void *base, uint8_t ep)
{
+ trace_canokey_emu_stall_ep(ep);
CanoKeyState *key = base;
uint8_t ep_in = CANOKEY_EP_IN(ep); /* INTR IN has ep 129 */
key->ep_in_size[ep_in] = 0;
@@ -74,6 +76,7 @@ int canokey_emu_stall_ep(void *base, uint8_t ep)
int canokey_emu_set_address(void *base, uint8_t addr)
{
+ trace_canokey_emu_set_address(addr);
CanoKeyState *key = base;
key->dev.addr = addr;
return 0;
@@ -82,6 +85,7 @@ int canokey_emu_set_address(void *base, uint8_t addr)
int canokey_emu_prepare_receive(
void *base, uint8_t ep, uint8_t *pbuf, uint16_t size)
{
+ trace_canokey_emu_prepare_receive(ep, size);
CanoKeyState *key = base;
key->ep_out[ep] = pbuf;
key->ep_out_size[ep] = size;
@@ -91,6 +95,7 @@ int canokey_emu_prepare_receive(
int canokey_emu_transmit(
void *base, uint8_t ep, const uint8_t *pbuf, uint16_t size)
{
+ trace_canokey_emu_transmit(ep, size);
CanoKeyState *key = base;
uint8_t ep_in = CANOKEY_EP_IN(ep); /* INTR IN has ep 129 */
memcpy(key->ep_in[ep_in] + key->ep_in_size[ep_in],
@@ -124,6 +129,7 @@ uint32_t canokey_emu_get_rx_data_size(void *base, uint8_t
ep)
*/
static void canokey_handle_reset(USBDevice *dev)
{
+ trace_canokey_handle_reset();
CanoKeyState *key = CANOKEY(dev);
for (int i = 0; i != CANOKEY_EP_NUM; ++i) {
key->ep_in_state[i] = CANOKEY_EP_IN_WAIT;
@@ -136,6 +142,7 @@ static void canokey_handle_reset(USBDevice *dev)
static void canokey_handle_control(USBDevice *dev, USBPacket *p,
int request, int value, int index, int length, uint8_t *data)
{
+ trace_canokey_handle_control_setup(request, value, index, length);
CanoKeyState *key = CANOKEY(dev);
canokey_emu_setup(request, value, index, length);
@@ -143,6 +150,7 @@ static void canokey_handle_control(USBDevice *dev,
USBPacket *p,
uint32_t dir_in = request & DeviceRequest;
if (!dir_in) {
/* OUT */
+ trace_canokey_handle_control_out();
if (key->ep_out[0] != NULL) {
memcpy(key->ep_out[0], data, length);
}
@@ -162,6 +170,7 @@ static void canokey_handle_control(USBDevice *dev,
USBPacket *p,
case CANOKEY_EP_IN_READY:
memcpy(data, key->ep_in[0], key->ep_in_size[0]);
p->actual_length = key->ep_in_size[0];
+ trace_canokey_handle_control_in(p->actual_length);
/* reset state */
key->ep_in_state[0] = CANOKEY_EP_IN_WAIT;
key->ep_in_size[0] = 0;
@@ -181,6 +190,7 @@ static void canokey_handle_data(USBDevice *dev, USBPacket
*p)
uint32_t out_len;
switch (p->pid) {
case USB_TOKEN_OUT:
+ trace_canokey_handle_data_out(ep_out, p->iov.size);
usb_packet_copy(p, key->ep_out_buffer[ep_out], p->iov.size);
out_pos = 0;
while (out_pos != p->iov.size) {
@@ -225,6 +235,7 @@ static void canokey_handle_data(USBDevice *dev, USBPacket
*p)
key->ep_in_size[ep_in] = 0;
key->ep_in_pos[ep_in] = 0;
}
+ trace_canokey_handle_data_in(ep_in, in_len);
break;
}
break;
@@ -236,6 +247,7 @@ static void canokey_handle_data(USBDevice *dev, USBPacket
*p)
static void canokey_realize(USBDevice *base, Error **errp)
{
+ trace_canokey_realize();
CanoKeyState *key = CANOKEY(base);
if (key->file == NULL) {
@@ -259,6 +271,7 @@ static void canokey_realize(USBDevice *base, Error **errp)
static void canokey_unrealize(USBDevice *base)
{
+ trace_canokey_unrealize();
}
static Property canokey_properties[] = {
diff --git a/hw/usb/trace-events b/hw/usb/trace-events
index b8287b63f1..b0fe383eb8 100644
--- a/hw/usb/trace-events
+++ b/hw/usb/trace-events
@@ -345,3 +345,19 @@ usb_serial_set_baud(int bus, int addr, int baud) "dev
%d:%u baud rate %d"
usb_serial_set_data(int bus, int addr, int parity, int data, int stop) "dev
%d:%u parity %c, data bits %d, stop bits %d"
usb_serial_set_flow_control(int bus, int addr, int index) "dev %d:%u flow
control %d"
usb_serial_set_xonxoff(int bus, int addr, uint8_t xon, uint8_t xoff) "dev
%d:%u xon 0x%x xoff 0x%x"
+
+# canokey.c
+canokey_emu_stall_ep(uint8_t ep) "ep %d"
+canokey_emu_set_address(uint8_t addr) "addr %d"
+canokey_emu_prepare_receive(uint8_t ep, uint16_t size) "ep %d size %d"
+canokey_emu_transmit(uint8_t ep, uint16_t size) "ep %d size %d"
+canokey_thread_start(void)
+canokey_thread_stop(void)
+canokey_handle_reset(void)
+canokey_handle_control_setup(int request, int value, int index, int length)
"request 0x%04X value 0x%04X index 0x%04X length 0x%04X"
+canokey_handle_control_out(void)
+canokey_handle_control_in(int actual_len) "len %d"
+canokey_handle_data_out(uint8_t ep_out, uint32_t out_len) "ep %d len %d"
+canokey_handle_data_in(uint8_t ep_in, uint32_t in_len) "ep %d len %d"
+canokey_realize(void)
+canokey_unrealize(void)
--
2.34.1
