Skip to content

Commit 0628841

Browse files
fpistmfpistm
committed
[L4] Update STM32L4xx HAL Drivers to v1.13.0
Included in STM32CubeL4 FW v1.17.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent c18cc58 commit 0628841

File tree

79 files changed

+4330
-2308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+4330
-2308
lines changed

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 73 additions & 103 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_exti.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -701,21 +701,21 @@ typedef struct
701701
/** @defgroup EXTI_Private_Macros EXTI Private Macros
702702
* @{
703703
*/
704-
#define IS_EXTI_LINE(__LINE__) ((((__LINE__) & ~(EXTI_PROPERTY_MASK | EXTI_EVENT_PRESENCE_MASK | EXTI_REG_MASK | EXTI_PIN_MASK)) == 0x00u) && \
705-
((((__LINE__) & EXTI_PROPERTY_MASK) == EXTI_DIRECT) || \
706-
(((__LINE__) & EXTI_PROPERTY_MASK) == EXTI_CONFIG) || \
707-
(((__LINE__) & EXTI_PROPERTY_MASK) == EXTI_GPIO)) && \
708-
(((__LINE__) & (EXTI_REG_MASK | EXTI_PIN_MASK)) < \
704+
#define IS_EXTI_LINE(__EXTI_LINE__) ((((__EXTI_LINE__) & ~(EXTI_PROPERTY_MASK | EXTI_EVENT_PRESENCE_MASK | EXTI_REG_MASK | EXTI_PIN_MASK)) == 0x00u) && \
705+
((((__EXTI_LINE__) & EXTI_PROPERTY_MASK) == EXTI_DIRECT) || \
706+
(((__EXTI_LINE__) & EXTI_PROPERTY_MASK) == EXTI_CONFIG) || \
707+
(((__EXTI_LINE__) & EXTI_PROPERTY_MASK) == EXTI_GPIO)) && \
708+
(((__EXTI_LINE__) & (EXTI_REG_MASK | EXTI_PIN_MASK)) < \
709709
(((EXTI_LINE_NB / 32u) << EXTI_REG_SHIFT) | (EXTI_LINE_NB % 32u))))
710710

711-
#define IS_EXTI_MODE(__LINE__) ((((__LINE__) & EXTI_MODE_MASK) != 0x00u) && \
712-
(((__LINE__) & ~EXTI_MODE_MASK) == 0x00u))
711+
#define IS_EXTI_MODE(__EXTI_LINE__) ((((__EXTI_LINE__) & EXTI_MODE_MASK) != 0x00u) && \
712+
(((__EXTI_LINE__) & ~EXTI_MODE_MASK) == 0x00u))
713713

714-
#define IS_EXTI_TRIGGER(__LINE__) (((__LINE__) & ~EXTI_TRIGGER_MASK) == 0x00u)
714+
#define IS_EXTI_TRIGGER(__EXTI_LINE__) (((__EXTI_LINE__) & ~EXTI_TRIGGER_MASK) == 0x00u)
715715

716-
#define IS_EXTI_PENDING_EDGE(__LINE__) ((__LINE__) == EXTI_TRIGGER_RISING_FALLING)
716+
#define IS_EXTI_PENDING_EDGE(__EXTI_LINE__) ((__EXTI_LINE__) == EXTI_TRIGGER_RISING_FALLING)
717717

718-
#define IS_EXTI_CONFIG_LINE(__LINE__) (((__LINE__) & EXTI_CONFIG) != 0x00u)
718+
#define IS_EXTI_CONFIG_LINE(__EXTI_LINE__) (((__EXTI_LINE__) & EXTI_CONFIG) != 0x00u)
719719

