mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 23:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

temp fix for mm32 redundant-decls of SystemCoreClock

Browse Source
This commit is contained in:
hathach 2024-05-06 17:28:48 +07:00
parent 497785393d
commit a9f1c62dff
No known key found for this signature in database
GPG Key ID: 26FAB84F615C3C52
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/bsp/mm32/family.c
View File

@ -30,6 +30,21 @@
#include "bsp/board_api.h" #include "bsp/board_api.h"
#include "board.h" #include "board.h"
//--------------------------------------------------------------------+
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
//--------------------------------------------------------------------+
#ifdef __GNUC__ // caused by extra declaration of SystemCoreClock in freeRTOSConfig.h
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wredundant-decls"
#endif
extern u32 SystemCoreClock;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// Forward USB interrupt events to TinyUSB IRQ Handler // Forward USB interrupt events to TinyUSB IRQ Handler
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@ -46,19 +61,12 @@ void USB_DeviceClockInit(void) {
/* Enable USB clock */ /* Enable USB clock */
RCC->AHB2ENR |= 0x1 << 7; RCC->AHB2ENR |= 0x1 << 7;
} }
//--------------------------------------------------------------------+
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
//--------------------------------------------------------------------+
extern u32 SystemCoreClock;
void board_init(void) { void board_init(void) {
// usb clock // usb clock
USB_DeviceClockInit(); USB_DeviceClockInit();
if (SysTick_Config(SystemCoreClock / 1000)) { SysTick_Config(SystemCoreClock / 1000);
while (1);
}
NVIC_SetPriority(SysTick_IRQn, 0x0); NVIC_SetPriority(SysTick_IRQn, 0x0);
RCC_AHBPeriphClockCmd(RCC_AHBENR_GPIOA, ENABLE); RCC_AHBPeriphClockCmd(RCC_AHBENR_GPIOA, ENABLE);

11
src/portable/mindmotion/mm32/dcd_mm32f327x_otg.c
View File

@ -283,7 +283,18 @@ void dcd_set_address(uint8_t rhport, uint8_t dev_addr)
/* Response with status first before changing device address */ /* Response with status first before changing device address */
dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_IN), NULL, 0); dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_IN), NULL, 0);
} }
#ifdef __GNUC__ // caused by extra declaration of SystemCoreClock in freeRTOSConfig.h
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wredundant-decls"
#endif
extern u32 SystemCoreClock; extern u32 SystemCoreClock;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
void dcd_remote_wakeup(uint8_t rhport) void dcd_remote_wakeup(uint8_t rhport)
{ {
(void) rhport; (void) rhport;