rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #169 from apmorton/usbh-fixes 

STM32 USBH LLD Fixes
This commit is contained in:
Fabien Poussin 2018-10-02 20:51:08 +02:00 committed by GitHub
parent 4344e6d179 40769f9bd3
commit a0e2c3a785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
View File

@ -594,9 +594,10 @@ void usbh_lld_ep_open(usbh_ep_t *ep) {
} }
void usbh_lld_ep_close(usbh_ep_t *ep) { void usbh_lld_ep_close(usbh_ep_t *ep) {
usbh_urb_t *urb, *tmp; usbh_urb_t *urb;
uinfof("\t%s: Closing EP...", ep->name); uinfof("\t%s: Closing EP...", ep->name);
list_for_each_entry_safe(urb, usbh_urb_t, tmp, &ep->urb_list, node) { while (!list_empty(&ep->urb_list)) {
urb = list_first_entry(&ep->urb_list, usbh_urb_t, node);
uinfof("\t%s: Abort URB, USBH_URBSTATUS_DISCONNECTED", ep->name); uinfof("\t%s: Abort URB, USBH_URBSTATUS_DISCONNECTED", ep->name);
_usbh_urb_abort_and_waitS(urb, USBH_URBSTATUS_DISCONNECTED); _usbh_urb_abort_and_waitS(urb, USBH_URBSTATUS_DISCONNECTED);
} }
@ -987,7 +988,7 @@ static inline void _hcint_int(USBHDriver *host) {
haint = host->otg->HAINT; haint = host->otg->HAINT;
haint &= host->otg->HAINTMSK; haint &= host->otg->HAINTMSK;
#if USBH_LLD_DEBUG_ENABLE_ERRORS #if USBH_DEBUG_ENABLE && USBH_LLD_DEBUG_ENABLE_ERRORS
if (!haint) { if (!haint) {
uint32_t a, b; uint32_t a, b;
a = host->otg->HAINT; a = host->otg->HAINT;
@ -1172,9 +1173,17 @@ static inline void _nptxfe_int(USBHDriver *host) {
} }
static inline void _ptxfe_int(USBHDriver *host) { static inline void _ptxfe_int(USBHDriver *host) {
//TODO: implement uint32_t rem;
(void)host; stm32_otg_t *const otg = host->otg;
uinfo("PTXFE");
rem = _write_packet(&host->ep_active_lists[USBH_EPTYPE_ISO],
otg->HPTXSTS & HPTXSTS_PTXFSAVL_MASK);
rem += _write_packet(&host->ep_active_lists[USBH_EPTYPE_INT],
otg->HPTXSTS & HPTXSTS_PTXFSAVL_MASK);
if (!rem)
otg->GINTMSK &= ~GINTMSK_PTXFEM;
} }
static void _disable(USBHDriver *host) { static void _disable(USBHDriver *host) {
@ -1319,7 +1328,7 @@ static void usb_lld_serve_interrupt(USBHDriver *host) {
gintsts &= otg->GINTMSK; gintsts &= otg->GINTMSK;
if (!gintsts) { if (!gintsts) {
#if USBH_DEBUG_ENABLE_WARNINGS #if USBH_DEBUG_ENABLE && USBH_DEBUG_ENABLE_WARNINGS
uint32_t a, b; uint32_t a, b;
a = otg->GINTSTS; a = otg->GINTSTS;
b = otg->GINTMSK; b = otg->GINTMSK;