Add comment and reorder the includes. Move gpio structure to specific header file.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4126 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/drv/gpio_stm32.c b/bertos/cpu/cortex-m3/drv/gpio_stm32.c
index f15145a41ddcdc51a87ffac022bf99d56eaaff54..552d15b6f39b9f3511b528d90286fdac46e792de 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/gpio_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/gpio_stm32.c
@@ -35,10 +35,13 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
+#include "gpio_stm32.h"
+
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
+
 #include <io/stm32.h>
-#include "gpio_stm32.h"
+
 
 /**
  * Configure a GPIO pin

diff --git a/bertos/cpu/cortex-m3/drv/gpio_stm32.h b/bertos/cpu/cortex-m3/drv/gpio_stm32.h
index 4d09db477c7988fef31e9b815dfa0a31411079d0..1314bfdb5cf0f18d01ba5611143094e6e00178d2 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/gpio_stm32.h
+++ b/bertos/cpu/cortex-m3/drv/gpio_stm32.h
@@ -38,22 +38,10 @@
 
 #include <io/stm32.h>
 
-/* GPIO configuration registers structure */
-struct stm32_gpio
-{
-       reg32_t CRL;
-       reg32_t CRH;
-       reg32_t IDR;
-       reg32_t ODR;
-       reg32_t BSRR;
-       reg32_t BRR;
-       reg32_t LCKR;
-};
-
 /**
  * GPIO mode
+ * \{
  */
-/*\{*/
 enum
 {
        GPIO_MODE_AIN = 0x0,
@@ -69,8 +57,8 @@ enum
 
 /**
  * GPIO speed
+ *\{
  */
-/*\{*/
 enum
 {
        GPIO_SPEED_10MHZ = 1,
@@ -79,9 +67,14 @@ enum
 };
 /*\}*/
 
-/* Write a value to the specified pin(s) */
-INLINE void
-stm32_gpioPinWrite(struct stm32_gpio *base, uint32_t pins, uint8_t val)
+/**
+ * Write a value to the specified pin(s)
+ *
+ * \param base gpio register address
+ * \param pins mask of pins that we want set or clear
+ * \param val true to set selected pins of false to clear they.
+ */
+INLINE void stm32_gpioPinWrite(struct stm32_gpio *base, uint32_t pins, bool val)
 {
        if (val)
                base->BSRR |= pins;
@@ -89,14 +82,25 @@ stm32_gpioPinWrite(struct stm32_gpio *base, uint32_t pins, uint8_t val)
                base->BRR  |= pins;
 }
 
-/* Read a value from the specified pin(s) */
+/**
+ * Read a value from the specified pin(s)
+ *
+ * \param base gpio register address
+ * \param pins mask of pins that we want read
+ */
 INLINE uint8_t stm32_gpioPinRead(struct stm32_gpio *base, uint32_t pins)
 {
        return !!(base->IDR & pins);
 }
 
-/* Initialize a GPIO peripheral configuration */
-int stm32_gpioPinConfig(struct stm32_gpio *base,
-                       uint16_t pins, uint8_t mode, uint8_t speed);
+/**
+ * Initialize a GPIO peripheral configuration
+ *
+ * \param base gpio register address
+ * \param pins mask of pins that we want to configure
+ * \param mode select the behaviour of selected pins
+ * \param speed clock frequency for selected gpio ports
+ */
+int stm32_gpioPinConfig(struct stm32_gpio *base, uint16_t pins, uint8_t mode, uint8_t speed);
 
 #endif /* GPIO_STM32_H */

diff --git a/bertos/cpu/cortex-m3/io/stm32_gpio.h b/bertos/cpu/cortex-m3/io/stm32_gpio.h
new file mode 100644 (file)
index 0000000..71a6094
--- /dev/null
+++ b/bertos/cpu/cortex-m3/io/stm32_gpio.h
@@ -0,0 +1,55 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief STM32F103xx GPIO definition.
+ */
+
+#ifndef STM32_GPIO_H
+#define STM32_GPIO_H
+
+#include <cpu/types.h>
+
+/**
+ * GPIO configuration registers structure
+ */
+struct stm32_gpio
+{
+       reg32_t CRL;
+       reg32_t CRH;
+       reg32_t IDR;
+       reg32_t ODR;
+       reg32_t BSRR;
+       reg32_t BRR;
+       reg32_t LCKR;
+};
+
+#endif /* STM32_GPIO_H */