Merge pull request #119 from dismirlian/usbh_devel

USBH: moved declaration of driver to LLD
ChibiOS · Jun 15, 2017 · 4092650 · 4092650
2 parents ca686a5 + d2c155b
commit 4092650
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h
@@ -269,14 +269,6 @@ struct USBHDriver {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-#if STM32_USBH_USE_OTG1
-extern USBHDriver USBHD1;
-#endif
-
-#if STM32_USBH_USE_OTG2
-extern USBHDriver USBHD2;
-#endif
-
 
 /*===========================================================================*/
 /* Main driver API.		                                                     */

diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h
@@ -149,6 +149,15 @@ uint8_t usbh_lld_roothub_get_statuschange_bitmap(USBHDriver *usbh);
 #define USBH_LLD_DECLARE_STRUCT_MEMBER(member) member __attribute__((aligned(4)))
 #endif
 
+
+#if STM32_USBH_USE_OTG1
+extern USBHDriver USBHD1;
+#endif
+
+#if STM32_USBH_USE_OTG2
+extern USBHDriver USBHD2;
+#endif
+
 #endif
 
 #endif /* HAL_USBH_LLD_H */