diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-02 17:56:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 17:56:41 +0200 |
| commit | 472ee3ce3c8e4e1267cf00611aab54597dda7121 (patch) | |
| tree | 6d532237d92366fc10441e1770ddd74e7924b4a4 /os/hal/include/hal_usbh.h | |
| parent | 51910c3551c2a4232ba3defcef063e2f745f925a (diff) | |
| parent | 2cd41f99df0fc857afaef091ca3b984a728d0e3c (diff) | |
| download | ChibiOS-Contrib-472ee3ce3c8e4e1267cf00611aab54597dda7121.tar.gz ChibiOS-Contrib-472ee3ce3c8e4e1267cf00611aab54597dda7121.tar.bz2 ChibiOS-Contrib-472ee3ce3c8e4e1267cf00611aab54597dda7121.zip | |
Merge pull request #196 from dismirlian/master
USBH updates
Diffstat (limited to 'os/hal/include/hal_usbh.h')
| -rw-r--r-- | os/hal/include/hal_usbh.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h index 1ed6416..aa49205 100644 --- a/os/hal/include/hal_usbh.h +++ b/os/hal/include/hal_usbh.h @@ -1,6 +1,6 @@ /* ChibiOS - Copyright (C) 2006..2017 Giovanni Di Sirio - Copyright (C) 2015..2017 Diego Ismirlian, (dismirlian (at) google's mail) + Copyright (C) 2015..2019 Diego Ismirlian, (dismirlian(at)google's mail) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -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,11 +301,22 @@ extern "C" { } /* Synchronous API */ - usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep, + usbh_urbstatus_t usbhSynchronousTransfer(usbh_ep_t *ep, void *data, uint32_t len, uint32_t *actual_len, systime_t timeout); + + static inline usbh_urbstatus_t usbhBulkTransfer(usbh_ep_t *ep, + void *data, + 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 usbhControlRequest(usbh_device_t *dev, uint8_t bmRequestType, uint8_t bRequest, |