summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2010-03-27 19:41:37 +0000
committerFrank Gevaerts <frank@gevaerts.be>2010-03-27 19:41:37 +0000
commitc689496e0458596f180ebfb75f05d42213b94510 (patch)
treeef7264335570b2d867c5ba678d56fbee0bf60eb2
parentb917337be9b1f309db06cdf3c2379ccdcbb583ab (diff)
downloadrockbox-c689496e0458596f180ebfb75f05d42213b94510.tar.gz
rockbox-c689496e0458596f180ebfb75f05d42213b94510.zip
Remove unnecessary (and incorrect) acks after stalling the control endpoint
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25359 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/usbstack/usb_core.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index a5865da9f9..b7334879f4 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -507,14 +507,6 @@ static void allocate_interfaces_and_endpoints(void)
507 usb_core_num_interfaces = interface; 507 usb_core_num_interfaces = interface;
508} 508}
509 509
510static int usb_core_ack_control(struct usb_ctrlrequest* req)
511{
512 if (req->bRequestType & USB_DIR_IN)
513 return usb_drv_recv(EP_CONTROL,NULL,0);
514 else
515 return usb_drv_send(EP_CONTROL,NULL,0);
516}
517
518 510
519static void control_request_handler_drivers(struct usb_ctrlrequest* req) 511static void control_request_handler_drivers(struct usb_ctrlrequest* req)
520{ 512{
@@ -536,7 +528,6 @@ static void control_request_handler_drivers(struct usb_ctrlrequest* req)
536 /* nope. flag error */ 528 /* nope. flag error */
537 logf("bad req:desc %d:%d", req->bRequest, req->wValue>>8); 529 logf("bad req:desc %d:%d", req->bRequest, req->wValue>>8);
538 usb_drv_stall(EP_CONTROL, true, true); 530 usb_drv_stall(EP_CONTROL, true, true);
539 usb_core_ack_control(req);
540 } 531 }
541} 532}
542 533
@@ -744,7 +735,6 @@ static void request_handler_endoint_drivers(struct usb_ctrlrequest* req)
744 /* nope. flag error */ 735 /* nope. flag error */
745 logf("usb bad req %d",req->bRequest); 736 logf("usb bad req %d",req->bRequest);
746 usb_drv_stall(EP_CONTROL,true,true); 737 usb_drv_stall(EP_CONTROL,true,true);
747 usb_core_ack_control(req);
748 } 738 }
749} 739}
750 740