From b6d102871e13ca5264308c1482b178a0c58a98b1 Mon Sep 17 00:00:00 2001 From: Eya Date: Tue, 17 Jan 2023 23:36:27 +0100 Subject: [PATCH] stm32g0xx: usb: Use correct macro to clear RXBD register block numbers Cherry-picked from upstream commit Fixes: e289146768cf ("[LL][USB] Use correct macro to clear RXBD register block numbers") https://github.com/STMicroelectronics/stm32g0xx_hal_driver.git --- libs/STM32_HAL/include/stm32g0xx/stm32g0xx_ll_usb.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/STM32_HAL/include/stm32g0xx/stm32g0xx_ll_usb.h b/libs/STM32_HAL/include/stm32g0xx/stm32g0xx_ll_usb.h index fc419a73..c4b71098 100644 --- a/libs/STM32_HAL/include/stm32g0xx/stm32g0xx_ll_usb.h +++ b/libs/STM32_HAL/include/stm32g0xx/stm32g0xx_ll_usb.h @@ -660,7 +660,7 @@ typedef struct do { \ uint32_t wNBlocks; \ \ - (pdwReg) &= USB_PMA_RXBD_COUNTMSK; \ + (pdwReg) &= ~(USB_CNTRX_BLSIZE | USB_CNTRX_NBLK_MSK); \ \ if ((wCount) > 62U) \ { \ @@ -670,7 +670,6 @@ typedef struct { \ if ((wCount) == 0U) \ { \ - (pdwReg) &= (uint32_t)~USB_CNTRX_NBLK_MSK; \ (pdwReg) |= USB_CNTRX_BLSIZE; \ } \ else \ @@ -709,8 +708,8 @@ typedef struct * @param bEpChNum Endpoint Number. * @retval Counter value */ -#define USB_DRD_GET_CHEP_TX_CNT(USBx, bEpChNum) (((USB_DRD_PMA_BUFF + (bEpChNum))->TXBD & 0x03FF0000U) >>16U) -#define USB_DRD_GET_CHEP_RX_CNT(USBx, bEpChNum) (((USB_DRD_PMA_BUFF + (bEpChNum))->RXBD & 0x03FF0000U) >>16U) +#define USB_DRD_GET_CHEP_TX_CNT(USBx, bEpChNum) (((USB_DRD_PMA_BUFF + (bEpChNum))->TXBD & 0x03FF0000U) >> 16U) +#define USB_DRD_GET_CHEP_RX_CNT(USBx, bEpChNum) (((USB_DRD_PMA_BUFF + (bEpChNum))->RXBD & 0x03FF0000U) >> 16U) #define USB_DRD_GET_EP_TX_CNT USB_GET_CHEP_TX_CNT #define USB_DRD_GET_CH_TX_CNT USB_GET_CHEP_TX_CNT