|
26 | 26 | #endif
|
27 | 27 | #endif
|
28 | 28 |
|
29 |
| -#if defined(TARGET_DISCO_F429ZI) || defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI) |
| 29 | +#if defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI) |
30 | 30 | #define USBHAL_IRQn OTG_HS_IRQn
|
31 | 31 | #else
|
32 | 32 | #define USBHAL_IRQn OTG_FS_IRQn
|
@@ -84,11 +84,6 @@ static gpio_t gpio_powerpin;
|
84 | 84 | #define USB_POWER_OFF 1
|
85 | 85 | #define USB_POWERPIN_CONFIG {__HAL_RCC_GPIOG_CLK_ENABLE();gpio_init_out_ex(&gpio_powerpin, PG_8, USB_POWER_OFF);}
|
86 | 86 |
|
87 |
| -#elif defined(TARGET_DISCO_F429ZI) |
88 |
| -#define USB_POWER_ON 0 |
89 |
| -#define USB_POWER_OFF 1 |
90 |
| -#define USB_POWERPIN_CONFIG {__HAL_RCC_GPIOC_CLK_ENABLE();gpio_init_out_ex(&gpio_powerpin, PC_4, USB_POWER_OFF);} |
91 |
| - |
92 | 87 | #elif defined(TARGET_DISCO_F469NI)
|
93 | 88 | #define USB_POWER_ON 1
|
94 | 89 | #define USB_POWER_OFF 0
|
@@ -148,11 +143,7 @@ USBHALHost::USBHALHost()
|
148 | 143 | hhcd = (HCD_HandleTypeDef *)usb_hcca;
|
149 | 144 | hhcd->pData = (void*)HALPriv;
|
150 | 145 |
|
151 |
| -#if defined(TARGET_DISCO_F429ZI) |
152 |
| - hhcd->Instance = USB_OTG_HS; |
153 |
| - hhcd->Init.speed = HCD_SPEED_HIGH; |
154 |
| - hhcd->Init.phy_itface = HCD_PHY_EMBEDDED; |
155 |
| -#elif defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI) |
| 146 | +#if defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI) |
156 | 147 | hhcd->Instance = USB_OTG_HS;
|
157 | 148 | hhcd->Init.speed = HCD_SPEED_HIGH;
|
158 | 149 | hhcd->Init.phy_itface = HCD_PHY_ULPI;
|
@@ -214,13 +205,6 @@ USBHALHost::USBHALHost()
|
214 | 205 | pin_function(PA_10, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)); // ID
|
215 | 206 | pin_function(PA_9, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OTG_FS)); // VBUS
|
216 | 207 |
|
217 |
| -#elif defined(TARGET_DISCO_F429ZI) |
218 |
| - __HAL_RCC_GPIOB_CLK_ENABLE(); |
219 |
| - pin_function(PB_14, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_OTG_HS_FS)); // DM |
220 |
| - pin_function(PB_15, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_OTG_HS_FS)); // DP |
221 |
| - //pin_function(PB_12, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)); // ID |
222 |
| - pin_function(PB_13, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)); // VBUS |
223 |
| - |
224 | 208 | #elif defined(TARGET_DISCO_F746NG_FS)
|
225 | 209 | __HAL_RCC_GPIOA_CLK_ENABLE();
|
226 | 210 | pin_function(PA_11, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OTG_FS)); // DM
|
@@ -283,9 +267,7 @@ USBHALHost::USBHALHost()
|
283 | 267 | // Enable clocks
|
284 | 268 | __HAL_RCC_SYSCFG_CLK_ENABLE();
|
285 | 269 |
|
286 |
| -#if defined(TARGET_DISCO_F429ZI) |
287 |
| - __HAL_RCC_USB_OTG_HS_CLK_ENABLE(); |
288 |
| -#elif defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI) |
| 270 | +#if defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI) |
289 | 271 | __HAL_RCC_USB_OTG_HS_ULPI_CLK_ENABLE();
|
290 | 272 | __HAL_RCC_USB_OTG_HS_CLK_ENABLE();
|
291 | 273 | #else
|
|
0 commit comments