use forward declaration for usbh_dev_driver_t

Signed-off-by: Amir Hammad <amir.hammad@hotmail.com>

9 files changed, 93 insertions, 90 deletions

diff --git a/include/driver/usbh_device_driver.h b/include/driver/usbh_device_driver.h
index 03bbd3a..20ece5d 100644
--- a/include/driver/usbh_device_driver.h
+++ b/include/driver/usbh_device_driver.h
@@ -110,6 +110,10 @@ struct _usbh_control {
 };
 typedef struct _usbh_control usbh_control_t;
 
+
+//forward declare usbh_dev_driver_t
+typedef struct _usbh_dev_driver usbh_dev_driver_t;
+
 /**
  * @brief The _usbh_device struct
  *
@@ -243,6 +247,66 @@ struct _usbh_generic_data {
 typedef struct _usbh_generic_data usbh_generic_data_t;
 
 
+/// set to -1 for unused items ("don't care" functionality) @see find_driver()
+struct _usbh_dev_driver_info {
+	int32_t deviceClass;
+	int32_t deviceSubClass;
+	int32_t deviceProtocol;
+	int32_t idVendor;
+	int32_t idProduct;
+	int32_t ifaceClass;
+	int32_t ifaceSubClass;
+	int32_t ifaceProtocol;
+};
+typedef struct _usbh_dev_driver_info usbh_dev_driver_info_t;
+
+struct _usbh_dev_driver {
+	/**
+	 * @brief init is initialization routine of the device driver
+	 *
+	 * This function is called during the initialization of the device driver
+	 */
+	void *(*init)(usbh_device_t *usbh_dev);
+
+	/**
+	 * @brief analyze descriptor
+	 * @param[in/out] drvdata is the device driver's private data
+	 * @param[in] descriptor is the pointer to the descriptor that should
+	 *		be parsed in order to prepare driver to be loaded
+	 *
+	 * @retval true when the enumeration is complete and the driver is ready to be used
+	 * @retval false when the device driver is not ready to be used
+	 *
+	 * This should be used for getting correct endpoint numbers, getting maximum sizes of endpoints.
+	 * Should return true, when no more data is needed.
+	 *
+	 */
+	bool (*analyze_descriptor)(void *drvdata, void *descriptor);
+
+	/**
+	 * @brief poll method is called periodically by the library core
+	 * @param[in/out] drvdata is the device driver's private data
+	 * @param[in] time_curr_us current timestamp in microseconds
+	 * @see usbh_poll()
+	 */
+	void (*poll)(void *drvdata, uint32_t time_curr_us);
+
+	/**
+	 * @brief unloads the device driver
+	 * @param[in/out] drvdata is the device driver's private data
+	 *
+	 * This should free any data associated with this device
+	 */
+	void (*remove)(void *drvdata);
+
+	/**
+	 * @brief info - compatibility information about the driver. It is used by the core during device enumeration
+	 * @see find_driver()
+	 */
+	const usbh_dev_driver_info_t * const info;
+};
+typedef struct _usbh_dev_driver usbh_dev_driver_t;
+
 #define ERROR(arg) LOG_PRINTF("UNHANDLED_ERROR %d: file: %s, line: %d",\
 							arg, __FILE__, __LINE__)
 
diff --git a/include/usbh_core.h b/include/usbh_core.h
index 2a36809..308d53b 100644
--- a/include/usbh_core.h
+++ b/include/usbh_core.h
@@ -40,64 +40,6 @@
 

 BEGIN_DECLS

 

-/// set to -1 for unused items ("don't care" functionality) @see find_driver()

-struct _usbh_dev_driver_info {

-	int32_t deviceClass;

-	int32_t deviceSubClass;

-	int32_t deviceProtocol;

-	int32_t idVendor;

-	int32_t idProduct;

-	int32_t ifaceClass;

-	int32_t ifaceSubClass;

-	int32_t ifaceProtocol;

-};

-typedef struct _usbh_dev_driver_info usbh_dev_driver_info_t;

-

