Merge pull request #7215 from c1728p9/usb_stall_fix

Cruz Monrreal · web-flow · commit 4b8e340991a7 · 2018-06-18T10:05:55.000-05:00
Fix Kinetis bug causing USB to get stuck sending
diff --git a/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp b/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
@@ -411,11 +411,23 @@ void USBPhyHw::endpoint_remove(usb_ep_t endpoint)
 
 void USBPhyHw::endpoint_stall(usb_ep_t endpoint)
 {
-    USB0->ENDPOINT[DESC_TO_LOG(endpoint)].ENDPT |= USB_ENDPT_EPSTALL_MASK;
+    if (DESC_TO_LOG(endpoint) == 0) {
+        USB0->ENDPOINT[DESC_TO_LOG(endpoint)].ENDPT |= USB_ENDPT_EPSTALL_MASK;
+    } else {
+        uint8_t dir = DESC_EP_IN(endpoint) ? TX : RX;
+        uint32_t idx = EP_BDT_IDX(DESC_TO_LOG(endpoint), dir, 0);
+        bdt[idx].info |= BD_OWN_MASK | BD_STALL_MASK;
+    }
 }
 
 void USBPhyHw::endpoint_unstall(usb_ep_t endpoint)
 {
+
+    if (DESC_TO_LOG(endpoint) != 0) {
+        uint8_t dir = DESC_EP_IN(endpoint) ? TX : RX;
+        uint32_t idx = EP_BDT_IDX(DESC_TO_LOG(endpoint), dir, 0);
+        bdt[idx].info &= ~(BD_OWN_MASK | BD_STALL_MASK);
+    }
     USB0->ENDPOINT[DESC_TO_LOG(endpoint)].ENDPT &= ~USB_ENDPT_EPSTALL_MASK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -411,11 +411,23 @@ void USBPhyHw::endpoint_remove(usb_ep_t endpoint)`
`411`	`411`
`412`	`412`	`void USBPhyHw::endpoint_stall(usb_ep_t endpoint)`
`413`	`413`	`{`
`414`		`- USB0->ENDPOINT[DESC_TO_LOG(endpoint)].ENDPT \|= USB_ENDPT_EPSTALL_MASK;`
	`414`	`+ if (DESC_TO_LOG(endpoint) == 0) {`
	`415`	`+ USB0->ENDPOINT[DESC_TO_LOG(endpoint)].ENDPT \|= USB_ENDPT_EPSTALL_MASK;`
	`416`	`+ } else {`
	`417`	`+ uint8_t dir = DESC_EP_IN(endpoint) ? TX : RX;`
	`418`	`+ uint32_t idx = EP_BDT_IDX(DESC_TO_LOG(endpoint), dir, 0);`
	`419`	`+ bdt[idx].info \|= BD_OWN_MASK \| BD_STALL_MASK;`
	`420`	`+ }`
`415`	`421`	`}`
`416`	`422`
`417`	`423`	`void USBPhyHw::endpoint_unstall(usb_ep_t endpoint)`
`418`	`424`	`{`
	`425`	`+`
	`426`	`+ if (DESC_TO_LOG(endpoint) != 0) {`
	`427`	`+ uint8_t dir = DESC_EP_IN(endpoint) ? TX : RX;`
	`428`	`+ uint32_t idx = EP_BDT_IDX(DESC_TO_LOG(endpoint), dir, 0);`
	`429`	`+ bdt[idx].info &= ~(BD_OWN_MASK \| BD_STALL_MASK);`
	`430`	`+ }`
`419`	`431`	`USB0->ENDPOINT[DESC_TO_LOG(endpoint)].ENDPT &= ~USB_ENDPT_EPSTALL_MASK;`
`420`	`432`	`}`
`421`	`433`