From b6674cd738cc22e61ea34cb659750ef45ce01df4 Mon Sep 17 00:00:00 2001 From: iperry Date: Fri, 25 Dec 2009 08:39:24 +0000 Subject: 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 --- src/lib/gpio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/lib/gpio.c') 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; -- cgit v1.2.3