720720
#if defined(STM32L412xx) || defined(STM32L422xx)
721721

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio_ex.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,8 @@
719719
*/
720720
#define GPIO_AF6_DFSDM1 ((uint8_t)0x06) /* DFSDM1 Alternate Function mapping */
721721
#define GPIO_AF6_I2C3 ((uint8_t)0x06) /* I2C3 Alternate Function mapping */
722+
#define GPIO_AF6_OCTOSPIM_P1 ((uint8_t)0x06) /* OctoSPI Manager Port 1 Alternate Function mapping */
723+
#define GPIO_AF6_OCTOSPIM_P2 ((uint8_t)0x06) /* OctoSPI Manager Port 2 Alternate Function mapping */
722724
#define GPIO_AF6_SPI3 ((uint8_t)0x06) /* SPI3 Alternate Function mapping */
723725

724726
/**

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_hcd.h

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" {
3333
* @{
3434
*/
3535

36-
/** @addtogroup HCD
36+
/** @addtogroup HCD HCD
3737
* @{
3838
*/
3939

@@ -111,6 +111,9 @@ typedef struct
111111
#define HCD_SPEED_FULL USBH_FSLS_SPEED
112112
#define HCD_SPEED_LOW USBH_FSLS_SPEED
113113

114+
#define HCD_DEVICE_SPEED_FULL 1U
115+
#define HCD_DEVICE_SPEED_LOW 2U
116+
114117
/**
115118
* @}
116119
*/
@@ -213,10 +216,16 @@ typedef void (*pHCD_HC_NotifyURBChangeCallbackTypeDef)(HCD_HandleTypeDef *hhcd,
213216
* @}
214217
*/
215218

216-
HAL_StatusTypeDef HAL_HCD_RegisterCallback(HCD_HandleTypeDef *hhcd, HAL_HCD_CallbackIDTypeDef CallbackID, pHCD_CallbackTypeDef pCallback);
217-
HAL_StatusTypeDef HAL_HCD_UnRegisterCallback(HCD_HandleTypeDef *hhcd, HAL_HCD_CallbackIDTypeDef CallbackID);
219+
HAL_StatusTypeDef HAL_HCD_RegisterCallback(HCD_HandleTypeDef *hhcd,
220+
HAL_HCD_CallbackIDTypeDef CallbackID,
221+
pHCD_CallbackTypeDef pCallback);
222+
223+
HAL_StatusTypeDef HAL_HCD_UnRegisterCallback(HCD_HandleTypeDef *hhcd,
224+
HAL_HCD_CallbackIDTypeDef CallbackID);
225+
226+
HAL_StatusTypeDef HAL_HCD_RegisterHC_NotifyURBChangeCallback(HCD_HandleTypeDef *hhcd,
227+
pHCD_HC_NotifyURBChangeCallbackTypeDef pCallback);
218228

219-
HAL_StatusTypeDef HAL_HCD_RegisterHC_NotifyURBChangeCallback(HCD_HandleTypeDef *hhcd, pHCD_HC_NotifyURBChangeCallbackTypeDef pCallback);
220229
HAL_StatusTypeDef HAL_HCD_UnRegisterHC_NotifyURBChangeCallback(HCD_HandleTypeDef *hhcd);
221230
#endif /* USE_HAL_HCD_REGISTER_CALLBACKS */
222231
/**
@@ -266,6 +275,7 @@ HCD_HCStateTypeDef HAL_HCD_HC_GetState(HCD_HandleTypeDef *hhcd, uint8_t chn
266275
uint32_t HAL_HCD_HC_GetXferCount(HCD_HandleTypeDef *hhcd, uint8_t chnum);
267276
uint32_t HAL_HCD_GetCurrentFrame(HCD_HandleTypeDef *hhcd);
268277
uint32_t HAL_HCD_GetCurrentSpeed(HCD_HandleTypeDef *hhcd);
278+
269279
/**
270280
* @}
271281
*/
@@ -278,36 +288,17 @@ uint32_t HAL_HCD_GetCurrentSpeed(HCD_HandleTypeDef *hhcd);
278288
/** @defgroup HCD_Private_Macros HCD Private Macros
279289
* @{
280290
*/
281-
282291
/**
283292
* @}
284293
*/
285-
286294
/* Private functions prototypes ----------------------------------------------*/
287-
/** @defgroup HCD_Private_Functions_Prototypes HCD Private Functions Prototypes
288-
* @{
289-
*/
290-
291-
/**
292-
* @}
293-
*/
294-
295-
/* Private functions ---------------------------------------------------------*/
296-
/** @defgroup HCD_Private_Functions HCD Private Functions
297-
* @{
298-
*/
299-
300-
/**
301-
* @}
302-
*/
303295

