diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-09 16:35:13 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-09 16:40:58 -0400 |
| commit | 868fb1c273e562a1140abfa948022c9d4f55bccf (patch) | |
| tree | 73067aa8cf6f8bd0d7663a634c1f878a78b567ed /libmaple/gpio.c | |
| parent | 47c53377292a4db28057fc6394c928cde3727e97 (diff) | |
| download | librambutan-868fb1c273e562a1140abfa948022c9d4f55bccf.tar.gz librambutan-868fb1c273e562a1140abfa948022c9d4f55bccf.zip | |
Reverting commits between `git merge-head master refactor` and master.
This is a combination of 11 revert commits, and allows for a clean
merge of the work done in the refactor branch.
The combined commit messages follow.
Revert "Committing basic ring_buffer test."
This reverts commit 987fa5f433e0cd41b1621dad8b4e331cf82d49f3.
Revert "qa-slave-shield.cpp and test-session.cpp fixes for Mini and RET6 Edition."
This reverts commit cdd367bdd264c9e19180032c119850fbba2115ba.
Revert "Brought examples/ up to date; PIN_MAP bugfix for D24."
This reverts commit b4c2d4514c6d52cac8a649c5d5c24b68a3c0a416.
Revert "Separated GPIO config to a separate FSMC routine."
This reverts commit 744848ad0fc33eed66acc44e41c3c9d646c5b100.
Revert "Slightly faster RAM writes (6.5MHz)."
This reverts commit 8ba0b6bb065acb4aff26bc9c838de5f37515caf1.
Revert "FSMC working but slow (~6 MHz)."
This reverts commit 0dc9490cf4f4f10a23b08fef1728773f10c1b76a.
Revert "Maple Mini ERROR_LED_PIN fix."
This reverts commit 07d437706840901db1e09ff0ab88229c67c1fa8a.
Revert "Fixing USBSerial::read(void*, uint32) return value (thanks, Crenn!)"
This reverts commit 3ba7196712a5bfe4fe1166b6c34d49c3d7254568.
Revert "Trivial gpio_init() bugfix"
This reverts commit f6ce003bb935f26eeefa54acf7c2ae6afaabd871.
Revert "Trivial changes to test-session.cpp"
This reverts commit a32a37b121ac7e62660d2a83fe67c857fe705122.
Revert ".gitignore: Ignore cscope* files"
This reverts commit d8c72c17bd6d7416a0846e69f4f5ae5cb229d58e.
Diffstat (limited to 'libmaple/gpio.c')
| -rw-r--r-- | libmaple/gpio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmaple/gpio.c b/libmaple/gpio.c index 0ebc130..71e5230 100644 --- a/libmaple/gpio.c +++ b/libmaple/gpio.c @@ -34,13 +34,9 @@ void gpio_init(void) { rcc_clk_enable(RCC_GPIOA); rcc_clk_enable(RCC_GPIOB); rcc_clk_enable(RCC_GPIOC); -#if NR_GPIO_PORTS >= 4 - /* Maple, but not Maple Mini (D0 and D1 are used for OSC on Mini, - and those are the only Port D pins). */ +#if NR_GPIO_PORTS >= 4 /* Maple, but not Maple Mini */ rcc_clk_enable(RCC_GPIOD); -#endif -#if NR_GPIO_PORTS >= 7 - /* Maple Native (high density only) */ +#elif NR_GPIO_PORTS >= 7 /* Maple Native (high density only) */ rcc_clk_enable(RCC_GPIOE); rcc_clk_enable(RCC_GPIOF); rcc_clk_enable(RCC_GPIOG); |