1 files changed, 26 insertions, 27 deletions

diff --git a/os/hal/src/usbh/hal_usbh_uvc.c b/os/hal/src/usbh/hal_usbh_uvc.c
index b0507a0..a795cd8 100644
--- a/os/hal/src/usbh/hal_usbh_uvc.c
+++ b/os/hal/src/usbh/hal_usbh_uvc.c
@@ -27,9 +27,9 @@
 #error "USBHUVC needs HAL_USBH_USE_IAD"
 #endif
 
+#include <string.h>
 #include "usbh/dev/uvc.h"
 #include "usbh/internal.h"
-#include <string.h>
 
 #if USBHUVC_DEBUG_ENABLE_TRACE
 #define udbgf(f, ...)  usbDbgPrintf(f, ##__VA_ARGS__)
@@ -66,17 +66,18 @@
 
 USBHUVCDriver USBHUVCD[HAL_USBHUVC_MAX_INSTANCES];
 
-
-static usbh_baseclassdriver_t *uvc_load(usbh_device_t *dev,
+static void _uvc_init(void);
+static usbh_baseclassdriver_t *_uvc_load(usbh_device_t *dev,
 		const uint8_t *descriptor, uint16_t rem);
-static void uvc_unload(usbh_baseclassdriver_t *drv);
+static void _uvc_unload(usbh_baseclassdriver_t *drv);
 
 static const usbh_classdriver_vmt_t class_driver_vmt = {
-	uvc_load,
-	uvc_unload
+	_uvc_init,
+	_uvc_load,
+	_uvc_unload
 };
 const usbh_classdriverinfo_t usbhuvcClassDriverInfo = {
-	0x0e, 0x03, 0x00, "UVC", &class_driver_vmt
+	"UVC", &class_driver_vmt
 };
 
 static bool _request(USBHUVCDriver *uvcdp,
@@ -360,10 +361,8 @@ bool usbhuvcStreamStart(USBHUVCDriver *uvcdp, uint16_t min_ep_sz) {
 		osalDbgCheck(msg);
 		usbhURBObjectInit(&uvcdp->urb_iso, &uvcdp->ep_iso, _cb_iso, uvcdp, msg->data, uvcdp->ep_iso.wMaxPacketSize);
 	}
-	osalSysLock();
-	usbhURBSubmitI(&uvcdp->urb_iso);
-	osalOsRescheduleS();
-	osalSysUnlock();
+
+	usbhURBSubmit(&uvcdp->urb_iso);
 
 	ret = HAL_SUCCESS;
 	goto exit;
@@ -512,22 +511,13 @@ uint32_t usbhuvcEstimateRequiredEPSize(USBHUVCDriver *uvcdp, const uint8_t *form
 	return (sz * mul) / div + 12;
 }
 
-void usbhuvcObjectInit(USBHUVCDriver *uvcdp) {
-	osalDbgCheck(uvcdp != NULL);
-	memset(uvcdp, 0, sizeof(*uvcdp));
-	uvcdp->info = &usbhuvcClassDriverInfo;
-	chMBObjectInit(&uvcdp->mb, uvcdp->mb_buff, HAL_USBHUVC_MAX_MAILBOX_SZ);
-	chMtxObjectInit(&uvcdp->mtx);
-	uvcdp->state = USBHUVC_STATE_STOP;
-}
-
-
-static usbh_baseclassdriver_t *uvc_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem) {
+static usbh_baseclassdriver_t *_uvc_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem) {
 
 	USBHUVCDriver *uvcdp;
 	uint8_t i;
 
-	if (descriptor[1] != USBH_DT_INTERFACE_ASSOCIATION)
+	if (_usbh_match_descriptor(descriptor, rem, USBH_DT_INTERFACE_ASSOCIATION,
+			0x0e, 0x03, 0x00) != HAL_SUCCESS)
 		return NULL;
 
 	/* alloc driver */
@@ -703,14 +693,14 @@ alloc_ok:
 	osalSysLock();
 	usbhURBSubmitI(&uvcdp->urb_int);
 	uvcdp->state = USBHUVC_STATE_ACTIVE;
-	osalOsRescheduleS();
+	osalOsRescheduleS();	/* because of usbhURBSubmitI */
 	osalSysUnlock();
 
 	dev->keepFullCfgDesc++;
 	return (usbh_baseclassdriver_t *)uvcdp;
 }
 
-static void uvc_unload(usbh_baseclassdriver_t *drv) {
+static void _uvc_unload(usbh_baseclassdriver_t *drv) {
 	USBHUVCDriver *const uvcdp = (USBHUVCDriver *)drv;
 
 	usbhuvcStreamStop(uvcdp);
@@ -727,10 +717,19 @@ static void uvc_unload(usbh_baseclassdriver_t *drv) {
 	osalSysUnlock();
 }
 
-void usbhuvcInit(void) {
+static void _object_init(USBHUVCDriver *uvcdp) {
+	osalDbgCheck(uvcdp != NULL);
+	memset(uvcdp, 0, sizeof(*uvcdp));
+	uvcdp->info = &usbhuvcClassDriverInfo;
+	chMBObjectInit(&uvcdp->mb, uvcdp->mb_buff, HAL_USBHUVC_MAX_MAILBOX_SZ);
+	chMtxObjectInit(&uvcdp->mtx);
+	uvcdp->state = USBHUVC_STATE_STOP;
+}
+
+static void _uvc_init(void) {
 	uint8_t i;
 	for (i = 0; i < HAL_USBHUVC_MAX_INSTANCES; i++) {
-		usbhuvcObjectInit(&USBHUVCD[i]);
+		_object_init(&USBHUVCD[i]);
 	}
 }