304296
/**
305-
* @}
306-
*/
307-
297+
* @}
298+
*/
308299
/**
309-
* @}
310-
*/
300+
* @}
301+
*/
311302
#endif /* defined (USB_OTG_FS) */
312303

313304
#ifdef __cplusplus

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_irda.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ typedef struct
9191
* 11 : Error
9292
* b5 Peripheral initialization status
9393
* 0 : Reset (Peripheral not initialized)
94-
* 1 : Init done (Peripheral not initialized. HAL IRDA Init function already called)
94+
* 1 : Init done (Peripheral initialized. HAL IRDA Init function already called)
9595
* b4-b3 (not used)
9696
* xx : Should be set to 00
9797
* b2 Intrinsic process state
@@ -108,7 +108,7 @@ typedef struct
108108
* xx : Should be set to 00
109109
* b5 Peripheral initialization status
110110
* 0 : Reset (Peripheral not initialized)
111-
* 1 : Init done (Peripheral not initialized)
111+
* 1 : Init done (Peripheral initialized)
112112
* b4-b2 (not used)
113113
* xxx : Should be set to 000
114114
* b1 Rx state

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_lptim.h

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,10 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
403403
*/
404404
#if (USE_HAL_LPTIM_REGISTER_CALLBACKS == 1)
405405
#define __HAL_LPTIM_RESET_HANDLE_STATE(__HANDLE__) do { \
406-
(__HANDLE__)->State = HAL_LPTIM_STATE_RESET; \
407-
(__HANDLE__)->MspInitCallback = NULL; \
408-
(__HANDLE__)->MspDeInitCallback = NULL; \
409-
} while(0)
406+
(__HANDLE__)->State = HAL_LPTIM_STATE_RESET; \
407+
(__HANDLE__)->MspInitCallback = NULL; \
408+
(__HANDLE__)->MspDeInitCallback = NULL; \
409+
} while(0)
410410
#else
411411
#define __HAL_LPTIM_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_LPTIM_STATE_RESET)
412412
#endif /* USE_HAL_LPTIM_REGISTER_CALLBACKS */
@@ -570,7 +570,8 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
570570
* @retval Interrupt status.
571571
*/
572572

573-
#define __HAL_LPTIM_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->IER & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET)
573+
#define __HAL_LPTIM_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->IER\
574+
& (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET)
574575

575576
/**
576577
* @brief Enable the LPTIM1 EXTI line in interrupt mode.
@@ -582,7 +583,8 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
582583
* @brief Disable the LPTIM1 EXTI line in interrupt mode.
583584
* @retval None
584585
*/
585-
#define __HAL_LPTIM_LPTIM1_EXTI_DISABLE_IT() (EXTI->IMR2 &= ~(LPTIM_EXTI_LINE_LPTIM1))
586+
#define __HAL_LPTIM_LPTIM1_EXTI_DISABLE_IT() (EXTI->IMR2\
587+
&= ~(LPTIM_EXTI_LINE_LPTIM1))
586588

587589

588590
/**
@@ -595,7 +597,8 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
595597
* @brief Disable the LPTIM1 EXTI line in event mode.
596598
* @retval None
597599
*/
598-
#define __HAL_LPTIM_LPTIM1_EXTI_DISABLE_EVENT() (EXTI->EMR2 &= ~(LPTIM_EXTI_LINE_LPTIM1))
600+
#define __HAL_LPTIM_LPTIM1_EXTI_DISABLE_EVENT() (EXTI->EMR2\
601+
&= ~(LPTIM_EXTI_LINE_LPTIM1))
599602

