rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: use OTG1/OTG2 for serial over USB depending on which enabled (#3757)

This commit is contained in:
Andrey G 2022-01-09 00:33:48 +03:00 committed by GitHub
parent 29ec6d7381
commit 74b9ce8a8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/hw_layer/mass_storage/mass_storage_init.cpp
View File

@ -26,10 +26,12 @@
#endif #endif
#endif #endif
#if STM32_USB_USE_OTG2 #if STM32_USB_USE_OTG1
USBDriver *usb_driver = &USBD1;
#elif STM32_USB_USE_OTG2
USBDriver *usb_driver = &USBD2; USBDriver *usb_driver = &USBD2;
#else #else
USBDriver *usb_driver = &USBD1; #error MSD needs OTG1 or OTG2 to be enabled
#endif #endif
// One block buffer per LUN // One block buffer per LUN

6
firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c
View File

@ -451,7 +451,13 @@ const USBConfig usbcfg = {
* Serial over USB driver configuration. * Serial over USB driver configuration.
*/ */
const SerialUSBConfig serusbcfg = { const SerialUSBConfig serusbcfg = {
#if STM32_USB_USE_OTG1
.usbp = &USBD1, .usbp = &USBD1,
#elif STM32_USB_USE_OTG2
.usbp = &USBD2,
#else
#error Serial over USB needs OTG1 or OTG2 to be enabled
#endif
.bulk_in = USBD1_DATA_REQUEST_EP, .bulk_in = USBD1_DATA_REQUEST_EP,
.bulk_out = USBD1_DATA_AVAILABLE_EP, .bulk_out = USBD1_DATA_AVAILABLE_EP,
.int_in = USBD1_INTERRUPT_REQUEST_EP .int_in = USBD1_INTERRUPT_REQUEST_EP