aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann2011-11-16 21:53:27 +0100
committerUwe Hermann2011-11-17 00:09:29 +0100
commitd97c937b8e7c33cf2b30f3606707bf785c4ee2ea (patch)
treedda3a51e0db486755ad827d641072e9f9f542eb0
parent0d25aa3fcd31a6608e9b0144857661565de3b457 (diff)
lib: More small fixes.
-rw-r--r--lib/lm3s/vector.c7
-rw-r--r--lib/stm32/f1/rcc.c2
-rw-r--r--lib/stm32/f1/vector.c2
-rw-r--r--lib/stm32/f2/vector.c2
-rw-r--r--lib/stm32/f4/rcc.c10
5 files changed, 10 insertions, 13 deletions
diff --git a/lib/lm3s/vector.c b/lib/lm3s/vector.c
index 995ee78..8e54aeb 100644
--- a/lib/lm3s/vector.c
+++ b/lib/lm3s/vector.c
@@ -19,7 +19,7 @@
#define WEAK __attribute__ ((weak))
-/* Symbols exported by linker script */
+/* Symbols exported by the linker script(s): */
extern unsigned _etext, _data, _edata, _ebss, _stack;
void main(void);
@@ -41,7 +41,7 @@ void WEAK sys_tick_handler(void);
__attribute__ ((section(".vectors")))
void (*const vector_table[]) (void) = {
- (void*)&_stack,
+ (void *)&_stack,
reset_handler,
nmi_handler,
hard_fault_handler,
@@ -61,7 +61,7 @@ void (*const vector_table[]) (void) = {
void reset_handler(void)
{
volatile unsigned *src, *dest;
- asm("MSR msp, %0" : : "r"(&_stack));
+ __asm__("MSR msp, %0" : : "r"(&_stack));
for (src = &_etext, dest = &_data; dest < &_edata; src++, dest++)
*dest = *src;
@@ -93,4 +93,3 @@ void null_handler(void)
#pragma weak pend_sv_handler = null_handler
#pragma weak sys_tick_handler = null_handler
/* TODO: Interrupt handler weak aliases */
-
diff --git a/lib/stm32/f1/rcc.c b/lib/stm32/f1/rcc.c
index 13d93c4..ce45832 100644
--- a/lib/stm32/f1/rcc.c
+++ b/lib/stm32/f1/rcc.c
@@ -22,7 +22,7 @@
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/flash.h>
-/* Set the default ppre1 and ppre2 peripheral clock frequencies after reset */
+/* Set the default ppre1 and ppre2 peripheral clock frequencies after reset. */
u32 rcc_ppre1_frequency = 8000000;
u32 rcc_ppre2_frequency = 8000000;
diff --git a/lib/stm32/f1/vector.c b/lib/stm32/f1/vector.c
index 071fe96..cb2759e 100644
--- a/lib/stm32/f1/vector.c
+++ b/lib/stm32/f1/vector.c
@@ -19,7 +19,7 @@
#define WEAK __attribute__ ((weak))
-/* Symbols exported by linker script */
+/* Symbols exported by the linker script(s). */
extern unsigned _etext, _data, _edata, _ebss, _stack;
void main(void);
diff --git a/lib/stm32/f2/vector.c b/lib/stm32/f2/vector.c
index e4c8f30..51aea0a 100644
--- a/lib/stm32/f2/vector.c
+++ b/lib/stm32/f2/vector.c
@@ -122,7 +122,7 @@ void WEAK hash_rng_isr(void);
__attribute__ ((section(".vectors")))
void (*const vector_table[]) (void) = {
- (void*)&_stack,
+ (void *)&_stack,
reset_handler,
nmi_handler,
hard_fault_handler,
diff --git a/lib/stm32/f4/rcc.c b/lib/stm32/f4/rcc.c
index 313d192..e10ef21 100644
--- a/lib/stm32/f4/rcc.c
+++ b/lib/stm32/f4/rcc.c
@@ -402,16 +402,14 @@ void rcc_clock_setup_hse_3v3(const clock_scale_t *clock)
rcc_set_ppre1(clock->ppre1);
rcc_set_ppre2(clock->ppre2);
- rcc_set_main_pll_hse(clock->pllm,
- clock->plln,
- clock->pllp,
- clock->pllq);
+ rcc_set_main_pll_hse(clock->pllm, clock->plln,
+ clock->pllp, clock->pllq);
/* Enable PLL oscillator and wait for it to stabilize. */
rcc_osc_on(PLL);
rcc_wait_for_osc_ready(PLL);
- /* Configure flash settings */
+ /* Configure flash settings. */
flash_set_ws(clock->flash_config);
/* Select PLL as SYSCLK source. */
@@ -420,7 +418,7 @@ void rcc_clock_setup_hse_3v3(const clock_scale_t *clock)
/* Wait for PLL clock to be selected. */
rcc_wait_for_sysclk_status(PLL);
- /* Set the peripheral clock frequencies used */
+ /* Set the peripheral clock frequencies used. */
rcc_ppre1_frequency = clock->apb1_frequency;
rcc_ppre2_frequency = clock->apb2_frequency;
}