From 9fea26e455c47bc2e59b494ae09422684493601e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 8 Nov 2012 14:54:41 -0500 Subject: stm32/usart: Add enable_/disable_error_interrupt --- include/libopencm3/stm32/usart.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/libopencm3') diff --git a/include/libopencm3/stm32/usart.h b/include/libopencm3/stm32/usart.h index 088e67b..9994002 100644 --- a/include/libopencm3/stm32/usart.h +++ b/include/libopencm3/stm32/usart.h @@ -371,6 +371,8 @@ void usart_enable_rx_interrupt(u32 usart); void usart_disable_rx_interrupt(u32 usart); void usart_enable_tx_interrupt(u32 usart); void usart_disable_tx_interrupt(u32 usart); +void usart_enable_error_interrupt(u32 usart); +void usart_disable_error_interrupt(u32 usart); bool usart_get_flag(u32 usart, u32 flag); bool usart_get_interrupt_source(u32 usart, u32 flag); -- cgit v1.2.3 From a43f1d0844447416a5ede0dcf76fd5b2d1d96d23 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 13 Nov 2012 16:44:52 -0500 Subject: stm32/f4/memorymap.h: Fix ADC offsets --- include/libopencm3/stm32/f4/memorymap.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/libopencm3') diff --git a/include/libopencm3/stm32/f4/memorymap.h b/include/libopencm3/stm32/f4/memorymap.h index 0a22ad4..7625838 100644 --- a/include/libopencm3/stm32/f4/memorymap.h +++ b/include/libopencm3/stm32/f4/memorymap.h @@ -75,8 +75,9 @@ #define USART6_BASE (PERIPH_BASE_APB2 + 0x1400) /* PERIPH_BASE_APB2 + 0x1800 (0x4001 1800 - 0x4001 1FFF): Reserved */ #define ADC1_BASE (PERIPH_BASE_APB2 + 0x2000) -#define ADC2_BASE (PERIPH_BASE_APB2 + 0x2000) -#define ADC3_BASE (PERIPH_BASE_APB2 + 0x2000) +#define ADC2_BASE (PERIPH_BASE_APB2 + 0x2100) +#define ADC3_BASE (PERIPH_BASE_APB2 + 0x2200) +#define ADC_COMMON_BASE (PERIPH_BASE_APB2 + 0x2300) /* PERIPH_BASE_APB2 + 0x2400 (0x4001 2400 - 0x4001 27FF): Reserved */ #define SDIO_BASE (PERIPH_BASE_APB2 + 0x2800) /* PERIPH_BASE_APB2 + 0x2C00 (0x4001 2C00 - 0x4001 2FFF): Reserved */ -- cgit v1.2.3