-struct _usbh_dev_driver {

-	/**

-	 * @brief init is initialization routine of the device driver

-	 *

-	 * This function is called during the initialization of the device driver

-	 */

-	void *(*init)(void *usbh_dev);

-

-	/**

-	 * @brief analyze descriptor

-	 * @param[in/out] drvdata is the device driver's private data

-	 * @param[in] descriptor is the pointer to the descriptor that should

-	 *		be parsed in order to prepare driver to be loaded

-	 *

-	 * @retval true when the enumeration is complete and the driver is ready to be used

-	 * @retval false when the device driver is not ready to be used

-	 *

-	 * This should be used for getting correct endpoint numbers, getting maximum sizes of endpoints.

-	 * Should return true, when no more data is needed.

-	 *

-	 */

-	bool (*analyze_descriptor)(void *drvdata, void *descriptor);

-

-	/**

-	 * @brief poll method is called periodically by the library core

-	 * @param[in/out] drvdata is the device driver's private data

-	 * @param[in] time_curr_us current timestamp in microseconds

-	 * @see usbh_poll()

-	 */

-	void (*poll)(void *drvdata, uint32_t time_curr_us);

-

-	/**

-	 * @brief unloads the device driver

-	 * @param[in/out] drvdata is the device driver's private data

-	 *

-	 * This should free any data associated with this device

-	 */

-	void (*remove)(void *drvdata);

-

-	/**

-	 * @brief info - compatibility information about the driver. It is used by the core during device enumeration

-	 * @see find_driver()

-	 */

-	const usbh_dev_driver_info_t * const info;

-};

 typedef struct _usbh_dev_driver usbh_dev_driver_t;

 

 /**

diff --git a/include/usbh_driver_gp_xbox.h b/include/usbh_driver_gp_xbox.h
index d648b90..5d2dc2a 100644
--- a/include/usbh_driver_gp_xbox.h
+++ b/include/usbh_driver_gp_xbox.h
@@ -71,6 +71,7 @@ typedef struct _gp_xbox_config gp_xbox_config_t;
  */
 void gp_xbox_driver_init(const gp_xbox_config_t *config);
 
+typedef struct _usbh_dev_driver usbh_dev_driver_t;
 extern const usbh_dev_driver_t usbh_gp_xbox_driver;
 
 END_DECLS
diff --git a/include/usbh_driver_hid.h b/include/usbh_driver_hid.h
index 8155d82..89f950a 100644
--- a/include/usbh_driver_hid.h
+++ b/include/usbh_driver_hid.h
@@ -78,6 +78,7 @@ enum HID_TYPE hid_get_type(uint8_t device_id);
  */
 bool hid_is_connected(uint8_t device_id);
 
+typedef struct _usbh_dev_driver usbh_dev_driver_t;
 extern const usbh_dev_driver_t usbh_hid_driver;
 
 END_DECLS
diff --git a/include/usbh_driver_hub.h b/include/usbh_driver_hub.h
index 1066074..dedcc58 100644
--- a/include/usbh_driver_hub.h
+++ b/include/usbh_driver_hub.h
@@ -32,6 +32,7 @@ BEGIN_DECLS
  */

 void hub_driver_init(void);

 

+typedef struct _usbh_dev_driver usbh_dev_driver_t;

 extern const usbh_dev_driver_t usbh_hub_driver;

 

 END_DECLS

diff --git a/src/usbh_driver_ac_midi.c b/src/usbh_driver_ac_midi.c
index 9d139d5..50ef963 100644
--- a/src/usbh_driver_ac_midi.c
+++ b/src/usbh_driver_ac_midi.c
@@ -30,35 +30,10 @@
 #include <libopencm3/usb/audio.h>
 #include <libopencm3/usb/usbstd.h>
 
-
-static void *init(void *usbh_dev);
-static bool analyze_descriptor(void *drvdata, void *descriptor);
-static void poll(void *drvdata, uint32_t tflp);
-static void remove(void *drvdata);
-
 static midi_device_t midi_device[USBH_AC_MIDI_MAX_DEVICES];
 static const midi_config_t *midi_config = NULL;
 static bool initialized = false;
 
