From 0e61ec097c63ab8df10665503ec3786c90a2a08a Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Wed, 27 May 2015 23:08:25 +0200
Subject: [PATCH] cpu/stm32f1: adapted to centralized cpu conf
---
cpu/stm32f1/cpu.c | 6 ++----
cpu/stm32f1/include/cpu_conf.h | 39 ++++------------------------------
cpu/stm32f1/startup.c | 12 ++++-------
3 files changed, 10 insertions(+), 47 deletions(-)
diff --git a/cpu/stm32f1/cpu.c b/cpu/stm32f1/cpu.c
index 1eca9a5ea6..d24aeafa88 100644
--- a/cpu/stm32f1/cpu.c
+++ b/cpu/stm32f1/cpu.c
@@ -29,10 +29,8 @@ static void clk_init(void);
void cpu_init(void)
{
- /* set PendSV priority to the lowest possible priority */
- NVIC_SetPriority(PendSV_IRQn, 0xff);
- /* configure the vector table location to internal flash */
- SCB->VTOR = FLASH_BASE;
+ /* initialize the Cortex-M core */
+ cortexm_init();
/* initialize system clocks */
clk_init();
}
diff --git a/cpu/stm32f1/include/cpu_conf.h b/cpu/stm32f1/include/cpu_conf.h
index 37b8eb797e..f6f0d81e68 100644
--- a/cpu/stm32f1/include/cpu_conf.h
+++ b/cpu/stm32f1/include/cpu_conf.h
@@ -30,29 +30,12 @@ extern "C" {
#endif
/**
- * @name Kernel configuration
- *
- * TODO: measure and adjust for the cortex-m3
- * @{
- */
-#define THREAD_EXTRA_STACKSIZE_PRINTF (1024)
-
-#ifndef THREAD_STACKSIZE_DEFAULT
-#define THREAD_STACKSIZE_DEFAULT (1024)
-#endif
-
-#define THREAD_STACKSIZE_IDLE (256)
-/** @} */
-
-/**
- * @name UART0 buffer size definition for compatibility reasons
- *
- * TODO: remove once the remodeling of the uart0 driver is done
+ * @brief ARM Cortex-M specific CPU configuration
* @{
*/
-#ifndef UART0_BUFSIZE
-#define UART0_BUFSIZE (128)
-#endif
+#define CPU_DEFAULT_IRQ_PRIO (1U)
+#define CPU_IRQ_NUMOF (60U)
+#define CPU_FLASH_BASE FLASH_BASE
/** @} */
/**
@@ -60,20 +43,6 @@ extern "C" {
*/
#define CPUID_ID_LEN (12)
-/**
- * @brief Definition of different panic modes
- */
-typedef enum {
- HARD_FAULT,
- WATCHDOG,
- BUS_FAULT,
- USAGE_FAULT,
- DUMMY_HANDLER
-} panic_t;
-
-/**
- * @brief Buffer size to use by the transceiver
- */
#define TRANSCEIVER_BUFFER_SIZE (3)
/**
diff --git a/cpu/stm32f1/startup.c b/cpu/stm32f1/startup.c
index 34582a2308..b5e356e3f9 100644
--- a/cpu/stm32f1/startup.c
+++ b/cpu/stm32f1/startup.c
@@ -82,8 +82,7 @@ void reset_handler(void)
*/
void dummy_handler(void)
{
- core_panic(DUMMY_HANDLER, "DUMMY HANDLER");
- while (1) {asm ("nop");}
+ core_panic(PANIC_DUMMY_HANDLER, "DUMMY HANDLER");
}
void isr_nmi(void)
@@ -103,20 +102,17 @@ void isr_debug_mon(void)
void isr_hard_fault(void)
{
- core_panic(HARD_FAULT, "HARD FAULT");
- while (1) {asm ("nop");}
+ core_panic(PANIC_HARD_FAULT, "HARD FAULT");
}
void isr_bus_fault(void)
{
- core_panic(BUS_FAULT, "BUS FAULT");
- while (1) {asm ("nop");}
+ core_panic(PANIC_BUS_FAULT, "BUS FAULT");
}
void isr_usage_fault(void)
{
- core_panic(USAGE_FAULT, "USAGE FAULT");
- while (1) {asm ("nop");}
+ core_panic(PANIC_USAGE_FAULT, "USAGE FAULT");
}
/* Cortex-M specific interrupt vectors */
--
GitLab