diff options
| author | dismirlian <dismirlian@gmail.com> | 2017-09-16 11:28:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 11:28:09 -0300 |
| commit | 5cea7f11ecadf4c530a2f722eb62ae6d1b5a1506 (patch) | |
| tree | 9e088e13f4ed3d5fbdde5f3170848403e3c2e10a | |
| parent | c0205baf7d49b76e512dbae2537c062ac8efefc1 (diff) | |
| parent | 741459ac27f9efb158ff28860c5d8e9affb87b68 (diff) | |
| download | ChibiOS-Contrib-5cea7f11ecadf4c530a2f722eb62ae6d1b5a1506.tar.gz ChibiOS-Contrib-5cea7f11ecadf4c530a2f722eb62ae6d1b5a1506.tar.bz2 ChibiOS-Contrib-5cea7f11ecadf4c530a2f722eb62ae6d1b5a1506.zip | |
Merge pull request #1 from axoloti/patch-1
USBH: allow enabling IAD without UVC
USBH: implement ISO/INT out in STM32 LLD driver
USBH: introduce usbhSynchronousTransfer helper function
| -rw-r--r-- | os/hal/include/hal_usbh.h | 8 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c | 14 | ||||
| -rw-r--r-- | os/hal/src/hal_usbh.c | 11 |
3 files changed, 29 insertions, 4 deletions
diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h index 1ed6416..6a6be21 100644 --- a/os/hal/include/hal_usbh.h +++ b/os/hal/include/hal_usbh.h @@ -52,7 +52,9 @@ #define HAL_USBH_USE_ADDITIONAL_CLASS_DRIVERS FALSE #endif +#ifndef HAL_USBH_USE_IAD #define HAL_USBH_USE_IAD HAL_USBH_USE_UVC +#endif #if (HAL_USE_USBH == TRUE) || defined(__DOXYGEN__) @@ -299,6 +301,12 @@ extern "C" { } /* Synchronous API */ + usbh_urbstatus_t usbhSynchronousTransfer(usbh_ep_t *ep, + void *data, + uint32_t len, + uint32_t *actual_len, + systime_t timeout); + usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep, void *data, uint32_t len, diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c index 4723508..0403eae 100644 --- a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c +++ b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c @@ -1172,9 +1172,17 @@ static inline void _nptxfe_int(USBHDriver *host) { } static inline void _ptxfe_int(USBHDriver *host) { - //TODO: implement - (void)host; - uinfo("PTXFE"); + uint32_t rem; + stm32_otg_t *const otg = host->otg; + + 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) { diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index 7dff98a..3949c68 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -335,10 +335,19 @@ usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep, uint32_t len, uint32_t *actual_len, systime_t timeout) { + osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep"); + + return usbhSynchronousTransfer(ep,data,len,actual_len,timeout); +} + +usbh_urbstatus_t usbhSynchronousTransfer(usbh_ep_t *ep, + void *data, + uint32_t len, + uint32_t *actual_len, + systime_t timeout) { osalDbgCheck(ep != NULL); osalDbgCheck((data != NULL) || (len == 0)); - osalDbgAssert(ep->type == USBH_EPTYPE_BULK, "wrong ep"); usbh_urb_t urb; usbhURBObjectInit(&urb, ep, 0, 0, data, len); |