NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

还是需要用SystemInit，因为系统初始化时钟的时候，全局变量还没来得及赋值初始值，那么就得函数内部设置初始值

This commit is contained in:
Stone 2016-06-15 13:20:54 +00:00
parent 122e250f85
commit 1ba19dc7f1
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Platform/GD32F1x0/Boot_F0.cpp
View File

@ -2,13 +2,13 @@
extern "C"
{
//uint32_t SystemCoreClock = 48000000;
//__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
uint32_t SystemCoreClock = 48000000;
__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
void SysInit(void)
void SystemInit(void)
{
#ifndef TINY
//SystemCoreClock = 48000000;
SystemCoreClock = 48000000;
/* Configure the System clock frequency, AHB/APBx prescalers and Flash settings */
SetSysClock(SystemCoreClock, 8000000);

4
Platform/GD32F1x0/startup_stm32f0xx.s
View File

@ -92,10 +92,10 @@ __Vectors_Size EQU __Vectors_End - __Vectors
; 启动函数
Reset_Handler PROC
EXPORT Reset_Handler [WEAK]
IMPORT SysInit
IMPORT SystemInit
IMPORT __main
LDR R0, =SysInit
LDR R0, =SystemInit
BLX R0
LDR R0, =__main
BX R0

8
Platform/STM32F0/Boot_F0.cpp
View File

@ -2,13 +2,13 @@
extern "C"
{
//uint32_t SystemCoreClock = 48000000;
//__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
uint32_t SystemCoreClock = 48000000;
__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
void SysInit(void)
void SystemInit(void)
{
#ifndef TINY
//SystemCoreClock = 48000000;
SystemCoreClock = 48000000;
/* Configure the System clock frequency, AHB/APBx prescalers and Flash settings */
SetSysClock(SystemCoreClock, 8000000);

4
Platform/STM32F0/startup_stm32f0xx.s
View File

@ -92,10 +92,10 @@ __Vectors_Size EQU __Vectors_End - __Vectors
; 启动函数
Reset_Handler PROC
EXPORT Reset_Handler [WEAK]
IMPORT SysInit
IMPORT SystemInit
IMPORT __main
LDR R0, =SysInit
LDR R0, =SystemInit
BLX R0
LDR R0, =__main
BX R0

12
Platform/STM32F1/Boot_F1.cpp
View File

@ -2,14 +2,14 @@
extern "C"
{
//unsigned int HSE_VALUE = 8000000;
//uint32_t SystemCoreClock = 72000000;
//__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
unsigned int HSE_VALUE = 8000000;
uint32_t SystemCoreClock = 72000000;
__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
void SysInit(void)
void SystemInit(void)
{
//HSE_VALUE = 8000000;
//SystemCoreClock = 72000000;
HSE_VALUE = 8000000;
SystemCoreClock = 72000000;
/* Configure the System clock frequency, AHB/APBx prescalers and Flash settings */
SetSysClock(SystemCoreClock, HSE_VALUE);

4
Platform/STM32F1/startup_stm32f10x.s
View File

@ -119,10 +119,10 @@ __Vectors_Size EQU __Vectors_End - __Vectors
; 启动函数
Reset_Handler PROC
EXPORT Reset_Handler [WEAK]
IMPORT SysInit
IMPORT SystemInit
IMPORT __main
LDR R0, =SysInit
LDR R0, =SystemInit
BLX R0
LDR R0, =__main
BX R0

12
Platform/STM32F4/Boot_F4.cpp
View File

@ -2,14 +2,14 @@
extern "C"
{
//uint32_t HSE_VALUE = 25000000;
//uint32_t SystemCoreClock = 168000000;
//__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
uint32_t HSE_VALUE = 25000000;
uint32_t SystemCoreClock = 168000000;
__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
void SysInit(void)
void SystemInit(void)
{
//HSE_VALUE = 25000000;
//SystemCoreClock = 168000000;
HSE_VALUE = 25000000;
SystemCoreClock = 168000000;
/* Configure the System clock frequency, AHB/APBx prescalers and Flash settings */
SetSysClock(SystemCoreClock, HSE_VALUE);

4
Platform/STM32F4/startup_stm32f4xx.s
View File

@ -138,10 +138,10 @@ __Vectors_Size EQU __Vectors_End - __Vectors
; 启动函数
Reset_Handler PROC
EXPORT Reset_Handler [WEAK]
IMPORT SysInit
IMPORT SystemInit
IMPORT __main
LDR R0, =SysInit
LDR R0, =SystemInit
BLX R0
LDR R0, =__main
BX R0

2
Platform/stm32.h
View File

@ -66,7 +66,7 @@
extern "C"
{
void SysInit(void);
void SystemInit(void);
void SetSysClock(unsigned int clock, unsigned int cystalClock);
}