600603
/**
601604
* @brief Enable the LPTIM2 EXTI line in interrupt mode.
@@ -607,7 +610,8 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
607610
* @brief Disable the LPTIM2 EXTI line in interrupt mode.
608611
* @retval None
609612
*/
610-
#define __HAL_LPTIM_LPTIM2_EXTI_DISABLE_IT() (EXTI->IMR2 &= ~(LPTIM_EXTI_LINE_LPTIM2))
613+
#define __HAL_LPTIM_LPTIM2_EXTI_DISABLE_IT() (EXTI->IMR2\
614+
&= ~(LPTIM_EXTI_LINE_LPTIM2))
611615

612616

613617
/**
@@ -620,7 +624,8 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
620624
* @brief Disable the LPTIM2 EXTI line in event mode.
621625
* @retval None
622626
*/
623-
#define __HAL_LPTIM_LPTIM2_EXTI_DISABLE_EVENT() (EXTI->EMR2 &= ~(LPTIM_EXTI_LINE_LPTIM2))
627+
#define __HAL_LPTIM_LPTIM2_EXTI_DISABLE_EVENT() (EXTI->EMR2\
628+
&= ~(LPTIM_EXTI_LINE_LPTIM2))
624629

625630
/**
626631
* @}
@@ -632,9 +637,9 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
632637
*/
633638

634639
/** @addtogroup LPTIM_Exported_Functions_Group1
635-
* @brief Initialization and Configuration functions.
636-
* @{
637-
*/
640+
* @brief Initialization and Configuration functions.
641+
* @{
642+
*/
638643
/* Initialization/de-initialization functions ********************************/
639644
HAL_StatusTypeDef HAL_LPTIM_Init(LPTIM_HandleTypeDef *hlptim);
640645
HAL_StatusTypeDef HAL_LPTIM_DeInit(LPTIM_HandleTypeDef *hlptim);
@@ -647,9 +652,9 @@ void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef *hlptim);
647652
*/
648653

649654
/** @addtogroup LPTIM_Exported_Functions_Group2
650-
* @brief Start-Stop operation functions.
651-
* @{
652-
*/
655+
* @brief Start-Stop operation functions.
656+
* @{
657+
*/
653658
/* Start/Stop operation functions *********************************************/
654659
/* ################################# PWM Mode ################################*/
655660
/* Blocking mode: Polling */
@@ -703,9 +708,9 @@ HAL_StatusTypeDef HAL_LPTIM_Counter_Stop_IT(LPTIM_HandleTypeDef *hlptim);
703708
*/
704709

705710
/** @addtogroup LPTIM_Exported_Functions_Group3
706-
* @brief Read operation functions.
707-
* @{
708-
*/
711+
* @brief Read operation functions.
712+
* @{
713+
*/
709714
/* Reading operation functions ************************************************/
710715
uint32_t HAL_LPTIM_ReadCounter(LPTIM_HandleTypeDef *hlptim);
711716
uint32_t HAL_LPTIM_ReadAutoReload(LPTIM_HandleTypeDef *hlptim);
@@ -715,9 +720,9 @@ uint32_t HAL_LPTIM_ReadCompare(LPTIM_HandleTypeDef *hlptim);
715720
*/
716721

717722
/** @addtogroup LPTIM_Exported_Functions_Group4
718-
* @brief LPTIM IRQ handler and callback functions.
719-
* @{
720-
*/
723+
* @brief LPTIM IRQ handler and callback functions.
724+
* @{
725+
*/
721726
/* LPTIM IRQ functions *******************************************************/
722727
void HAL_LPTIM_IRQHandler(LPTIM_HandleTypeDef *hlptim);
723728

@@ -736,17 +741,18 @@ void HAL_LPTIM_RepCounterWriteCallback(LPTIM_HandleTypeDef *hlptim);
736741

737742
/* Callbacks Register/UnRegister functions ***********************************/
738743
#if (USE_HAL_LPTIM_REGISTER_CALLBACKS == 1)
739-
HAL_StatusTypeDef HAL_LPTIM_RegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_LPTIM_CallbackIDTypeDef CallbackID, pLPTIM_CallbackTypeDef pCallback);
744+
HAL_StatusTypeDef HAL_LPTIM_RegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_LPTIM_CallbackIDTypeDef CallbackID,
745+
pLPTIM_CallbackTypeDef pCallback);
740746
HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_LPTIM_CallbackIDTypeDef CallbackID);
741747
#endif /* USE_HAL_LPTIM_REGISTER_CALLBACKS */
742748
/**
743749
* @}
744750
*/
745751

