summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2013-07-24 22:40:12 +0200
committerMarcin Bukat <marcin.bukat@gmail.com>2013-07-24 23:17:13 +0200
commit49bcf3530962c40857c510af431968960ba4bdc6 (patch)
tree3252899639947412447a5ffb4cfeccc6dec94bf4
parent074e911859a0d3464fde9b701b3cff712c5826e0 (diff)
downloadrockbox-49bcf3530962c40857c510af431968960ba4bdc6.tar.gz
rockbox-49bcf3530962c40857c510af431968960ba4bdc6.zip
usb stack: add more verbose debug logf()s
Change-Id: I087aefd2854978813c7e4ed7ef7da400f3692e39
-rw-r--r--firmware/usbstack/usb_core.c8
-rw-r--r--firmware/usbstack/usb_storage.c1
2 files changed, 7 insertions, 2 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index cc41e8b892..130111cdfe 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -440,7 +440,10 @@ void usb_core_handle_transfer_completion(
440 440
441 switch(ep) { 441 switch(ep) {
442 case EP_CONTROL: 442 case EP_CONTROL:
443 logf("ctrl handled %ld",current_tick); 443 logf("ctrl handled %ld req=0x%x",
444 current_tick,
445 ((struct usb_ctrlrequest*)event->data)->bRequest);
446
444 usb_core_control_request_handler( 447 usb_core_control_request_handler(
445 (struct usb_ctrlrequest*)event->data); 448 (struct usb_ctrlrequest*)event->data);
446 break; 449 break;
@@ -825,6 +828,7 @@ static void request_handler_endpoint_standard(struct usb_ctrlrequest* req)
825 usb_drv_send(EP_CONTROL, NULL, 0); 828 usb_drv_send(EP_CONTROL, NULL, 0);
826 break; 829 break;
827 case USB_REQ_SET_FEATURE: 830 case USB_REQ_SET_FEATURE:
831 logf("usb_core: SET FEATURE (%d)", req->wValue);
828 if(req->wValue == USB_ENDPOINT_HALT) 832 if(req->wValue == USB_ENDPOINT_HALT)
829 usb_drv_stall(EP_NUM(req->wIndex), true, EP_DIR(req->wIndex)); 833 usb_drv_stall(EP_NUM(req->wIndex), true, EP_DIR(req->wIndex));
830 834
@@ -959,7 +963,7 @@ void usb_core_control_request(struct usb_ctrlrequest* req)
959 completion_event->data = (void*)req; 963 completion_event->data = (void*)req;
960 completion_event->status = 0; 964 completion_event->status = 0;
961 completion_event->length = 0; 965 completion_event->length = 0;
962 logf("ctrl received %ld", current_tick); 966 logf("ctrl received %ld, req=0x%x", current_tick, req->bRequest);
963 usb_signal_transfer_completion(completion_event); 967 usb_signal_transfer_completion(completion_event);
964} 968}
965 969
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 85a0e2b843..c51b0faa4c 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -753,6 +753,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
753 unsigned int block_size_mult = 1; 753 unsigned int block_size_mult = 1;
754 754
755 if(letoh32(cbw->signature) != CBW_SIGNATURE) { 755 if(letoh32(cbw->signature) != CBW_SIGNATURE) {
756 logf("ums: bad cbw signature (%x)", cbw->signature);
756 usb_drv_stall(ep_in, true,true); 757 usb_drv_stall(ep_in, true,true);
757 usb_drv_stall(ep_out, true,false); 758 usb_drv_stall(ep_out, true,false);
758 return; 759 return;