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/libmaple.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/libmaple.h')
| -rw-r--r-- | libmaple/libmaple.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h index 225d7c4..dbc77a4 100644 --- a/libmaple/libmaple.h +++ b/libmaple/libmaple.h @@ -52,6 +52,9 @@ /* Total number of GPIO pins */ #define NR_GPIO_PINS 39 + /* Number of 16-bit backup registers */ + #define NR_BKP_REGS 10 + /* Number of timer devices ports, definitely used */ #define NR_TIMERS 4 @@ -103,6 +106,7 @@ #define NR_GPIO_PORTS 7 #define NR_GPIO_PINS 100 + #define NR_BKP_REGS 42 /* TODO test on Native */ #define NR_TIMERS 8 #define NR_USART 5 /* NB: 4 and 5 are UART only */ #define NR_FSMC 1 @@ -140,6 +144,7 @@ #define NR_GPIO_PORTS 3 #define NR_GPIO_PINS 34 + #define NR_BKP_REGS 10 /* TODO test on Mini */ #define NR_TIMERS 4 #define NR_USART 3 #define NR_FSMC 0 |