aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Ismirlian <dismirlian (at) google's mail.com>2017-06-09 11:07:20 -0300
committerDiego Ismirlian <dismirlian (at) google's mail.com>2017-06-09 11:07:20 -0300
commitd2c155b4cf984b85895c5d786b3621cf19f169e6 (patch)
tree9d3f45ba7bcc194728e47994f0ed92ba6671682d
parent4483baab02f3a80d262d42cb69961f1f349b5d1e (diff)
downloadChibiOS-Contrib-d2c155b4cf984b85895c5d786b3621cf19f169e6.tar.gz
ChibiOS-Contrib-d2c155b4cf984b85895c5d786b3621cf19f169e6.tar.bz2
ChibiOS-Contrib-d2c155b4cf984b85895c5d786b3621cf19f169e6.zip
USBH: moved declaration of driver to LLD
-rw-r--r--os/hal/include/hal_usbh.h8
-rw-r--r--os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h9
2 files changed, 9 insertions, 8 deletions
diff --git a/os/hal/include/hal_usbh.h b/os/hal/include/hal_usbh.h
index 2684aca..b8c229a 100644
--- 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
index 0cdf79c..a2b7628 100644
--- 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 */