diff options
| author | iperry <iperry@749a229e-a60e-11de-b98f-4500b42dc123> | 2009-12-25 08:39:24 +0000 |
|---|---|---|
| committer | iperry <iperry@749a229e-a60e-11de-b98f-4500b42dc123> | 2009-12-25 08:39:24 +0000 |
| commit | b6674cd738cc22e61ea34cb659750ef45ce01df4 (patch) | |
| tree | bfee2ae84883c32871ee13a6e0f346f144263cf6 /src/lib/gpio.c | |
| parent | 3bb04834ffd3f90dc9015997ea11a56d9d150099 (diff) | |
| download | librambutan-b6674cd738cc22e61ea34cb659750ef45ce01df4.tar.gz librambutan-b6674cd738cc22e61ea34cb659750ef45ce01df4.zip | |
Fixed delayMicroseconds, changed serial interface, added an (untested) runtime check for pwm/serial collision, moved more headers around.
git-svn-id: https://leaflabs.googlecode.com/svn/trunk/library@79 749a229e-a60e-11de-b98f-4500b42dc123
Diffstat (limited to 'src/lib/gpio.c')
| -rw-r--r-- | src/lib/gpio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/gpio.c b/src/lib/gpio.c index 1e42d4d..f03c4fa 100644 --- a/src/lib/gpio.c +++ b/src/lib/gpio.c @@ -23,10 +23,6 @@ * @brief GPIO initialization routine */ -#ifndef _GPIO_H_ -#define _GPIO_H_ - -#endif #include "libmaple.h" #include "stm32f10x_rcc.h" #include "gpio.h" @@ -36,11 +32,11 @@ void gpio_init(void) { RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA | RCC_APB2Periph_GPIOB | RCC_APB2Periph_GPIOC | - RCC_APB2Periph_AFIO, + RCC_APB2Periph_AFIO, ENABLE); } -void gpio_set_mode(GPIO_Port* port, uint8_t gpio_pin, uint8_t mode) { +void gpio_set_mode(GPIO_Port* port, uint8 gpio_pin, uint8 mode) { uint32_t tmp; uint32_t shift = POS(gpio_pin % 8); GPIOReg CR; |