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

7 files changed, 6 insertions, 32 deletions

diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h
index b8c229a..f6e78e9 100644
--- a/os/hal/include/hal_usbh.h
+++ b/os/hal/include/hal_usbh.h
@@ -48,6 +48,10 @@
 #define HAL_USBH_USE_HID FALSE
 #endif
 
+#ifndef HAL_USBH_USE_ADDITIONAL_CLASS_DRIVERS
+#define HAL_USBH_USE_ADDITIONAL_CLASS_DRIVERS	FALSE
+#endif
+
 #define HAL_USBH_USE_IAD     HAL_USBH_USE_UVC
 
 #if (HAL_USE_USBH == TRUE) || defined(__DOXYGEN__)
@@ -402,8 +406,10 @@ extern "C" {
 
 typedef struct usbh_classdriver_vmt usbh_classdriver_vmt_t;
 struct usbh_classdriver_vmt {
+	void (*init)(void);
 	usbh_baseclassdriver_t *(*load)(usbh_device_t *dev,	const uint8_t *descriptor, uint16_t rem);
 	void (*unload)(usbh_baseclassdriver_t *drv);
+	/* TODO: add power control, suspend, etc */
 };
 
 struct usbh_classdriverinfo {
diff --git a/os/hal/include/usbh/dev/aoa.h b/os/hal/include/usbh/dev/aoa.h
index 636768a..a7f1c1b 100644
--- a/os/hal/include/usbh/dev/aoa.h
+++ b/os/hal/include/usbh/dev/aoa.h
@@ -140,12 +140,8 @@ extern USBHAOADriver USBHAOAD[HAL_USBHAOA_MAX_INSTANCES];
 extern "C" {
 #endif
 	/* AOA device driver */
-	void usbhaoaObjectInit(USBHAOADriver *aoap);
 	void usbhaoaChannelStart(USBHAOADriver *aoap);
 	void usbhaoaChannelStop(USBHAOADriver *aoap);
-
-	/* global initializer */
-	void usbhaoaInit(void);
 #ifdef __cplusplus
 }
 #endif
diff --git a/os/hal/include/usbh/dev/ftdi.h b/os/hal/include/usbh/dev/ftdi.h
index bfa3103..eedb056 100644
--- a/os/hal/include/usbh/dev/ftdi.h
+++ b/os/hal/include/usbh/dev/ftdi.h
@@ -138,16 +138,9 @@ extern USBHFTDIPortDriver FTDIPD[HAL_USBHFTDI_MAX_PORTS];
 #ifdef __cplusplus

 extern "C" {

 #endif

-	/* FTDI device driver */

-	void usbhftdiObjectInit(USBHFTDIDriver *ftdip);

-

 	/* FTDI port driver */

-	void usbhftdipObjectInit(USBHFTDIPortDriver *ftdipp);

 	void usbhftdipStart(USBHFTDIPortDriver *ftdipp, const USBHFTDIPortConfig *config);

 	void usbhftdipStop(USBHFTDIPortDriver *ftdipp);

-

-	/* global initializer */

-	void usbhftdiInit(void);

 #ifdef __cplusplus

 }

 #endif

diff --git a/os/hal/include/usbh/dev/hid.h b/os/hal/include/usbh/dev/hid.h
index 0d6b894..1dbc486 100644
--- a/os/hal/include/usbh/dev/hid.h
+++ b/os/hal/include/usbh/dev/hid.h
@@ -112,9 +112,6 @@ extern USBHHIDDriver USBHHIDD[HAL_USBHHID_MAX_INSTANCES];
 #ifdef __cplusplus
 extern "C" {
 #endif
-	/* HID Driver */
-	void usbhHIDObjectInit(USBHHIDDriver *hidp);
-
 	/* HID Common API */
 	usbh_urbstatus_t usbhhidGetReport(USBHHIDDriver *hidp,
 			uint8_t report_id, usbhhid_reporttype_t report_type,
@@ -136,9 +133,6 @@ extern "C" {
 	}
 
 	void usbhhidStart(USBHHIDDriver *hidp, const USBHHIDConfig *cfg);
-
-	/* global initializer */
-	void usbhhidInit(void);
 #ifdef __cplusplus
 }
 #endif
diff --git a/os/hal/include/usbh/dev/hub.h b/os/hal/include/usbh/dev/hub.h
index 924ebec..406fbaf 100644
--- a/os/hal/include/usbh/dev/hub.h
+++ b/os/hal/include/usbh/dev/hub.h
@@ -88,10 +88,6 @@ static inline usbh_urbstatus_t usbhhubSetFeaturePort(usbh_port_t *port, uint8_t
 				0);

 }

 

-void usbhhubObjectInit(USBHHubDriver *hubdp);

-

-void usbhhubInit(void);

-

 #else

 

 static inline usbh_urbstatus_t usbhhubControlRequest(USBHDriver *host,

diff --git a/os/hal/include/usbh/dev/msd.h b/os/hal/include/usbh/dev/msd.h
index 4eef6d6..f73836f 100644
--- a/os/hal/include/usbh/dev/msd.h
+++ b/os/hal/include/usbh/dev/msd.h
@@ -109,9 +109,6 @@ extern "C" {
 	bool usbhmsdLUNGetInfo(USBHMassStorageLUNDriver *lunp, BlockDeviceInfo *bdip);

 	bool usbhmsdLUNIsInserted(USBHMassStorageLUNDriver *lunp);

 	bool usbhmsdLUNIsProtected(USBHMassStorageLUNDriver *lunp);

-

-	/* global initializer */

-	void usbhmsdInit(void);

 #ifdef __cplusplus

 }

 #endif

diff --git a/os/hal/include/usbh/dev/uvc.h b/os/hal/include/usbh/dev/uvc.h
index c68a082..bc46a71 100644
--- a/os/hal/include/usbh/dev/uvc.h
+++ b/os/hal/include/usbh/dev/uvc.h
@@ -394,9 +394,6 @@ extern USBHUVCDriver USBHUVCD[HAL_USBHUVC_MAX_INSTANCES];
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-	void usbhuvcObjectInit(USBHUVCDriver *uvcd);
-
 	static inline usbhuvc_state_t usbhuvcGetState(USBHUVCDriver *uvcd) {
 		return uvcd->state;
 	}
@@ -457,11 +454,6 @@ extern "C" {
 	static inline void usbhuvcFreeStatusMessage(USBHUVCDriver *uvcdp, usbhuvc_message_status_t *msg) {
 		chPoolFree(&uvcdp->mp_status, msg);
 	}
-
-
-	/* global initializer */
-	void usbhuvcInit(void);
-
 #ifdef __cplusplus
 }
 #endif