stm: Upgrade ST peripheral library from 1.1.0 to 1.3.0.

1 files changed, 61 insertions, 35 deletions

diff --git a/stm/lib/stm32f4xx_gpio.c b/stm/lib/stm32f4xx_gpio.c
index bdd91e6656..c099e948ef 100644
--- a/stm/lib/stm32f4xx_gpio.c
+++ b/stm/lib/stm32f4xx_gpio.c
@@ -2,8 +2,8 @@
   ******************************************************************************

   * @file    stm32f4xx_gpio.c

   * @author  MCD Application Team

-  * @version V1.1.0

-  * @date    11-January-2013

+  * @version V1.3.0

+  * @date    08-November-2013

   * @brief   This file provides firmware functions to manage the following 

   *          functionalities of the GPIO peripheral:           

   *           + Initialization and Configuration

@@ -81,7 +81,6 @@
   */

 

 /* Includes ------------------------------------------------------------------*/

-#include "stm32f4xx_conf.h"

 #include "stm32f4xx_gpio.h"

 #include "stm32f4xx_rcc.h"

 

@@ -120,8 +119,9 @@
 /**

   * @brief  De-initializes the GPIOx peripheral registers to their default reset values.

   * @note   By default, The GPIO pins are configured in input floating mode (except JTAG pins).

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices. 

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices.  

   * @retval None

   */

 void GPIO_DeInit(GPIO_TypeDef* GPIOx)

@@ -169,20 +169,32 @@ void GPIO_DeInit(GPIO_TypeDef* GPIOx)
     RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOH, ENABLE);

     RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOH, DISABLE);

   }

+

+  else if (GPIOx == GPIOI)

+  {

+    RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOI, ENABLE);

+    RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOI, DISABLE);

+  }

+  else if (GPIOx == GPIOJ)

+  {

+    RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOJ, ENABLE);

+    RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOJ, DISABLE);

+  }

   else

   {

-    if (GPIOx == GPIOI)

+    if (GPIOx == GPIOK)

     {

-      RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOI, ENABLE);

-      RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOI, DISABLE);

+      RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOK, ENABLE);

+      RCC_AHB1PeriphResetCmd(RCC_AHB1Periph_GPIOK, DISABLE);

     }

   }

 }

 

 /**

   * @brief  Initializes the GPIOx peripheral according to the specified parameters in the GPIO_InitStruct.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices. 

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices.   

   * @param  GPIO_InitStruct: pointer to a GPIO_InitTypeDef structure that contains

   *         the configuration information for the specified GPIO peripheral.

   * @retval None

@@ -255,8 +267,9 @@ void GPIO_StructInit(GPIO_InitTypeDef* GPIO_InitStruct)
   *         GPIOx_PUPDR, GPIOx_AFRL and GPIOx_AFRH.

   * @note   The configuration of the locked GPIO pins can no longer be modified

   *         until the next reset.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices.

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_Pin: specifies the port bit to be locked.

   *          This parameter can be any combination of GPIO_Pin_x where x can be (0..15).

   * @retval None

@@ -300,8 +313,9 @@ void GPIO_PinLockConfig(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
 

 /**

   * @brief  Reads the specified input port pin.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices.

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_Pin: specifies the port bit to read.

   *         This parameter can be GPIO_Pin_x where x can be (0..15).

   * @retval The input port pin value.

@@ -327,8 +341,9 @@ uint8_t GPIO_ReadInputDataBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
 

 /**

   * @brief  Reads the specified GPIO input data port.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices. 

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @retval GPIO input data port value.

   */

 uint16_t GPIO_ReadInputData(GPIO_TypeDef* GPIOx)

@@ -341,8 +356,9 @@ uint16_t GPIO_ReadInputData(GPIO_TypeDef* GPIOx)
 

 /**

   * @brief  Reads the specified output data port bit.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices. 

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_Pin: specifies the port bit to read.

   *          This parameter can be GPIO_Pin_x where x can be (0..15).

   * @retval The output port pin value.

@@ -368,8 +384,9 @@ uint8_t GPIO_ReadOutputDataBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
 

 /**

   * @brief  Reads the specified GPIO output data port.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices.  

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @retval GPIO output data port value.

   */

 uint16_t GPIO_ReadOutputData(GPIO_TypeDef* GPIOx)

@@ -385,8 +402,9 @@ uint16_t GPIO_ReadOutputData(GPIO_TypeDef* GPIOx)
   * @note   This functions uses GPIOx_BSRR register to allow atomic read/modify 

   *         accesses. In this way, there is no risk of an IRQ occurring between

   *         the read and the modify access.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices.  

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_Pin: specifies the port bits to be written.

   *          This parameter can be any combination of GPIO_Pin_x where x can be (0..15).

   * @retval None

