From 9532195e65edcec7d2f55dbb71f00bb18a04dac8 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 6 Feb 2012 23:39:06 +0100 Subject: More coding-style and cosmetic fixes. --- lib/stm32/f1/libopencm3_stm32f1.ld | 9 +++++---- lib/stm32/f2/libopencm3_stm32f2.ld | 9 +++++---- lib/stm32/f4/libopencm3_stm32f4.ld | 9 +++++---- lib/stm32/nvic.c | 14 +++++++------- lib/stm32/usart.c | 26 +++++++++++++------------- 5 files changed, 35 insertions(+), 32 deletions(-) (limited to 'lib/stm32') diff --git a/lib/stm32/f1/libopencm3_stm32f1.ld b/lib/stm32/f1/libopencm3_stm32f1.ld index 76c5e60..52a08f5 100644 --- a/lib/stm32/f1/libopencm3_stm32f1.ld +++ b/lib/stm32/f1/libopencm3_stm32f1.ld @@ -59,10 +59,11 @@ SECTIONS * You may need to fix this if you're using C++. */ /DISCARD/ : { *(.eh_frame) } - /* - * Another section used by C++ stuff, appears when using newlib with 64bit - * (long long) printf support - discard it for now. - */ + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ /DISCARD/ : { *(.ARM.exidx) } . = ALIGN(4); diff --git a/lib/stm32/f2/libopencm3_stm32f2.ld b/lib/stm32/f2/libopencm3_stm32f2.ld index 76c5e60..52a08f5 100644 --- a/lib/stm32/f2/libopencm3_stm32f2.ld +++ b/lib/stm32/f2/libopencm3_stm32f2.ld @@ -59,10 +59,11 @@ SECTIONS * You may need to fix this if you're using C++. */ /DISCARD/ : { *(.eh_frame) } - /* - * Another section used by C++ stuff, appears when using newlib with 64bit - * (long long) printf support - discard it for now. - */ + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ /DISCARD/ : { *(.ARM.exidx) } . = ALIGN(4); diff --git a/lib/stm32/f4/libopencm3_stm32f4.ld b/lib/stm32/f4/libopencm3_stm32f4.ld index 76c5e60..52a08f5 100644 --- a/lib/stm32/f4/libopencm3_stm32f4.ld +++ b/lib/stm32/f4/libopencm3_stm32f4.ld @@ -59,10 +59,11 @@ SECTIONS * You may need to fix this if you're using C++. */ /DISCARD/ : { *(.eh_frame) } - /* - * Another section used by C++ stuff, appears when using newlib with 64bit - * (long long) printf support - discard it for now. - */ + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ /DISCARD/ : { *(.ARM.exidx) } . = ALIGN(4); diff --git a/lib/stm32/nvic.c b/lib/stm32/nvic.c index 502d212..1c7f4b9 100644 --- a/lib/stm32/nvic.c +++ b/lib/stm32/nvic.c @@ -22,37 +22,37 @@ void nvic_enable_irq(u8 irqn) { - NVIC_ISER(irqn / 32) = (1 << (irqn % 32)); + NVIC_ISER(irqn / 32) = (1 << (irqn % 32)); } void nvic_disable_irq(u8 irqn) { - NVIC_ICER(irqn / 32) = (1 << (irqn % 32)); + NVIC_ICER(irqn / 32) = (1 << (irqn % 32)); } u8 nvic_get_pending_irq(u8 irqn) { - return NVIC_ISPR(irqn / 32) & (1 << (irqn % 32)) ? 1:0; + return NVIC_ISPR(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0; } void nvic_set_pending_irq(u8 irqn) { - NVIC_ISPR(irqn / 32) = (1 << (irqn % 32)); + NVIC_ISPR(irqn / 32) = (1 << (irqn % 32)); } void nvic_clear_pending_irq(u8 irqn) { - NVIC_ICPR(irqn / 32) = (1 << (irqn % 32)); + NVIC_ICPR(irqn / 32) = (1 << (irqn % 32)); } u8 nvic_get_active_irq(u8 irqn) { - return NVIC_IABR(irqn / 32) & (1 << (irqn % 32)) ? 1:0; + return NVIC_IABR(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0; } u8 nvic_get_irq_enabled(u8 irqn) { - return NVIC_ISER(irqn / 32) & (1 << (irqn % 32)) ? 1:0; + return NVIC_ISER(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0; } void nvic_set_priority(u8 irqn, u8 priority) diff --git a/lib/stm32/usart.c b/lib/stm32/usart.c index 7995a52..7ce0ddc 100644 --- a/lib/stm32/usart.c +++ b/lib/stm32/usart.c @@ -47,15 +47,16 @@ void usart_set_baudrate(u32 usart, u32 baud) #endif */ - /* yes it is as simple as that. The reference manual is - * talking about factional calculation but it seems to be only - * marketting bable to sound awesome. It is nothing else but a - * simple divider to generate the correct baudrate. >_< If I - * am wrong feel free to correct me on that. :) (esden) - * - * Changed to round rather than floor (Fergus) + /* + * Yes it is as simple as that. The reference manual is + * talking about fractional calculation but it seems to be only + * marketting babble to sound awesome. It is nothing else but a + * simple divider to generate the correct baudrate. + * + * Note: We round() the value rather than floor()ing it, for more + * accurate divisor selection. */ - USART_BRR(usart) = (2*clock + baud) / (2*baud); + USART_BRR(usart) = ((2 * clock) + baud) / (2 * baud); } void usart_set_databits(u32 usart, u32 bits) @@ -151,21 +152,20 @@ u16 usart_recv_blocking(u32 usart) void usart_enable_rx_dma(u32 usart) { - USART_CR3(usart) |= USART_CR3_DMAR; + USART_CR3(usart) |= USART_CR3_DMAR; } void usart_disable_rx_dma(u32 usart) { - USART_CR3(usart) &= ~USART_CR3_DMAR; + USART_CR3(usart) &= ~USART_CR3_DMAR; } void usart_enable_tx_dma(u32 usart) { - USART_CR3(usart) |= USART_CR3_DMAT; + USART_CR3(usart) |= USART_CR3_DMAT; } void usart_disable_tx_dma(u32 usart) { - USART_CR3(usart) &= ~USART_CR3_DMAT; + USART_CR3(usart) &= ~USART_CR3_DMAT; } - -- cgit v1.2.3