diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2017-06-15 17:34:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 17:34:42 +0200 |
| commit | 4092650b1bc013a21c0eaf27f62c84dbf2aece42 (patch) | |
| tree | 5ce67b26533d19f8ca3cc4b54797eb61724ca124 /os/hal | |
| parent | ca686a5cbab4a2c6de321e7f1a9c06c28fd56f9a (diff) | |
| parent | d2c155b4cf984b85895c5d786b3621cf19f169e6 (diff) | |
| download | ChibiOS-Contrib-4092650b1bc013a21c0eaf27f62c84dbf2aece42.tar.gz ChibiOS-Contrib-4092650b1bc013a21c0eaf27f62c84dbf2aece42.tar.bz2 ChibiOS-Contrib-4092650b1bc013a21c0eaf27f62c84dbf2aece42.zip | |
Merge pull request #119 from dismirlian/usbh_devel
USBH: moved declaration of driver to LLD
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/include/hal_usbh.h | 8 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h | 9 |
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 */ |