From d2ad7231c09c16d94d5f85096caf2332fc9fc291 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sun, 11 Nov 2012 17:58:41 +0100 Subject: digital/ucoolib/ucoolib/hal/gpio: add GPIO --- digital/ucoolib/ucoolib/hal/gpio/Module | 1 + digital/ucoolib/ucoolib/hal/gpio/gpio.hh | 33 +++++++++ digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.cc | 85 ++++++++++++++++++++++ digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.hh | 67 +++++++++++++++++ digital/ucoolib/ucoolib/hal/gpio/test/Makefile | 9 +++ digital/ucoolib/ucoolib/hal/gpio/test/test_gpio.cc | 72 ++++++++++++++++++ digital/ucoolib/ucoolib/intf/io.hh | 54 ++++++++++++++ 7 files changed, 321 insertions(+) create mode 100644 digital/ucoolib/ucoolib/hal/gpio/Module create mode 100644 digital/ucoolib/ucoolib/hal/gpio/gpio.hh create mode 100644 digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.cc create mode 100644 digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.hh create mode 100644 digital/ucoolib/ucoolib/hal/gpio/test/Makefile create mode 100644 digital/ucoolib/ucoolib/hal/gpio/test/test_gpio.cc create mode 100644 digital/ucoolib/ucoolib/intf/io.hh diff --git a/digital/ucoolib/ucoolib/hal/gpio/Module b/digital/ucoolib/ucoolib/hal/gpio/Module new file mode 100644 index 00000000..34c77fd8 --- /dev/null +++ b/digital/ucoolib/ucoolib/hal/gpio/Module @@ -0,0 +1 @@ +hal_gpio_SOURCES = gpio.stm32f4.cc diff --git a/digital/ucoolib/ucoolib/hal/gpio/gpio.hh b/digital/ucoolib/ucoolib/hal/gpio/gpio.hh new file mode 100644 index 00000000..721d6383 --- /dev/null +++ b/digital/ucoolib/ucoolib/hal/gpio/gpio.hh @@ -0,0 +1,33 @@ +#ifndef ucoolib_hal_gpio_gpio_hh +#define ucoolib_hal_gpio_gpio_hh +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2012 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} + +#ifdef TARGET_stm32f4 +# include "gpio.stm32f4.hh" +#else +# error "not implemented for this target" +#endif + +#endif // ucoolib_hal_gpio_gpio_hh diff --git a/digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.cc b/digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.cc new file mode 100644 index 00000000..60f540c8 --- /dev/null +++ b/digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.cc @@ -0,0 +1,85 @@ +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2012 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} +#include "gpio.stm32f4.hh" + +namespace ucoo { + +void +Gpio::set () +{ + GPIO_BSRR (port_) = mask_; +} + +void +Gpio::reset () +{ + GPIO_BSRR (port_) = mask_ << 16; +} + +/// Helper to avoid virtual dance. +static inline void +Gpio_set (uint32_t port, uint16_t mask, bool state) +{ + if (state) + GPIO_BSRR (port) = mask; + else + GPIO_BSRR (port) = mask << 16; +} + +void +Gpio::set (bool state) +{ + Gpio_set (port_, mask_, state); +} + +void +Gpio::toggle () +{ + // Avoid read/modify/write ODR, to achieve atomic operation. + Gpio_set (port_, mask_, !(GPIO_ODR (port_) & mask_)); +} + +bool +Gpio::get () const +{ + return GPIO_IDR (port_) & mask_; +} + +void +Gpio::input () +{ + uint32_t mask = mask_; + uint32_t dmask = mask * mask; + GPIO_MODER (port_) &= ~(dmask | dmask << 1); +} + +void +Gpio::output () +{ + uint32_t mask = mask_; + uint32_t dmask = mask * mask; + GPIO_MODER (port_) = (GPIO_MODER (port_) & ~(dmask << 1)) | dmask; +} + +} // namespace ucoo diff --git a/digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.hh b/digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.hh new file mode 100644 index 00000000..75727c34 --- /dev/null +++ b/digital/ucoolib/ucoolib/hal/gpio/gpio.stm32f4.hh @@ -0,0 +1,67 @@ +#ifndef ucoolib_hal_gpio_gpio_stm32f4_hh +#define ucoolib_hal_gpio_gpio_stm32f4_hh +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2012 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} +#include "ucoolib/intf/io.hh" + +#include + +namespace ucoo { + +/// General purpose input/output on STM32F4. +class Gpio : public Io +{ + public: + /// Constructor, take the PORT base address, and pin BIT number. + Gpio (uint32_t port, int bit); + /// See Io::set. + void set (); + /// See Io::reset. + void reset (); + /// See Io::set. + void set (bool state); + /// See Io::toggle. + void toggle (); + /// See Io::get. + bool get () const; + /// See Io::input. + void input (); + /// See Io::output. + void output (); + private: + /// Port register base address. + const uint32_t port_; + /// IO bitmask. + const uint16_t mask_; +}; + +inline +Gpio::Gpio (uint32_t port, int bit) + : port_ (port), mask_ (1u << bit) +{ +} + +} // namespace ucoo + +#endif // ucoolib_hal_gpio_gpio_stm32f4_hh diff --git a/digital/ucoolib/ucoolib/hal/gpio/test/Makefile b/digital/ucoolib/ucoolib/hal/gpio/test/Makefile new file mode 100644 index 00000000..e2f76925 --- /dev/null +++ b/digital/ucoolib/ucoolib/hal/gpio/test/Makefile @@ -0,0 +1,9 @@ +BASE = ../../../.. + +TARGETS = stm32f4 +stm32f4_PROGS = test_gpio +test_gpio_SOURCES = test_gpio.cc + +MODULES = hal/gpio utils + +include $(BASE)/build/top.mk diff --git a/digital/ucoolib/ucoolib/hal/gpio/test/test_gpio.cc b/digital/ucoolib/ucoolib/hal/gpio/test/test_gpio.cc new file mode 100644 index 00000000..ca1dae36 --- /dev/null +++ b/digital/ucoolib/ucoolib/hal/gpio/test/test_gpio.cc @@ -0,0 +1,72 @@ +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2012 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} +#include "ucoolib/arch/arch.hh" +#include "ucoolib/hal/gpio/gpio.hh" +#include "ucoolib/utils/delay.hh" + +#include +#include + +void +test (ucoo::Io &loop_out, ucoo::Io &loop_in, ucoo::Io &led3, ucoo::Io &led4, + ucoo::Io &led5, ucoo::Io &led6) +{ + loop_in.input (); + loop_out.output (); + led3.output (); + led4.output (); + led5.output (); + led6.output (); + led3.set (); + led6.reset (); + bool state = false; + while (1) + { + led3.toggle (); + led4.set (state); + led5.set (loop_in.get ()); + led6.toggle (); + state = !state; + loop_out.set (state); + ucoo::delay (1); + } +} + +int +main (int argc, const char **argv) +{ + ucoo::arch_init (argc, argv); + rcc_peripheral_enable_clock (&RCC_AHB1ENR, RCC_AHB1ENR_IOPBEN + | RCC_AHB1ENR_IOPDEN); + // For this test, shorten B6 & B7 to have loopback. + gpio_mode_setup (GPIOB, GPIO_MODE_INPUT, GPIO_PUPD_PULLUP, GPIO7); + ucoo::Gpio loop_out (GPIOB, 6); + ucoo::Gpio loop_in (GPIOB, 7); + ucoo::Gpio led3 (GPIOD, 13); + ucoo::Gpio led4 (GPIOD, 12); + ucoo::Gpio led5 (GPIOD, 14); + ucoo::Gpio led6 (GPIOD, 15); + test (loop_out, loop_in, led3, led4, led5, led6); + return 0; +} diff --git a/digital/ucoolib/ucoolib/intf/io.hh b/digital/ucoolib/ucoolib/intf/io.hh new file mode 100644 index 00000000..ebb5e75e --- /dev/null +++ b/digital/ucoolib/ucoolib/intf/io.hh @@ -0,0 +1,54 @@ +#ifndef ucoolib_ucoolib_intf_io_hh +#define ucoolib_ucoolib_intf_io_hh +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2012 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} + +namespace ucoo { + +/// One bit input/output interface. +class Io +{ + public: + /// Set output to 1. + virtual void set () = 0; + /// Reset output to 0. + virtual void reset () = 0; + /// Set or reset output. + virtual void set (bool state) = 0; + /// Toggle output. + virtual void toggle () = 0; + /// Get input state (not the same as output latch!). + virtual bool get () const = 0; + /// Set as input. + virtual void input () = 0; + /// Set as output. + virtual void output () = 0; + protected: + /// Default constructor. + Io () { } +}; + +} // namespace ucoo + +#endif // ucoolib_ucoolib_intf_io_hh -- cgit v1.2.3