diff options
| author | Diego Ismirlian <dismirlian (at) google's mail.com> | 2017-06-06 15:21:37 -0300 |
|---|---|---|
| committer | Diego Ismirlian <dismirlian (at) google's mail.com> | 2017-06-06 15:21:37 -0300 |
| commit | 50dda7cff22574816f415d5c5003240badcf3d32 (patch) | |
| tree | b41587ef38aba1b2962ab57d5079760fb908142a /os/hal/src/hal_usbh.c | |
| parent | a6898a525f645a8a24e1c73440f93e192ae028ed (diff) | |
| download | ChibiOS-Contrib-50dda7cff22574816f415d5c5003240badcf3d32.tar.gz ChibiOS-Contrib-50dda7cff22574816f415d5c5003240badcf3d32.tar.bz2 ChibiOS-Contrib-50dda7cff22574816f415d5c5003240badcf3d32.zip | |
Add UVC driver and test/example
Diffstat (limited to 'os/hal/src/hal_usbh.c')
| -rw-r--r-- | os/hal/src/hal_usbh.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c index 457abba..d242086 100644 --- a/os/hal/src/hal_usbh.c +++ b/os/hal/src/hal_usbh.c @@ -28,6 +28,7 @@ #include "usbh/dev/ftdi.h" #include "usbh/dev/msd.h" #include "usbh/dev/hid.h" +#include "usbh/dev/uvc.h" #if USBH_DEBUG_ENABLE_TRACE #define udbgf(f, ...) usbDbgPrintf(f, ##__VA_ARGS__) @@ -125,6 +126,9 @@ void usbhInit(void) { #if HAL_USBH_USE_HID usbhhidInit(); #endif +#if HAL_USBH_USE_UVC + usbhuvcInit(); +#endif #if HAL_USBH_USE_HUB usbhhubInit(); #endif @@ -421,7 +425,8 @@ usbh_urbstatus_t usbhControlRequestExtended(usbh_device_t *dev, uint32_t *actual_len, systime_t timeout) { - _check_dev(dev); + if (!dev) return USBH_URBSTATUS_DISCONNECTED; + osalDbgCheck(req != NULL); usbh_urb_t urb; @@ -1310,6 +1315,9 @@ static const usbh_classdriverinfo_t *usbh_classdrivers_lookup[] = { #if HAL_USBH_USE_HID &usbhhidClassDriverInfo, #endif +#if HAL_USBH_USE_UVC + &usbhuvcClassDriverInfo, +#endif #if HAL_USBH_USE_HUB &usbhhubClassDriverInfo, #endif @@ -1341,7 +1349,7 @@ static bool _classdriver_load(usbh_device_t *dev, uint8_t class, #if HAL_USBH_USE_IAD /* special case: */ if (info == &usbhiadClassDriverInfo) - return HAL_SUCCESS; + goto success; //return HAL_SUCCESS; #endif if (drv != NULL) |