746752
/** @addtogroup LPTIM_Group5
747-
* @brief Peripheral State functions.
748-
* @{
749-
*/
753+
* @brief Peripheral State functions.
754+
* @{
755+
*/
750756
/* Peripheral State functions ************************************************/
751757
HAL_LPTIM_StateTypeDef HAL_LPTIM_GetState(LPTIM_HandleTypeDef *hlptim);
752758
/**
@@ -854,20 +860,20 @@ HAL_LPTIM_StateTypeDef HAL_LPTIM_GetState(LPTIM_HandleTypeDef *hlptim);
854860
#endif
855861

856862
#define IS_LPTIM_INPUT1_SOURCE(__INSTANCE__, __SOURCE__) \
857-
((((__INSTANCE__) == LPTIM1) && \
858-
(((__SOURCE__) == LPTIM_INPUT1SOURCE_GPIO) || \
859-
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP1))) \
860-
|| \
861-
(((__INSTANCE__) == LPTIM2) && \
862-
(((__SOURCE__) == LPTIM_INPUT1SOURCE_GPIO) || \
863-
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP1) || \
864-
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP2) || \
865-
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP1_COMP2))))
863+
((((__INSTANCE__) == LPTIM1) && \
864+
(((__SOURCE__) == LPTIM_INPUT1SOURCE_GPIO) || \
865+
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP1))) \
866+
|| \
867+
(((__INSTANCE__) == LPTIM2) && \
868+
(((__SOURCE__) == LPTIM_INPUT1SOURCE_GPIO) || \
869+
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP1) || \
870+
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP2) || \
871+
((__SOURCE__) == LPTIM_INPUT1SOURCE_COMP1_COMP2))))
866872

867873
#define IS_LPTIM_INPUT2_SOURCE(__INSTANCE__, __SOURCE__) \
868-
(((__INSTANCE__) == LPTIM1) && \
869-
(((__SOURCE__) == LPTIM_INPUT2SOURCE_GPIO) || \
870-
((__SOURCE__) == LPTIM_INPUT2SOURCE_COMP2)))
874+
(((__INSTANCE__) == LPTIM1) && \
875+
(((__SOURCE__) == LPTIM_INPUT2SOURCE_GPIO) || \
876+
((__SOURCE__) == LPTIM_INPUT2SOURCE_COMP2)))
871877

872878
/**
873879
* @}

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_nand.h

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ typedef struct
134134
void (* MspInitCallback)(struct __NAND_HandleTypeDef *hnand); /*!< NAND Msp Init callback */
135135
void (* MspDeInitCallback)(struct __NAND_HandleTypeDef *hnand); /*!< NAND Msp DeInit callback */
136136
void (* ItCallback)(struct __NAND_HandleTypeDef *hnand); /*!< NAND IT callback */
137-
#endif
137+
#endif /* USE_HAL_NAND_REGISTER_CALLBACKS */
138138
} NAND_HandleTypeDef;
139139

140140
#if (USE_HAL_NAND_REGISTER_CALLBACKS == 1)
@@ -152,7 +152,7 @@ typedef enum
152152
* @brief HAL NAND Callback pointer definition
153153
*/
154154
typedef void (*pNAND_CallbackTypeDef)(NAND_HandleTypeDef *hnand);
155-
#endif
155+
#endif /* USE_HAL_NAND_REGISTER_CALLBACKS */
156156

