From 70746ccd676445481511c0e8bc6b617f7b052878 Mon Sep 17 00:00:00 2001 From: Ken Sarkies Date: Sun, 11 Nov 2012 11:02:17 +1030 Subject: Change to make L1 series fit with common files --- include/libopencm3/stm32/gpio.h | 2 + include/libopencm3/stm32/l1/gpio.h | 81 ++++++++++++------- lib/stm32/gpio2.c | 157 ------------------------------------- lib/stm32/l1/Makefile | 5 +- lib/stm32/l1/gpio.c | 28 +++++++ 5 files changed, 86 insertions(+), 187 deletions(-) delete mode 100644 lib/stm32/gpio2.c create mode 100644 lib/stm32/l1/gpio.c diff --git a/include/libopencm3/stm32/gpio.h b/include/libopencm3/stm32/gpio.h index 8037cd2..c106a09 100644 --- a/include/libopencm3/stm32/gpio.h +++ b/include/libopencm3/stm32/gpio.h @@ -23,6 +23,8 @@ # include #elif defined(STM32F4) # include +#elif defined(STM32L1) +# include #else # error "stm32 family not defined." #endif diff --git a/include/libopencm3/stm32/l1/gpio.h b/include/libopencm3/stm32/l1/gpio.h index a39c9f6..93850a2 100644 --- a/include/libopencm3/stm32/l1/gpio.h +++ b/include/libopencm3/stm32/l1/gpio.h @@ -1,3 +1,19 @@ +/** @defgroup gpio_defines GPIO Defines + +@brief Defined Constants and Types for the STM32L1xx General Purpose I/O + +@ingroup STM32L1xx_defines + +@version 1.0.0 + +@author @htmlonly © @endhtmlonly 2009 Uwe Hermann +@author @htmlonly © @endhtmlonly 2012 Piotr Esden-Tempski +@author @htmlonly © @endhtmlonly 2012 Karl Palsson + +@date 1 July 2012 + +LGPL License Terms @ref lgpl_license + */ /* * This file is part of the libopencm3 project. * @@ -19,40 +35,29 @@ * along with this library. If not, see . */ +/**@{*/ + #ifndef LIBOPENCM3_GPIO_H #define LIBOPENCM3_GPIO_H #include -#include +#include /* --- Convenience macros -------------------------------------------------- */ /* GPIO port base addresses (for convenience) */ +/* GPIO port base addresses (for convenience) */ +/** @defgroup gpio_port_id GPIO Port IDs +@ingroup gpio_defines + +@{*/ #define GPIOA GPIO_PORT_A_BASE #define GPIOB GPIO_PORT_B_BASE #define GPIOC GPIO_PORT_C_BASE #define GPIOD GPIO_PORT_D_BASE #define GPIOE GPIO_PORT_E_BASE #define GPIOH GPIO_PORT_H_BASE - -/* GPIO number definitions (for convenience) */ -#define GPIO0 (1 << 0) -#define GPIO1 (1 << 1) -#define GPIO2 (1 << 2) -#define GPIO3 (1 << 3) -#define GPIO4 (1 << 4) -#define GPIO5 (1 << 5) -#define GPIO6 (1 << 6) -#define GPIO7 (1 << 7) -#define GPIO8 (1 << 8) -#define GPIO9 (1 << 9) -#define GPIO10 (1 << 10) -#define GPIO11 (1 << 11) -#define GPIO12 (1 << 12) -#define GPIO13 (1 << 13) -#define GPIO14 (1 << 14) -#define GPIO15 (1 << 15) -#define GPIO_ALL 0xffff +/**@}*/ /* --- GPIO registers ------------------------------------------------------ */ @@ -150,31 +155,49 @@ #define GPIO_MODE(n, mode) (mode << (2 * (n))) #define GPIO_MODE_MASK(n) (0x3 << (2 * (n))) +/** @defgroup gpio_mode GPIO Pin Direction and Analog/Digital Mode +@ingroup gpio_defines +@{*/ #define GPIO_MODE_INPUT 0x00 /* Default */ #define GPIO_MODE_OUTPUT 0x01 #define GPIO_MODE_AF 0x02 #define GPIO_MODE_ANALOG 0x03 +/**@}*/ /* --- GPIOx_OTYPER values -------------------------------------------- */ /* Output type (OTx values) */ +/** @defgroup gpio_output_type GPIO Output Pin Driver Type +@ingroup gpio_defines +@list Push Pull +@list Open Drain +@{*/ #define GPIO_OTYPE_PP 0x0 #define GPIO_OTYPE_OD 0x1 +/**@}*/ /* Output speed values */ #define GPIO_OSPEED(n, speed) (speed << (2 * (n))) #define GPIO_OSPEED_MASK(n) (0x3 << (2 * (n))) +/** @defgroup gpio_speed GPIO Output Pin Speed +@ingroup gpio_defines +@{*/ #define GPIO_OSPEED_400KHZ 0x0 #define GPIO_OSPEED_2MHZ 0x1 #define GPIO_OSPEED_10MHZ 0x2 #define GPIO_OSPEED_40MHZ 0x3 +/**@}*/ /* --- GPIOx_PUPDR values ------------------------------------------- */ #define GPIO_PUPD(n, pupd) (pupd << (2 * (n))) #define GPIO_PUPD_MASK(n) (0x3 << (2 * (n))) +/** @defgroup gpio_pup GPIO Output Pin Pullup +@ingroup gpio_defines +@{*/ #define GPIO_PUPD_NONE 0x0 #define GPIO_PUPD_PULLUP 0x1 #define GPIO_PUPD_PULLDOWN 0x2 +/**@}*/ /* --- GPIO_IDR values ----------------------------------------------------- */ @@ -201,6 +224,9 @@ #define GPIO_AFR(n, af) (af << ((n) * 4)) #define GPIO_AFR_MASK(n) (0xf << ((n) * 4)) +/** @defgroup gpio_af_num Alternate Function Pin Selection +@ingroup gpio_defines +@{*/ #define GPIO_AF0 0x0 #define GPIO_AF1 0x1 #define GPIO_AF2 0x2 @@ -217,11 +243,15 @@ #define GPIO_AF13 0xd #define GPIO_AF14 0xe #define GPIO_AF15 0xf +/**@}*/ /* --- Function prototypes ------------------------------------------------- */ +BEGIN_DECLS + /* * L1, like F2 and F4, has the "new" GPIO peripheral, so use that style + * however the number of ports is reduced and H port naming is different. * TODO: this should all really be moved to a "common" gpio header */ @@ -229,13 +259,8 @@ void gpio_mode_setup(u32 gpioport, u8 mode, u8 pull_up_down, u16 gpios); void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios); void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios); -/* F1 compatible api */ -void gpio_set(u32 gpioport, u16 gpios); -void gpio_clear(u32 gpioport, u16 gpios); -u16 gpio_get(u32 gpioport, u16 gpios); -void gpio_toggle(u32 gpioport, u16 gpios); -u16 gpio_port_read(u32 gpioport); -void gpio_port_write(u32 gpioport, u16 data); -void gpio_port_config_lock(u32 gpioport, u16 gpios); +END_DECLS #endif +/**@}*/ + diff --git a/lib/stm32/gpio2.c b/lib/stm32/gpio2.c deleted file mode 100644 index 5246ecb..0000000 --- a/lib/stm32/gpio2.c +++ /dev/null @@ -1,157 +0,0 @@ -/** @defgroup gpio_file GPIO - -@ingroup STM32F2xx - -@brief libopencm3 STM32F2xx General Purpose I/O - -*/ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#if defined(STM32F2) -#include -#elif defined(STM32F4) -#include -#elif defined(STM32L1) -#include -#else -#error "invalid/unknown stm32 family for this code" -#endif - -void gpio_mode_setup(u32 gpioport, u8 mode, u8 pull_up_down, u16 gpios) -{ - u16 i; - u32 moder, pupd; - - /* - * We want to set the config only for the pins mentioned in gpios, - * but keeping the others, so read out the actual config first. - */ - moder = GPIO_MODER(gpioport); - pupd = GPIO_PUPDR(gpioport); - - for (i = 0; i < 16; i++) { - if (!((1 << i) & gpios)) - continue; - - moder &= ~GPIO_MODE_MASK(i); - moder |= GPIO_MODE(i, mode); - pupd &= ~GPIO_PUPD_MASK(i); - pupd |= GPIO_PUPD(i, pull_up_down); - } - - /* Set mode and pull up/down control registers. */ - GPIO_MODER(gpioport) = moder; - GPIO_PUPDR(gpioport) = pupd; -} - -void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios) -{ - u16 i; - u32 ospeedr; - - if (otype == 0x1) - GPIO_OTYPER(gpioport) |= gpios; - else - GPIO_OTYPER(gpioport) &= ~gpios; - - ospeedr = GPIO_OSPEEDR(gpioport); - - for (i = 0; i < 16; i++) { - if (!((1 << i) & gpios)) - continue; - ospeedr &= ~GPIO_OSPEED_MASK(i); - ospeedr |= GPIO_OSPEED(i, speed); - } - - GPIO_OSPEEDR(gpioport) = ospeedr; -} - -void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios) -{ - u16 i; - u32 afrl, afrh; - - afrl = GPIO_AFRL(gpioport); - afrh = GPIO_AFRH(gpioport); - - for (i = 0; i < 8; i++) { - if (!((1 << i) & gpios)) - continue; - afrl &= ~GPIO_AFR_MASK(i); - afrl |= GPIO_AFR(i, alt_func_num); - } - - for (i = 8; i < 16; i++) { - if (!((1 << i) & gpios)) - continue; - afrh &= ~GPIO_AFR_MASK(i - 8); - afrh |= GPIO_AFR(i - 8, alt_func_num); - } - - GPIO_AFRL(gpioport) = afrl; - GPIO_AFRH(gpioport) = afrh; -} - -void gpio_set(u32 gpioport, u16 gpios) -{ - GPIO_BSRR(gpioport) = gpios; -} - -void gpio_clear(u32 gpioport, u16 gpios) -{ - GPIO_BSRR(gpioport) = gpios << 16; -} - -u16 gpio_get(u32 gpioport, u16 gpios) -{ - return gpio_port_read(gpioport) & gpios; -} - -void gpio_toggle(u32 gpioport, u16 gpios) -{ - GPIO_ODR(gpioport) ^= gpios; -} - -u16 gpio_port_read(u32 gpioport) -{ - return (u16)GPIO_IDR(gpioport); -} - -void gpio_port_write(u32 gpioport, u16 data) -{ - GPIO_ODR(gpioport) = data; -} - -void gpio_port_config_lock(u32 gpioport, u16 gpios) -{ - u32 reg32; - - /* Special "Lock Key Writing Sequence", see datasheet. */ - GPIO_LCKR(gpioport) = GPIO_LCKK | gpios; /* Set LCKK. */ - GPIO_LCKR(gpioport) = ~GPIO_LCKK & gpios; /* Clear LCKK. */ - GPIO_LCKR(gpioport) = GPIO_LCKK | gpios; /* Set LCKK. */ - reg32 = GPIO_LCKR(gpioport); /* Read LCKK. */ - reg32 = GPIO_LCKR(gpioport); /* Read LCKK again. */ - - /* Tell the compiler the variable is actually used. It will get optimized out anyways. */ - reg32 = reg32; - - /* If (reg32 & GPIO_LCKK) is true, the lock is now active. */ -} - diff --git a/lib/stm32/l1/Makefile b/lib/stm32/l1/Makefile index 9e07b2d..7f3e157 100644 --- a/lib/stm32/l1/Makefile +++ b/lib/stm32/l1/Makefile @@ -28,9 +28,10 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -DSTM32L1 # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = rcc.o gpio2.o desig.o crc.o usart.o exti2.o +OBJS = rcc.o gpio.o desig.o crc.o usart.o exti2.o \ + gpio_common_all.o gpio_common_f24.o -VPATH += ../../usb:../:../../cm3 +VPATH += ../../usb:../:../../cm3:../common include ../../Makefile.include diff --git a/lib/stm32/l1/gpio.c b/lib/stm32/l1/gpio.c new file mode 100644 index 0000000..7fc2012 --- /dev/null +++ b/lib/stm32/l1/gpio.c @@ -0,0 +1,28 @@ +/** @defgroup gpio_file GPIO + +@ingroup STM32L1xx + +@brief libopencm3 STM32L1xx General Purpose I/O + +*/ + +/* + * This file is part of the libopencm3 project. + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +#include +#include + -- cgit v1.2.3