Skip to content
GitLab
Commit e8b435d1 authored by Krzysztof Blazewicz's avatar Krzysztof Blazewicz
Browse files

stmhal: apply STM32CubeF4 v1.13.1 patch - upgrade HAL driver to v1.5.2

parent c1fa33b4
Hide whitespace changes
Inline Side-by-side
stmhal/hal/f4/inc/stm32f4xx_hal_pcd.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_pcd.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of PCD HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_pcd_ex.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_pcd_ex.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of PCD HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_pwr.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_pwr.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of PWR HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_pwr_ex.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_pwr_ex.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of PWR HAL Extension module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_rcc.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_rcc.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of RCC HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_rcc_ex.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_rcc_ex.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of RCC HAL Extension module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_rng.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_rng.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of RNG HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_rtc.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_rtc.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of RTC HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_rtc_ex.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_rtc_ex.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of RTC HAL Extension module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_sd.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_sd.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of SD HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_spi.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_spi.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of SPI HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_tim.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_tim.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of TIM HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_tim_ex.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_tim_ex.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of TIM HAL Extension module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_hal_uart.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_uart.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of UART HAL module.
******************************************************************************
* @attention
......@@ -167,13 +167,13 @@ typedef struct
uint16_t TxXferSize; /*!< UART Tx Transfer size */
uint16_t TxXferCount; /*!< UART Tx Transfer Counter */
__IO uint16_t TxXferCount; /*!< UART Tx Transfer Counter */
uint8_t *pRxBuffPtr; /*!< Pointer to UART Rx transfer Buffer */
uint16_t RxXferSize; /*!< UART Rx Transfer size */
uint16_t RxXferCount; /*!< UART Rx Transfer Counter */
__IO uint16_t RxXferCount; /*!< UART Rx Transfer Counter */
DMA_HandleTypeDef *hdmatx; /*!< UART Tx DMA Handle parameters */
......
stmhal/hal/f4/inc/stm32f4xx_ll_sdmmc.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_ll_sdmmc.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of SDMMC HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/inc/stm32f4xx_ll_usb.h
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_ll_usb.h
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief Header file of USB Core HAL module.
******************************************************************************
* @attention
......
stmhal/hal/f4/src/stm32f4xx_hal.c
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal.c
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief HAL module driver.
* This is the common part of the HAL initialization
*
......@@ -68,17 +68,17 @@
* @{
*/
/**
* @brief STM32F4xx HAL Driver version number V1.5.1
* @brief STM32F4xx HAL Driver version number V1.5.2
*/
#define __STM32F4xx_HAL_VERSION_MAIN (0x01) /*!< [31:24] main version */
#define __STM32F4xx_HAL_VERSION_SUB1 (0x05) /*!< [23:16] sub1 version */
#define __STM32F4xx_HAL_VERSION_SUB2 (0x01) /*!< [15:8] sub2 version */
#define __STM32F4xx_HAL_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */
#define __STM32F4xx_HAL_VERSION_RC (0x00) /*!< [7:0] release candidate */
#define __STM32F4xx_HAL_VERSION ((__STM32F4xx_HAL_VERSION_MAIN << 24U)\
|(__STM32F4xx_HAL_VERSION_SUB1 << 16U)\
|(__STM32F4xx_HAL_VERSION_SUB2 << 8U )\
|(__STM32F4xx_HAL_VERSION_RC))
#define IDCODE_DEVID_MASK ((uint32_t)0x00000FFFU)
/* ------------ RCC registers bit address in the alias region ----------- */
......
stmhal/hal/f4/src/stm32f4xx_hal_adc.c
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_adc.c
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief This file provides firmware functions to manage the following
* functionalities of the Analog to Digital Convertor (ADC) peripheral:
* + Initialization and de-initialization functions
......
stmhal/hal/f4/src/stm32f4xx_hal_adc_ex.c
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_adc_ex.c
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief This file provides firmware functions to manage the following
* functionalities of the ADC extension peripheral:
* + Extended features functions
......
stmhal/hal/f4/src/stm32f4xx_hal_can.c
View file @ e8b435d1
......@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f4xx_hal_can.c
* @author MCD Application Team
* @version V1.5.1
* @date 01-July-2016
* @version V1.5.2
* @date 22-September-2016
* @brief This file provides firmware functions to manage the following
* functionalities of the Controller Area Network (CAN) peripheral:
* + Initialization and de-initialization functions
......@@ -844,6 +844,8 @@ HAL_StatusTypeDef HAL_CAN_Receive(CAN_HandleTypeDef* hcan, uint8_t FIFONumber, u
hcan->pRxMsg->DLC = (uint8_t)0x0FU & hcan->Instance->sFIFOMailBox[FIFONumber].RDTR;
/* Get the FMI */
hcan->pRxMsg->FMI = (uint8_t)0xFFU & (hcan->Instance->sFIFOMailBox[FIFONumber].RDTR >> 8U);
/* Get the FIFONumber */
hcan->pRxMsg->FIFONumber = FIFONumber;
/* Get the data field */
hcan->pRxMsg->Data[0U] = (uint8_t)0xFFU & hcan->Instance->sFIFOMailBox[FIFONumber].RDLR;
hcan->pRxMsg->Data[1U] = (uint8_t)0xFFU & (hcan->Instance->sFIFOMailBox[FIFONumber].RDLR >> 8U);
......@@ -1352,6 +1354,8 @@ static HAL_StatusTypeDef CAN_Receive_IT(CAN_HandleTypeDef* hcan, uint8_t FIFONum
hcan->pRxMsg->RTR = (uint8_t)0x02U & hcan->Instance->sFIFOMailBox[FIFONumber].RIR;
/* Get the DLC */
hcan->pRxMsg->DLC = (uint8_t)0x0FU & hcan->Instance->sFIFOMailBox[FIFONumber].RDTR;
/* Get the FIFONumber */
hcan->pRxMsg->FIFONumber = FIFONumber;
/* Get the FMI */
hcan->pRxMsg->FMI = (uint8_t)0xFFU & (hcan->Instance->sFIFOMailBox[FIFONumber].RDTR >> 8U);
/* Get the data field */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment