USBH: Added mechanism for out-of-tree class driver enumeration

6 files changed, 60 insertions, 48 deletions

diff --git a/os/hal/src/usbh/hal_usbh_aoa.c b/os/hal/src/usbh/hal_usbh_aoa.c
index 1fa49f8..db348c0 100644
--- a/os/hal/src/usbh/hal_usbh_aoa.c
+++ b/os/hal/src/usbh/hal_usbh_aoa.c
@@ -124,8 +124,10 @@ USBHAOADriver USBHAOAD[HAL_USBHAOA_MAX_INSTANCES];
 
 static usbh_baseclassdriver_t *_aoa_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem);
 static void _aoa_unload(usbh_baseclassdriver_t *drv);
+static void _aoa_init(void);
 
 static const usbh_classdriver_vmt_t class_driver_vmt = {
+	_aoa_init,
 	_aoa_load,
 	_aoa_unload
 };
@@ -658,7 +660,7 @@ static bool _send_string(usbh_device_t *dev, uint8_t index, const char *string)
 	return HAL_SUCCESS;
 }
 
-void usbhaoaObjectInit(USBHAOADriver *aoap) {
+static void _object_init(USBHAOADriver *aoap) {
 	osalDbgCheck(aoap != NULL);
 	memset(aoap, 0, sizeof(*aoap));
 	aoap->info = &usbhaoaClassDriverInfo;
@@ -668,10 +670,10 @@ void usbhaoaObjectInit(USBHAOADriver *aoap) {
 	aoap->channel.state = USBHAOA_CHANNEL_STATE_STOP;
 }
 
-void usbhaoaInit(void) {
+static void _aoa_init(void) {
 	uint8_t i;
 	for (i = 0; i < HAL_USBHAOA_MAX_INSTANCES; i++) {
-		usbhaoaObjectInit(&USBHAOAD[i]);
+		_object_init(&USBHAOAD[i]);
 	}
 }
 
diff --git a/os/hal/src/usbh/hal_usbh_ftdi.c b/os/hal/src/usbh/hal_usbh_ftdi.c
index ce96958..9822969 100644
--- a/os/hal/src/usbh/hal_usbh_ftdi.c
+++ b/os/hal/src/usbh/hal_usbh_ftdi.c
@@ -62,16 +62,19 @@
 #define uerr(f, ...)   do {} while(0)
 #endif
 
+static void _ftdip_object_init(USBHFTDIPortDriver *ftdipp);
 
 /*===========================================================================*/
 /* USB Class driver loader for FTDI								 		 	 */
 /*===========================================================================*/
 USBHFTDIDriver USBHFTDID[HAL_USBHFTDI_MAX_INSTANCES];
 
+static void _ftdi_init(void);
 static usbh_baseclassdriver_t *_ftdi_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem);
 static void _ftdi_unload(usbh_baseclassdriver_t *drv);
 
 static const usbh_classdriver_vmt_t class_driver_vmt = {
+	_ftdi_init,
 	_ftdi_load,
 	_ftdi_unload
 };
@@ -229,7 +232,7 @@ static void _ftdi_unload(usbh_baseclassdriver_t *drv) {
 	osalSysLock();
 	while (ftdipp) {
 		USBHFTDIPortDriver *next = ftdipp->next;
-		usbhftdipObjectInit(ftdipp);
+		_ftdip_object_init(ftdipp);
 		ftdipp = next;
 	}
 	osalSysUnlock();
@@ -700,27 +703,27 @@ void usbhftdipStart(USBHFTDIPortDriver *ftdipp, const USBHFTDIPortConfig *config
 	osalMutexUnlock(&ftdipp->ftdip->mtx);
 }
 
-void usbhftdiObjectInit(USBHFTDIDriver *ftdip) {
+static void _ftdi_object_init(USBHFTDIDriver *ftdip) {
 	osalDbgCheck(ftdip != NULL);
 	memset(ftdip, 0, sizeof(*ftdip));
 	ftdip->info = &usbhftdiClassDriverInfo;
 	osalMutexObjectInit(&ftdip->mtx);
 }
 
-void usbhftdipObjectInit(USBHFTDIPortDriver *ftdipp) {
+static void _ftdip_object_init(USBHFTDIPortDriver *ftdipp) {
 	osalDbgCheck(ftdipp != NULL);
 	memset(ftdipp, 0, sizeof(*ftdipp));
 	ftdipp->vmt = &async_channel_vmt;
 	ftdipp->state = USBHFTDIP_STATE_STOP;
 }
 
-void usbhftdiInit(void) {
+static void _ftdi_init(void) {
 	uint8_t i;
 	for (i = 0; i < HAL_USBHFTDI_MAX_INSTANCES; i++) {
-		usbhftdiObjectInit(&USBHFTDID[i]);
+		_ftdi_object_init(&USBHFTDID[i]);
 	}
 	for (i = 0; i < HAL_USBHFTDI_MAX_PORTS; i++) {
-		usbhftdipObjectInit(&FTDIPD[i]);
+		_ftdip_object_init(&FTDIPD[i]);
 	}
 }
 
diff --git a/os/hal/src/usbh/hal_usbh_hid.c b/os/hal/src/usbh/hal_usbh_hid.c
index e98dff7..4b20fd3 100644
--- a/os/hal/src/usbh/hal_usbh_hid.c
+++ b/os/hal/src/usbh/hal_usbh_hid.c
@@ -74,10 +74,12 @@
 
 USBHHIDDriver USBHHIDD[HAL_USBHHID_MAX_INSTANCES];
 
+static void _hid_init(void);
 static usbh_baseclassdriver_t *_hid_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem);
 static void _hid_unload(usbh_baseclassdriver_t *drv);
 
 static const usbh_classdriver_vmt_t class_driver_vmt = {
+	_hid_init,
 	_hid_load,
 	_hid_unload
 };
@@ -305,17 +307,17 @@ usbh_urbstatus_t usbhhidSetProtocol(USBHHIDDriver *hidp, uint8_t protocol) {
 			protocol, hidp->ifnum, 0, NULL);
 }
 
-void usbhhidObjectInit(USBHHIDDriver *hidp) {
+static void _hid_object_init(USBHHIDDriver *hidp) {
 	osalDbgCheck(hidp != NULL);
 	memset(hidp, 0, sizeof(*hidp));
 	hidp->info = &usbhhidClassDriverInfo;
 	hidp->state = USBHHID_STATE_STOP;
 }
 
-void usbhhidInit(void) {
+static void _hid_init(void) {
 	uint8_t i;
 	for (i = 0; i < HAL_USBHHID_MAX_INSTANCES; i++) {
-		usbhhidObjectInit(&USBHHIDD[i]);
+		_hid_object_init(&USBHHIDD[i]);
 	}
 }
 
diff --git a/os/hal/src/usbh/hal_usbh_hub.c b/os/hal/src/usbh/hal_usbh_hub.c
index 3a84175..c9bbe9b 100644
--- a/os/hal/src/usbh/hal_usbh_hub.c
+++ b/os/hal/src/usbh/hal_usbh_hub.c
@@ -63,12 +63,15 @@
 USBHHubDriver USBHHUBD[HAL_USBHHUB_MAX_INSTANCES];
 static usbh_port_t USBHPorts[HAL_USBHHUB_MAX_PORTS];
 
-static usbh_baseclassdriver_t *hub_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem);
-static void hub_unload(usbh_baseclassdriver_t *drv);
+static void _hub_init(void);
+static usbh_baseclassdriver_t *_hub_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem);
+static void _hub_unload(usbh_baseclassdriver_t *drv);
 static const usbh_classdriver_vmt_t usbhhubClassDriverVMT = {
-	hub_load,
-	hub_unload
+	_hub_init,
+	_hub_load,
+	_hub_unload
 };
+
 const usbh_classdriverinfo_t usbhhubClassDriverInfo = {
 	0x09, 0x00, -1, "HUB", &usbhhubClassDriverVMT
 };
@@ -137,7 +140,7 @@ static void _urb_complete(usbh_urb_t *urb) {
 	usbhURBSubmitI(urb);
 }
 
-static usbh_baseclassdriver_t *hub_load(usbh_device_t *dev,
+static usbh_baseclassdriver_t *_hub_load(usbh_device_t *dev,
 		const uint8_t *descriptor, uint16_t rem) {
 	int i;
 
@@ -261,7 +264,7 @@ alloc_ok:
 	return (usbh_baseclassdriver_t *)hubdp;
 }
 
-static void hub_unload(usbh_baseclassdriver_t *drv) {
+static void _hub_unload(usbh_baseclassdriver_t *drv) {
 	osalDbgCheck(drv != NULL);
 	USBHHubDriver *const hubdp = (USBHHubDriver *)drv;
 
@@ -283,16 +286,16 @@ static void hub_unload(usbh_baseclassdriver_t *drv) {
 
 }
 
-void usbhhubObjectInit(USBHHubDriver *hubdp) {
+static void _object_init(USBHHubDriver *hubdp) {
 	osalDbgCheck(hubdp != NULL);
 	memset(hubdp, 0, sizeof(*hubdp));
 	hubdp->info = &usbhhubClassDriverInfo;
 }
 
-void usbhhubInit(void) {
+static void _hub_init(void) {
 	uint8_t i;
 	for (i = 0; i < HAL_USBHHUB_MAX_INSTANCES; i++) {
-		usbhhubObjectInit(&USBHHUBD[i]);
+		_object_init(&USBHHUBD[i]);
 	}
 }
 
diff --git a/os/hal/src/usbh/hal_usbh_msd.c b/os/hal/src/usbh/hal_usbh_msd.c
index 061c754..f2a4e39 100644
--- a/os/hal/src/usbh/hal_usbh_msd.c
+++ b/os/hal/src/usbh/hal_usbh_msd.c
@@ -62,7 +62,7 @@
 #define uerr(f, ...)   do {} while(0)
 #endif
 
-static void usbhmsdLUNObjectDeinit(USBHMassStorageLUNDriver *lunp);
+static void _lun_object_deinit(USBHMassStorageLUNDriver *lunp);
 
 /*===========================================================================*/
 /* USB Class driver loader for MSD                                           */
@@ -70,10 +70,12 @@ static void usbhmsdLUNObjectDeinit(USBHMassStorageLUNDriver *lunp);
 
 USBHMassStorageDriver USBHMSD[HAL_USBHMSD_MAX_INSTANCES];
 
+static void _msd_init(void);
 static usbh_baseclassdriver_t *_msd_load(usbh_device_t *dev, const uint8_t *descriptor, uint16_t rem);
 static void _msd_unload(usbh_baseclassdriver_t *drv);
 
 static const usbh_classdriver_vmt_t class_driver_vmt = {
+	_msd_init,
 	_msd_load,
 	_msd_unload
 };
@@ -205,7 +207,7 @@ static void _msd_unload(usbh_baseclassdriver_t *drv) {
 	/* disconnect all LUNs */
 	while (lunp) {
 		usbhmsdLUNDisconnect(lunp);
-		usbhmsdLUNObjectDeinit(lunp);
+		_lun_object_deinit(lunp);
 		lunp = lunp->next;
 	}
 
@@ -682,7 +684,7 @@ static const struct USBHMassStorageDriverVMT blk_vmt = {
 	(bool (*)(void *, BlockDeviceInfo *))usbhmsdLUNGetInfo
 };
 
-static void usbhmsdLUNObjectDeinit(USBHMassStorageLUNDriver *lunp) {
+static void _lun_object_deinit(USBHMassStorageLUNDriver *lunp) {
 	osalDbgCheck(lunp != NULL);
 	osalMutexLock(&lunp->mtx);
 	lunp->msdp = NULL;
@@ -692,7 +694,7 @@ static void usbhmsdLUNObjectDeinit(USBHMassStorageLUNDriver *lunp) {
 	osalMutexUnlock(&lunp->mtx);
 }
 
-static void usbhmsdLUNObjectInit(USBHMassStorageLUNDriver *lunp) {
+static void _lun_object_init(USBHMassStorageLUNDriver *lunp) {
 	osalDbgCheck(lunp != NULL);
 	memset(lunp, 0, sizeof(*lunp));
 	lunp->vmt = &blk_vmt;
@@ -954,19 +956,19 @@ bool usbhmsdLUNIsProtected(USBHMassStorageLUNDriver *lunp) {
 	return FALSE;
 }
 
-static void usbhmsdObjectInit(USBHMassStorageDriver *msdp) {
+static void _msd_object_init(USBHMassStorageDriver *msdp) {
 	osalDbgCheck(msdp != NULL);
 	memset(msdp, 0, sizeof(*msdp));
 	msdp->info = &usbhmsdClassDriverInfo;
 }
 
-void usbhmsdInit(void) {
+static void _msd_init(void) {
 	uint8_t i;
 	for (i = 0; i < HAL_USBHMSD_MAX_INSTANCES; i++) {
-		usbhmsdObjectInit(&USBHMSD[i]);
+		_msd_object_init(&USBHMSD[i]);
 	}
 	for (i = 0; i < HAL_USBHMSD_MAX_LUNS; i++) {
-		usbhmsdLUNObjectInit(&MSBLKD[i]);
+		_lun_object_init(&MSBLKD[i]);
 	}
 }
 #endif
diff --git a/os/hal/src/usbh/hal_usbh_uvc.c b/os/hal/src/usbh/hal_usbh_uvc.c
index b0507a0..ac3663e 100644
--- a/os/hal/src/usbh/hal_usbh_uvc.c
+++ b/os/hal/src/usbh/hal_usbh_uvc.c
@@ -66,14 +66,15 @@
 
 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
@@ -512,17 +513,7 @@ 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;
@@ -710,7 +701,7 @@ alloc_ok:
 	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 +718,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]);
 	}
 }