-static const usbh_dev_driver_info_t usbh_midi_driver_info = {
-	.deviceClass = -1,
-	.deviceSubClass = -1,
-	.deviceProtocol = -1,
-	.idVendor = -1,
-	.idProduct = -1,
-	.ifaceClass = 0x01,
-	.ifaceSubClass = 0x03,
-	.ifaceProtocol = -1,
-};
-
-const usbh_dev_driver_t usbh_midi_driver = {
-	.init = init,
-	.analyze_descriptor = analyze_descriptor,
-	.poll = poll,
-	.remove = remove,
-	.info = &usbh_midi_driver_info
-};
-
 void midi_driver_init(const midi_config_t *config)
 {
 	uint32_t i;
@@ -72,7 +47,7 @@ void midi_driver_init(const midi_config_t *config)
  *
  *
  */
-static void *init(void *usbh_dev)
+static void *init(usbh_device_t *usbh_dev)
 {
 	if (!midi_config || !initialized) {
 		LOG_PRINTF("\n%s/%d : driver not initialized\n", __FILE__, __LINE__);
@@ -367,3 +342,22 @@ static void remove(void *drvdata)
 	midi->endpoint_in_address = 0;
 	midi->endpoint_out_address = 0;
 }
+
+static const usbh_dev_driver_info_t usbh_midi_driver_info = {
+	.deviceClass = -1,
+	.deviceSubClass = -1,
+	.deviceProtocol = -1,
+	.idVendor = -1,
+	.idProduct = -1,
+	.ifaceClass = 0x01,
+	.ifaceSubClass = 0x03,
+	.ifaceProtocol = -1,
+};
+
+const usbh_dev_driver_t usbh_midi_driver = {
+	.init = init,
+	.analyze_descriptor = analyze_descriptor,
+	.poll = poll,
+	.remove = remove,
+	.info = &usbh_midi_driver_info
+};
diff --git a/src/usbh_driver_gp_xbox.c b/src/usbh_driver_gp_xbox.c
index 92f61b5..6393d1b 100644
--- a/src/usbh_driver_gp_xbox.c
+++ b/src/usbh_driver_gp_xbox.c
@@ -72,7 +72,7 @@ void gp_xbox_driver_init(const gp_xbox_config_t *config)
  *
  *
  */
-static void *init(void *usbh_dev)
+static void *init(usbh_device_t *usbh_dev)
 {
 	if (!initialized) {
 		LOG_PRINTF("\n%s/%d : driver not initialized\n", __FILE__, __LINE__);
@@ -89,7 +89,7 @@ static void *init(void *usbh_dev)
 			drvdata->device_id = i;
 			drvdata->endpoint_in_address = 0;
 			drvdata->endpoint_in_toggle = 0;
-			drvdata->usbh_device = (usbh_device_t *)usbh_dev;
+			drvdata->usbh_device = usbh_dev;
 			break;
 		}
 	}
diff --git a/src/usbh_driver_hid.c b/src/usbh_driver_hid.c
index 0e90ab0..15af80b 100644
--- a/src/usbh_driver_hid.c
+++ b/src/usbh_driver_hid.c
@@ -93,7 +93,7 @@ void hid_driver_init(const hid_config_t *config)
 	}
 }
 
-static void *init(void *usbh_dev)
+static void *init(usbh_device_t *usbh_dev)
 {
 	if (!initialized) {
 		LOG_PRINTF("\n%s/%d : driver not initialized\r\n", __FILE__, __LINE__);
@@ -111,7 +111,7 @@ static void *init(void *usbh_dev)
 			drvdata->endpoint_in_address = 0;
 			drvdata->endpoint_in_toggle = 0;
 			drvdata->report0_length = 0;
-			drvdata->usbh_device = (usbh_device_t *)usbh_dev;
+			drvdata->usbh_device = usbh_dev;
 			drvdata->report_state = REPORT_STATE_NULL;
 			drvdata->hid_type = HID_TYPE_NONE;
 			break;
diff --git a/src/usbh_driver_hub.c b/src/usbh_driver_hub.c
index 2127158..959a6c2 100644
--- a/src/usbh_driver_hub.c
+++ b/src/usbh_driver_hub.c
@@ -45,7 +45,7 @@ void hub_driver_init(void)
 	}

 }

 

-static void *init(void *usbh_dev)

+static void *init(usbh_device_t *usbh_dev)

 {

 	if (!initialized) {

 		LOG_PRINTF("\n%s/%d : driver not initialized\n", __FILE__, __LINE__);

@@ -69,7 +69,7 @@ static void *init(void *usbh_dev)
 	drvdata = &hub_device[i];

 	drvdata->state = EVENT_STATE_NONE;

 	drvdata->ports_num = 0;

-	drvdata->device[0] = (usbh_device_t *)usbh_dev;

+	drvdata->device[0] = usbh_dev;

 	drvdata->busy = 0;

 	drvdata->endpoint_in_address = 0;

 	drvdata->endpoint_in_maxpacketsize = 0;