feat: H7 support (#5738)
Co-authored-by: Richard Li <richard.li@ces.hk> Co-authored-by: philmoz <phil.a.mitchell@gmail.com> Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
Richard Li
philmoz
raphaelcoeffic
parent
5a15ffb017
commit
3d25c2a0f8
@@ -28,12 +28,13 @@
|
||||
#endif
|
||||
|
||||
extern "C" {
|
||||
#include "usbd_conf.h"
|
||||
#include "usbd_core.h"
|
||||
#include "usbd_msc.h"
|
||||
#include "usbd_desc.h"
|
||||
#include "usbd_hid.h"
|
||||
#include "usbd_cdc.h"
|
||||
#include "usbd_conf.h"
|
||||
#include "usbd_core.h"
|
||||
#include "usbd_msc.h"
|
||||
#include "usbd_desc.h"
|
||||
#include "usbd_hid.h"
|
||||
#include "usbd_cdc.h"
|
||||
#include "usbd_dfu.h"
|
||||
}
|
||||
|
||||
#include "stm32_hal_ll.h"
|
||||
@@ -53,13 +54,21 @@ extern "C" {
|
||||
#define DEVICE_ID DEVICE_FS
|
||||
#endif
|
||||
|
||||
static bool usbDriverStarted = false;
|
||||
#if defined(BOOT)
|
||||
static usbMode selectedUsbMode = USB_MASS_STORAGE_MODE;
|
||||
#else
|
||||
static usbMode selectedUsbMode = USB_UNSELECTED_MODE;
|
||||
|
||||
// TODO: configured where needed
|
||||
#define DEFAULT_USB_MODE USB_MASS_STORAGE_MODE;
|
||||
#if defined(FIRMWARE_QSPI)
|
||||
static const USBD_DFU_MediaTypeDef* _dfu_media[USBD_DFU_MAX_ITF_NUM] = {nullptr};
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define DEFAULT_USB_MODE USB_UNSELECTED_MODE;
|
||||
#endif
|
||||
|
||||
static bool usbDriverStarted = false;
|
||||
static usbMode selectedUsbMode = DEFAULT_USB_MODE;
|
||||
|
||||
USBD_HandleTypeDef hUsbDevice;
|
||||
|
||||
int getSelectedUsbMode()
|
||||
@@ -114,6 +123,9 @@ extern "C" void OTG_FS_IRQHandler()
|
||||
|
||||
void usbInit()
|
||||
{
|
||||
#if defined(STM32H7)
|
||||
HAL_PWREx_EnableUSBVoltageDetector();
|
||||
#endif
|
||||
gpio_init_af(USB_GPIO_DM, USB_GPIO_AF, GPIO_PIN_SPEED_VERY_HIGH);
|
||||
gpio_init_af(USB_GPIO_DP, USB_GPIO_AF, GPIO_PIN_SPEED_VERY_HIGH);
|
||||
|
||||
@@ -144,12 +156,32 @@ extern void usbInitLUNs();
|
||||
extern USBD_HandleTypeDef hUsbDevice;
|
||||
extern "C" USBD_StorageTypeDef USBD_Storage_Interface_fops;
|
||||
extern USBD_CDC_ItfTypeDef USBD_Interface_fops;
|
||||
extern USBD_DFU_MediaTypeDef USBD_DFU_MEDIA_fops;
|
||||
|
||||
void usbStart()
|
||||
{
|
||||
USBD_Init(&hUsbDevice, &FS_Desc, DEVICE_ID);
|
||||
switch (getSelectedUsbMode()) {
|
||||
#if !defined(BOOT)
|
||||
case USB_MASS_STORAGE_MODE:
|
||||
// initialize USB as MSC device
|
||||
usbInitLUNs();
|
||||
USBD_RegisterClass(&hUsbDevice, &USBD_MSC);
|
||||
USBD_MSC_RegisterStorage(&hUsbDevice, &USBD_Storage_Interface_fops);
|
||||
break;
|
||||
|
||||
#if defined(BOOT)
|
||||
#if defined(FIRMWARE_QSPI)
|
||||
case USB_DFU_MODE:
|
||||
USBD_RegisterClass(&hUsbDevice, &USBD_DFU);
|
||||
for (unsigned i = 0; i < USBD_DFU_MAX_ITF_NUM; i++){
|
||||
if (_dfu_media[i] != nullptr) {
|
||||
USBD_DFU_RegisterMedia(&hUsbDevice,
|
||||
(USBD_DFU_MediaTypeDef*)_dfu_media[i]);
|
||||
}
|
||||
}
|
||||
break;
|
||||
#endif // !defined(STM32H7) && !defined(STM32H7RS)
|
||||
#else
|
||||
case USB_JOYSTICK_MODE:
|
||||
// initialize USB as HID device
|
||||
#if defined(USBJ_EX)
|
||||
@@ -165,13 +197,9 @@ void usbStart()
|
||||
break;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
default:
|
||||
case USB_MASS_STORAGE_MODE:
|
||||
// initialize USB as MSC device
|
||||
usbInitLUNs();
|
||||
USBD_RegisterClass(&hUsbDevice, &USBD_MSC);
|
||||
USBD_MSC_RegisterStorage(&hUsbDevice, &USBD_Storage_Interface_fops);
|
||||
break;
|
||||
return;
|
||||
}
|
||||
|
||||
if (USBD_Start(&hUsbDevice) == USBD_OK) {
|
||||
@@ -191,7 +219,20 @@ bool usbStarted()
|
||||
return usbDriverStarted;
|
||||
}
|
||||
|
||||
#if !defined(BOOT)
|
||||
#if defined(BOOT)
|
||||
#if defined(FIRMWARE_QSPI)
|
||||
int usbRegisterDFUMedia(const void* dfu_media)
|
||||
{
|
||||
for (unsigned i = 0; i < USBD_DFU_MAX_ITF_NUM; i++) {
|
||||
if (_dfu_media[i] == nullptr) {
|
||||
_dfu_media[i] = (const USBD_DFU_MediaTypeDef*)dfu_media;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
#endif // !defined(FIRMWARE_QSPI)
|
||||
#else // !BOOT
|
||||
|
||||
#if defined(USBJ_EX)
|
||||
extern "C" void delay_ms(uint32_t count);
|
||||
|
||||
Reference in New Issue
Block a user