@@ -405,8 +423,9 @@ void GPIO_SetBits(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
   * @note   This functions uses GPIOx_BSRR register to allow atomic read/modify 

   *         accesses. In this way, there is no risk of an IRQ occurring between

   *         the read and the modify access.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices. 

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_Pin: specifies the port bits to be written.

   *          This parameter can be any combination of GPIO_Pin_x where x can be (0..15).

   * @retval None

@@ -422,8 +441,9 @@ void GPIO_ResetBits(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
 

 /**

   * @brief  Sets or clears the selected data port bit.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices.  

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_Pin: specifies the port bit to be written.

   *          This parameter can be one of GPIO_Pin_x where x can be (0..15).

   * @param  BitVal: specifies the value to be written to the selected bit.

@@ -451,8 +471,9 @@ void GPIO_WriteBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin, BitAction BitVal)
 

 /**

   * @brief  Writes data to the specified GPIO data port.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices.  

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  PortVal: specifies the value to be written to the port output data register.

   * @retval None

   */

@@ -466,8 +487,9 @@ void GPIO_Write(GPIO_TypeDef* GPIOx, uint16_t PortVal)
 

 /**

   * @brief  Toggles the specified GPIO pins..

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices.  

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_Pin: Specifies the pins to be toggled.

   * @retval None

   */

@@ -497,8 +519,9 @@ void GPIO_ToggleBits(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
 

 /**

   * @brief  Changes the mapping of the specified pin.

-  * @param  GPIOx: where x can be (A..I) to select the GPIO peripheral for 

-  *                STM32F40xx/41xx and STM32F427x/437x devices. 

+  * @param  GPIOx: where x can be (A..K) to select the GPIO peripheral for STM32F405xx/407xx and STM32F415xx/417xx devices

+  *                      x can be (A..I) to select the GPIO peripheral for STM32F42xxx/43xxx devices.

+  *                      x can be (A, B, C, D and H) to select the GPIO peripheral for STM32F401xx devices. 

   * @param  GPIO_PinSource: specifies the pin for the Alternate function.

   *         This parameter can be GPIO_PinSourcex where x can be (0..15).

   * @param  GPIO_AFSelection: selects the pin to used as Alternate function.

@@ -524,7 +547,8 @@ void GPIO_ToggleBits(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
   *            @arg GPIO_AF_SPI2: Connect SPI2/I2S2 pins to AF5

   *            @arg GPIO_AF_SPI4: Connect SPI4 pins to AF5 

   *            @arg GPIO_AF_SPI5: Connect SPI5 pins to AF5 

-  *            @arg GPIO_AF_SPI6: Connect SPI6 pins to AF5       

+  *            @arg GPIO_AF_SPI6: Connect SPI6 pins to AF5

+  *            @arg GPIO_AF_SAI1: Connect SAI1 pins to AF6 for STM32F42xxx/43xxx devices.       

   *            @arg GPIO_AF_SPI3: Connect SPI3/I2S3 pins to AF6

   *            @arg GPIO_AF_I2S3ext: Connect I2S3ext pins to AF7

   *            @arg GPIO_AF_USART1: Connect USART1 pins to AF7

@@ -543,10 +567,12 @@ void GPIO_ToggleBits(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
   *            @arg GPIO_AF_OTG_FS: Connect OTG_FS pins to AF10

   *            @arg GPIO_AF_OTG_HS: Connect OTG_HS pins to AF10

   *            @arg GPIO_AF_ETH: Connect ETHERNET pins to AF11

-  *            @arg GPIO_AF_FSMC: Connect FSMC pins to AF12   

+  *            @arg GPIO_AF_FSMC: Connect FSMC pins to AF12 

+  *            @arg GPIO_AF_FMC: Connect FMC pins to AF12 for STM32F42xxx/43xxx devices.   

   *            @arg GPIO_AF_OTG_HS_FS: Connect OTG HS (configured in FS) pins to AF12

   *            @arg GPIO_AF_SDIO: Connect SDIO pins to AF12

-  *            @arg GPIO_AF_DCMI: Connect DCMI pins to AF13 

+  *            @arg GPIO_AF_DCMI: Connect DCMI pins to AF13

+  *            @arg GPIO_AF_LTDC: Connect LTDC pins to AF14 for STM32F429xx/439xx devices. 

   *            @arg GPIO_AF_EVENTOUT: Connect EVENTOUT pins to AF15

   * @retval None

   */