use forward declaration for usbh_dev_driver_t

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

4 files changed, 26 insertions, 32 deletions

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;