157157
/**
158158
* @}
@@ -176,7 +176,7 @@ typedef void (*pNAND_CallbackTypeDef)(NAND_HandleTypeDef *hnand);
176176
} while(0)
177177
#else
178178
#define __HAL_NAND_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_NAND_STATE_RESET)
179-
#endif
179+
#endif /* USE_HAL_NAND_REGISTER_CALLBACKS */
180180

181181
/**
182182
* @}
@@ -243,7 +243,7 @@ uint32_t HAL_NAND_Address_Inc(NAND_HandleTypeDef *hnand, NAND_AddressT
243243
HAL_StatusTypeDef HAL_NAND_RegisterCallback(NAND_HandleTypeDef *hnand, HAL_NAND_CallbackIDTypeDef CallbackId,
244244
pNAND_CallbackTypeDef pCallback);
245245
HAL_StatusTypeDef HAL_NAND_UnRegisterCallback(NAND_HandleTypeDef *hnand, HAL_NAND_CallbackIDTypeDef CallbackId);
246-
#endif
246+
#endif /* USE_HAL_NAND_REGISTER_CALLBACKS */
247247

248248
/**
249249
* @}
@@ -288,19 +288,19 @@ uint32_t HAL_NAND_Read_Status(NAND_HandleTypeDef *hnand);
288288
#define CMD_AREA (1UL<<16U) /* A16 = CLE high */
289289
#define ADDR_AREA (1UL<<17U) /* A17 = ALE high */
290290

291-
#define NAND_CMD_AREA_A 0x00U
292-
#define NAND_CMD_AREA_B 0x01U
293-
#define NAND_CMD_AREA_C 0x50U
294-
#define NAND_CMD_AREA_TRUE1 0x30U
291+
#define NAND_CMD_AREA_A ((uint8_t)0x00)
292+
#define NAND_CMD_AREA_B ((uint8_t)0x01)
293+
#define NAND_CMD_AREA_C ((uint8_t)0x50)
294+
#define NAND_CMD_AREA_TRUE1 ((uint8_t)0x30)
295295

296-
#define NAND_CMD_WRITE0 0x80U
297-
#define NAND_CMD_WRITE_TRUE1 0x10U
298-
#define NAND_CMD_ERASE0 0x60U
299-
#define NAND_CMD_ERASE1 0xD0U
300-
#define NAND_CMD_READID 0x90U
301-
#define NAND_CMD_STATUS 0x70U
302-
#define NAND_CMD_LOCK_STATUS 0x7AU
303-
#define NAND_CMD_RESET 0xFFU
296+
#define NAND_CMD_WRITE0 ((uint8_t)0x80)
297+
#define NAND_CMD_WRITE_TRUE1 ((uint8_t)0x10)
298+
#define NAND_CMD_ERASE0 ((uint8_t)0x60)
299+
#define NAND_CMD_ERASE1 ((uint8_t)0xD0)
300+
#define NAND_CMD_READID ((uint8_t)0x90)
301+
#define NAND_CMD_STATUS ((uint8_t)0x70)
302+
#define NAND_CMD_LOCK_STATUS ((uint8_t)0x7A)
303+
#define NAND_CMD_RESET ((uint8_t)0xFF)
304304

305305
/* NAND memory status */
306306
#define NAND_VALID_ADDRESS 0x00000100UL
@@ -325,7 +325,8 @@ uint32_t HAL_NAND_Read_Status(NAND_HandleTypeDef *hnand);
325325
* @retval NAND Raw address value
326326
*/
327327
#define ARRAY_ADDRESS(__ADDRESS__ , __HANDLE__) ((__ADDRESS__)->Page + \
328-
(((__ADDRESS__)->Block + (((__ADDRESS__)->Plane) * ((__HANDLE__)->Config.PlaneSize)))* ((__HANDLE__)->Config.BlockSize)))
328+
(((__ADDRESS__)->Block + (((__ADDRESS__)->Plane) * \
329+
((__HANDLE__)->Config.PlaneSize)))* ((__HANDLE__)->Config.BlockSize)))
329330

330331
/**
331332
* @brief NAND memory Column address computation.

0 commit comments

Comments
 (0)