mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-06-21 02:50:47 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Minor tweaks in STM32 examples

Browse Source 
Fix comments in newer mip initialization (main.c)
Correct stack initialization (boot.c)
Remove SCC clock enable when not needed (mcu.h)
This commit is contained in:
Sergio R. Caprile 2022-12-09 15:20:51 -03:00
parent 0b2712f52f
commit 2c014778d9
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/stm32/nucleo-f429zi-baremetal/boot.c
View File

@ -3,9 +3,6 @@
// Startup code // Startup code
__attribute__((naked, noreturn)) void _reset(void) { __attribute__((naked, noreturn)) void _reset(void) {
// Init stack
asm("ldr sp, = _estack");
// Initialise memory // Initialise memory
extern long _sbss, _ebss, _sdata, _edata, _sidata; extern long _sbss, _ebss, _sdata, _edata, _sidata;
for (long *src = &_sbss; src < &_ebss; src++) *src = 0; for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
@ -125,9 +122,10 @@ WEAK_ALIAS void LTDC_ER_IRQHandler(void);
WEAK_ALIAS void DMA2D_IRQHandler(void); WEAK_ALIAS void DMA2D_IRQHandler(void);
// IRQ table // IRQ table
extern void _estack();
__attribute__((section(".vectors"))) void (*tab[16 + 91])(void) = { __attribute__((section(".vectors"))) void (*tab[16 + 91])(void) = {
// Cortex interrupts // Cortex interrupts
0, _reset, NMI_Handler, HardFault_Handler, MemManage_Handler, _estack, _reset, NMI_Handler, HardFault_Handler, MemManage_Handler,
BusFault_Handler, UsageFault_Handler, 0, 0, 0, 0, SVC_Handler, BusFault_Handler, UsageFault_Handler, 0, 0, 0, 0, SVC_Handler,
DebugMon_Handler, 0, PendSV_Handler, SysTick_Handler, DebugMon_Handler, 0, PendSV_Handler, SysTick_Handler,

2
examples/stm32/nucleo-f429zi-baremetal/main.c
View File

@ -68,7 +68,7 @@ int main(void) {
mg_timer_add(&mgr, 500, MG_TIMER_REPEAT, blink_cb, &mgr); mg_timer_add(&mgr, 500, MG_TIMER_REPEAT, blink_cb, &mgr);
// Initialise Mongoose network stack // Initialise Mongoose network stack
// Specify MAC address, and use 0 for IP, mask, GW - i.e. use DHCP // Specify MAC address, either set use_dhcp or enter a static config.
// For static configuration, specify IP/mask/GW in network byte order // For static configuration, specify IP/mask/GW in network byte order
struct mip_driver_stm32 driver_data = {.mdc_cr = 4}; // See driver_stm32.h struct mip_driver_stm32 driver_data = {.mdc_cr = 4}; // See driver_stm32.h
struct mip_if mif = { struct mip_if mif = {

1
examples/stm32/nucleo-f429zi-baremetal/mcu.h
View File

@ -65,7 +65,6 @@ static inline void systick_init(uint32_t ticks) {
SYSTICK->LOAD = ticks - 1; SYSTICK->LOAD = ticks - 1;
SYSTICK->VAL = 0; SYSTICK->VAL = 0;
SYSTICK->CTRL = BIT(0) | BIT(1) | BIT(2); // Enable systick SYSTICK->CTRL = BIT(0) | BIT(1) | BIT(2); // Enable systick
RCC->APB2ENR |= BIT(14); // Enable SYSCFG
} }
struct flash { struct flash {

4
examples/stm32/nucleo-f429zi-freertos-mip/main.c
View File

@ -31,6 +31,7 @@ static void ethernet_init(void) {
} }
NVIC_EnableIRQ(61); // Setup Ethernet IRQ handler NVIC_EnableIRQ(61); // Setup Ethernet IRQ handler
RCC->APB2ENR |= BIT(14); // Enable SYSCFG
SYSCFG->PMC |= BIT(23); // Use RMII. Goes first! SYSCFG->PMC |= BIT(23); // Use RMII. Goes first!
RCC->AHB1ENR |= BIT(25) | BIT(26) | BIT(27); // Enable Ethernet clocks RCC->AHB1ENR |= BIT(25) | BIT(26) | BIT(27); // Enable Ethernet clocks
RCC->AHB1RSTR |= BIT(25); // ETHMAC force reset RCC->AHB1RSTR |= BIT(25); // ETHMAC force reset
@ -43,7 +44,7 @@ static void server(void *args) {
mg_log_set(MG_LL_DEBUG); // Set log level mg_log_set(MG_LL_DEBUG); // Set log level
// Initialise Mongoose network stack // Initialise Mongoose network stack
// Specify MAC address, and use 0 for IP, mask, GW - i.e. use DHCP // Specify MAC address, either set use_dhcp or enter a static config.
// For static configuration, specify IP/mask/GW in network byte order // For static configuration, specify IP/mask/GW in network byte order
MG_INFO(("Initializing Ethernet driver")); MG_INFO(("Initializing Ethernet driver"));
ethernet_init(); ethernet_init();
@ -74,7 +75,6 @@ static void blinker(void *args) {
} }
int main(void) { int main(void) {
RCC->APB2ENR |= BIT(14); // Enable SYSCFG: for systick & Ethernet
clock_init(); // Set clock to max of 180 MHz clock_init(); // Set clock to max of 180 MHz
systick_init(FREQ / 1000); // Tick every 1 ms systick_init(FREQ / 1000); // Tick every 1 ms
uart_init(UART3, 115200); // Initialise UART uart_init(UART3, 115200); // Initialise UART

6
examples/stm32/nucleo-f746zg-baremetal/boot.c
View File

@ -3,9 +3,6 @@
// Startup code // Startup code
__attribute__((naked, noreturn)) void _reset(void) { __attribute__((naked, noreturn)) void _reset(void) {
// Init stack
asm("ldr sp, = _estack");
// Initialise memory // Initialise memory
extern long _sbss, _ebss, _sdata, _edata, _sidata; extern long _sbss, _ebss, _sdata, _edata, _sidata;
for (long *src = &_sbss; src < &_ebss; src++) *src = 0; for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
@ -132,9 +129,10 @@ WEAK_ALIAS void I2C4_ER_IRQHandler(void);
WEAK_ALIAS void SPDIF_RX_IRQHandler(void); WEAK_ALIAS void SPDIF_RX_IRQHandler(void);
// IRQ table // IRQ table
extern void _estack();
__attribute__((section(".vectors"))) void (*tab[16 + 98])(void) = { __attribute__((section(".vectors"))) void (*tab[16 + 98])(void) = {
// Cortex interrupts // Cortex interrupts
0, _reset, NMI_Handler, HardFault_Handler, MemManage_Handler, _estack, _reset, NMI_Handler, HardFault_Handler, MemManage_Handler,
BusFault_Handler, UsageFault_Handler, 0, 0, 0, 0, SVC_Handler, BusFault_Handler, UsageFault_Handler, 0, 0, 0, 0, SVC_Handler,
DebugMon_Handler, 0, PendSV_Handler, SysTick_Handler, DebugMon_Handler, 0, PendSV_Handler, SysTick_Handler,

2
examples/stm32/nucleo-f746zg-baremetal/main.c
View File

@ -68,7 +68,7 @@ int main(void) {
mg_timer_add(&mgr, 500, MG_TIMER_REPEAT, blink_cb, &mgr); mg_timer_add(&mgr, 500, MG_TIMER_REPEAT, blink_cb, &mgr);
// Initialise Mongoose network stack // Initialise Mongoose network stack
// Specify MAC address, and use 0 for IP, mask, GW - i.e. use DHCP // Specify MAC address, either set use_dhcp or enter a static config.
// For static configuration, specify IP/mask/GW in network byte order // For static configuration, specify IP/mask/GW in network byte order
struct mip_driver_stm32 driver_data = {.mdc_cr = 4}; // See driver_stm32.h struct mip_driver_stm32 driver_data = {.mdc_cr = 4}; // See driver_stm32.h
struct mip_if mif = { struct mip_if mif = {

1
examples/stm32/nucleo-f746zg-baremetal/mcu.h
View File

@ -66,7 +66,6 @@ static inline void systick_init(uint32_t ticks) {
SYSTICK->LOAD = ticks - 1; SYSTICK->LOAD = ticks - 1;
SYSTICK->VAL = 0; SYSTICK->VAL = 0;
SYSTICK->CTRL = BIT(0) | BIT(1) | BIT(2); // Enable systick SYSTICK->CTRL = BIT(0) | BIT(1) | BIT(2); // Enable systick
RCC->APB2ENR |= BIT(14); // Enable SYSCFG
} }
struct flash { struct flash {