diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-15 22:29:45 -0500 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-16 01:17:21 -0500 |
commit | 2764748208816043a3149eae3a433d02325a1a36 (patch) | |
tree | cc5afb0af0c6f1d2282db08d3dad1dae9b4d33e6 /libmaple/rcc.h | |
parent | 1fb0e0d727089e23d4b30e1efba5410dc4b4da14 (diff) | |
parent | 620740bf1986311041a40bd2992d1b549f84b2ba (diff) | |
download | librambutan-2764748208816043a3149eae3a433d02325a1a36.tar.gz librambutan-2764748208816043a3149eae3a433d02325a1a36.zip |
Merge branch 'nzmichaelh-master' into master.
This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs.
Conflicts:
libmaple/adc.h
libmaple/libmaple.h
libmaple/ring_buffer.h
Diffstat (limited to 'libmaple/rcc.h')
-rw-r--r-- | libmaple/rcc.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libmaple/rcc.h b/libmaple/rcc.h index a12f4b4..4b1f35d 100644 --- a/libmaple/rcc.h +++ b/libmaple/rcc.h @@ -30,6 +30,10 @@ #ifndef _RCC_H_ #define _RCC_H_ +#ifdef __cplusplus +extern "C"{ +#endif + /* registers */ #define RCC_BASE 0x40021000 #define RCC_CR (RCC_BASE + 0x0) @@ -155,8 +159,8 @@ enum { RCC_USART1, RCC_USART2, RCC_USART3, - RCC_USART4, // High-density devices only (Maple Native) - RCC_USART5, // High-density devices only (Maple Native) + RCC_UART4, // High-density devices only (Maple Native) + RCC_UART5, // High-density devices only (Maple Native) RCC_TIMER1, RCC_TIMER2, RCC_TIMER3, @@ -169,6 +173,8 @@ enum { RCC_SPI2, RCC_FSMC, // High-density devices only (Maple Native) RCC_DAC, // High-density devices only (Maple Native) + RCC_DMA1, + RCC_DMA2, // High-density devices only (Maple Native) }; @@ -177,5 +183,8 @@ void rcc_clk_enable(uint32 dev); void rcc_reset_dev(uint32 dev); void rcc_set_prescaler(uint32 prescaler, uint32 divider); +#ifdef __cplusplus +} // extern "C" #endif +#endif |