From e49140b513de7758c34534ecd4965b144f176576 Mon Sep 17 00:00:00 2001
From: shandianchengzi <58585665+shandianchengzi@users.noreply.github.com>
Date: Mon, 3 Apr 2023 23:05:42 +0800
Subject: [PATCH] [HUST CSE IoTS&P Lab][bsp] add missing UL suffix to BIT macro
to prevent undefined behavior (#7153)
* [bsp] add missing UL suffix to BIT macro to prevent undefined behavior.
* [bsp] add UL suffix to BIT macro for consistency and readability.
* fix toUppercase.
* fix the abnormal character.
* format the file.
---
bsp/CME_M7/StdPeriph_Driver/inc/cmem7_usb.h | 130 +++++++++---------
.../sunxi-hal/hal/source/ccmu/sunxi-ng/ccu.h | 2 +-
.../sunxi-hal/hal/source/regulator/type.h | 2 +-
.../sunxi-hal/hal/source/spinor/inter.h | 2 +-
bsp/allwinner_tina/drivers/drv_sdio.h | 2 +-
.../hal_libraries/bmsis/include/ab32vgx.h | 2 +-
bsp/qemu-virt64-aarch64/drivers/drv_gpio.c | 2 +-
.../board/ports/drv_pmic.h | 2 +-
.../stm32mp157a-st-ev1/board/ports/drv_pmic.h | 2 +-
9 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/bsp/CME_M7/StdPeriph_Driver/inc/cmem7_usb.h b/bsp/CME_M7/StdPeriph_Driver/inc/cmem7_usb.h
index 13bbaea600..65029225a6 100644
--- a/bsp/CME_M7/StdPeriph_Driver/inc/cmem7_usb.h
+++ b/bsp/CME_M7/StdPeriph_Driver/inc/cmem7_usb.h
@@ -1,28 +1,28 @@
/**
- *****************************************************************************
- * @file cmem7_usb.h
- *
- * @brief CMEM7 USB header file
- *
- *
- * @version V1.0
- * @date 3. September 2013
- *
- * @note
- *
- *****************************************************************************
- * @attention
- *
- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
- * TIME. AS A RESULT, CAPITAL-MICRO SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
- * INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
- *
- * © COPYRIGHT 2013 Capital-micro
- *****************************************************************************
- */
+ *****************************************************************************
+ * @file cmem7_usb.h
+ *
+ * @brief CMEM7 USB header file
+ *
+ *
+ * @version V1.0
+ * @date 3. September 2013
+ *
+ * @note
+ *
+ *****************************************************************************
+ * @attention
+ *
+ * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
+ * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
+ * TIME. AS A RESULT, CAPITAL-MICRO SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
+ * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
+ * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+ *
+ * © COPYRIGHT 2013 Capital-micro
+ *****************************************************************************
+ */
#ifndef __CMEM7_USB_H
#define __CMEM7_USB_H
@@ -38,19 +38,19 @@
/**
*
*/
-#define SET_HCDMA_DESC_ADDR(a) (((uint32_t)(a)) >> 9)
-#define MIN(a, b) (((a) <= (b)) ? (a) : (b))
-#define MAX(a, b) (((a) >= (b)) ? (a) : (b))
-#define BIT(b) (0x1u << (b))
+#define SET_HCDMA_DESC_ADDR(a) (((uint32_t)(a)) >> 9)
+#define MIN(a, b) (((a) <= (b)) ? (a) : (b))
+#define MAX(a, b) (((a) >= (b)) ? (a) : (b))
+#define BIT(b) (0x1U << (b))
/** @defgroup USB_HOST_PID
* @{
*/
-#define USB_HOST_PID_DATA0 0x0 /*!< Indicates the Data PID is DATA0 */
-#define USB_HOST_PID_DATA2 0x1 /*!< Indicates the Data PID is DATA2 */
-#define USB_HOST_PID_DATA1 0x2 /*!< Indicates the Data PID is DATA1 */
-#define USB_HOST_PID_MDATA 0x3 /*!< Indicates the Data PID is MDATA (non-control) */
-#define USB_HOST_PID_SETUP 0x3 /*!< Indicates the Data PID is SETUP (control) */
+#define USB_HOST_PID_DATA0 0x0 /*!< Indicates the Data PID is DATA0 */
+#define USB_HOST_PID_DATA2 0x1 /*!< Indicates the Data PID is DATA2 */
+#define USB_HOST_PID_DATA1 0x2 /*!< Indicates the Data PID is DATA1 */
+#define USB_HOST_PID_MDATA 0x3 /*!< Indicates the Data PID is MDATA (non-control) */
+#define USB_HOST_PID_SETUP 0x3 /*!< Indicates the Data PID is SETUP (control) */
/**
* @}
*/
@@ -59,10 +59,10 @@
* @{
*/
typedef enum {
- USB_EP_TYPE_CONTROL = 0x0, /*!< Control */
- USB_EP_TYPE_ISO = 0x1, /*!< Isochronous */
- USB_EP_TYPE_BULK = 0x2, /*!< Bulk */
- USB_EP_TYPE_INT = 0x3, /*!< Interrupt */
+ USB_EP_TYPE_CONTROL = 0x0, /*!< Control */
+ USB_EP_TYPE_ISO = 0x1, /*!< Isochronous */
+ USB_EP_TYPE_BULK = 0x2, /*!< Bulk */
+ USB_EP_TYPE_INT = 0x3, /*!< Interrupt */
} USB_EP_TYPE;
/**
* @}
@@ -72,10 +72,10 @@ typedef enum {
* @{
*/
typedef enum {
- USB_ENUM_SPEED_HS = 0x0, /*!< Enumerated Speed is High Speed */
- USB_ENUM_SPEED_FS = 0x1, /*!< Enumerated Speed is Full Speed */
- USB_ENUM_SPEED_LS = 0x2, /*!< Enumerated Speed is Low Speed */
- USB_ENUM_SPEED_FS_48M = 0x3, /*!< Enumerated Speed is Full Speed (PHY clock is running at 48MHz) */
+ USB_ENUM_SPEED_HS = 0x0, /*!< Enumerated Speed is High Speed */
+ USB_ENUM_SPEED_FS = 0x1, /*!< Enumerated Speed is Full Speed */
+ USB_ENUM_SPEED_LS = 0x2, /*!< Enumerated Speed is Low Speed */
+ USB_ENUM_SPEED_FS_48M = 0x3, /*!< Enumerated Speed is Full Speed (PHY clock is running at 48MHz) */
} USB_ENUM_SPEED;
/**
* @}
@@ -85,15 +85,15 @@ typedef enum {
* @{
*/
typedef enum {
- USB_INT_GP_HOST_DISC, /*!< Device disconnection interrupt (Only for HOST Mode) */
- USB_INT_GP_DEV_RESET, /*!< USB Port Reset Interrupt (Only for DEVICE Mode) */
- USB_INT_GP_DEV_ENUMDONE, /*!< Enumeration Done Interrupt (Only for DEVICE Mode) */
- USB_INT_GP_DEV_SUSP, /*!< USB Suspend Interrupt (Only for DEVICE Mode) */
- USB_INT_GP_DEV_EARLY, /*!< USB Idle Interrupt (Only for DEVICE Mode) */
- USB_INT_GP_SOF, /*!< SOF Interrupt */
- USB_INT_GP_MIS, /*!< USB access overstep the boundary Interrupt */
- USB_INT_GP_IDCHG, /*!< OTG Connector ID Status Change Interrupt */
- USB_INT_GP_SESSREQ, /*!< Session Request / Create Interrupt */
+ USB_INT_GP_HOST_DISC, /*!< Device disconnection interrupt (Only for HOST Mode) */
+ USB_INT_GP_DEV_RESET, /*!< USB Port Reset Interrupt (Only for DEVICE Mode) */
+ USB_INT_GP_DEV_ENUMDONE, /*!< Enumeration Done Interrupt (Only for DEVICE Mode) */
+ USB_INT_GP_DEV_SUSP, /*!< USB Suspend Interrupt (Only for DEVICE Mode) */
+ USB_INT_GP_DEV_EARLY, /*!< USB Idle Interrupt (Only for DEVICE Mode) */
+ USB_INT_GP_SOF, /*!< SOF Interrupt */
+ USB_INT_GP_MIS, /*!< USB access overstep the boundary Interrupt */
+ USB_INT_GP_IDCHG, /*!< OTG Connector ID Status Change Interrupt */
+ USB_INT_GP_SESSREQ, /*!< Session Request / Create Interrupt */
} USB_INT_GP;
/**
* @}
@@ -103,11 +103,11 @@ typedef enum {
* @{
*/
typedef enum {
- USB_INT_OTG_SESEND, /*!< Session End Interrupt */
- USB_INT_OTG_STANDAUP, /*!< B Device timeout to connect Interrupt */
- USB_INT_OTG_HNDETECT, /*!< Host Negotiation Detected Interrupt */
- USB_INT_OTG_HNSUCCHG, /*!< Host Negotiation Success Status Change Interrupt */
- USB_INT_OTG_KEEPAPP, /*!< Debounce Done Interrupt (Only for HOST Mode) */
+ USB_INT_OTG_SESEND, /*!< Session End Interrupt */
+ USB_INT_OTG_STANDAUP, /*!< B Device timeout to connect Interrupt */
+ USB_INT_OTG_HNDETECT, /*!< Host Negotiation Detected Interrupt */
+ USB_INT_OTG_HNSUCCHG, /*!< Host Negotiation Success Status Change Interrupt */
+ USB_INT_OTG_KEEPAPP, /*!< Debounce Done Interrupt (Only for HOST Mode) */
} USB_INT_OTG;
/**
* @}
@@ -117,10 +117,10 @@ typedef enum {
* @{
*/
typedef enum {
- USB_OTG_DEV_HNSUCC = 8, /*!< Host Negotiation Success (Only for DEVICE Mode, Read Only) */
- USB_OTG_DEV_HNPREQ = 9, /*!< HNP Request (Only for DEVICE Mode) */
- USB_OTG_HST_HNPENABLE = 10, /*!< Host Set HNP Enable (Only for HOST Mode) */
- USB_OTG_DEV_HNPENABLE = 11, /*!< Device HNP Enabled (Only for DEVICE Mode) */
+ USB_OTG_DEV_HNSUCC = 8, /*!< Host Negotiation Success (Only for DEVICE Mode, Read Only) */
+ USB_OTG_DEV_HNPREQ = 9, /*!< HNP Request (Only for DEVICE Mode) */
+ USB_OTG_HST_HNPENABLE = 10, /*!< Host Set HNP Enable (Only for HOST Mode) */
+ USB_OTG_DEV_HNPENABLE = 11, /*!< Device HNP Enabled (Only for DEVICE Mode) */
} USB_OTG_CTL;
/**
@@ -129,7 +129,7 @@ typedef enum {
typedef union {
__IO uint32_t HPRT; /*!< Host Port Control and Status Register */
-
+
struct {
__I uint32_t PCS : 1; /*!< If a device is attached to the port */
__IO uint32_t PCD : 1; /*!< A device connection is detected */
@@ -212,7 +212,7 @@ void USB_EnableInt(BOOL enable);
/**
* @brief Flush TX/RX FIFO
- * @param[in] num Flush FIFO£¬0: non-periodic TX FIFO (HOST Mode) or FIFO 0 (DEVICE Mode); 1: Periodic TX FIFO (HOST Mode) or FIFO 1 (DEVICE Mode); 2-15: FIFO n in DEVICE Mode; 16: Flush All TX FIFO; otherwise: Flush RX FIFO
+ * @param[in] num Flush FIFO, 0: non-periodic TX FIFO (HOST Mode) or FIFO 0 (DEVICE Mode); 1: Periodic TX FIFO (HOST Mode) or FIFO 1 (DEVICE Mode); 2-15: FIFO n in DEVICE Mode; 16: Flush All TX FIFO; otherwise: Flush RX FIFO
* @retval void
*/
void USB_FlushFIFO(uint32_t num);
@@ -233,7 +233,7 @@ BOOL USB_roleIsHost(void);
/**
* @brief Control and get VBus Status (Only for HOST Mode)
* @param[in] opt Bit1: Set VBus using Bit0; Bit0: Turn VBus On or Off
- * @retval BOOL TRUE: VBus is on; FALSE£ºVBus is off
+ * @retval BOOL TRUE: VBus is on; FALSE: VBus is off
* @note It cannot control VBus actually due to HW problem
*/
BOOL USB_hostVBus(uint32_t opt);
@@ -363,13 +363,13 @@ BOOL USB_hostINT_isPCD(void);
void USB_hostINT_clrPCD(void);
/**
- * @brief Port Enable/Disable Change£¨PEDC£©Interrupt Asserted (Only for HOST Mode)
+ * @brief Port Enable/Disable Change (PEDC) Interrupt Asserted (Only for HOST Mode)
* @retval BOOL TRUE: Interrupt Asserted; FALSE: Interrupt is NOT asserted
*/
BOOL USB_hostINT_isPEDC(void);
/**
- * @brief Clear Port Enable/Disable Change£¨PEDC£©Interrupt Flag (Only for HOST Mode)
+ * @brief Clear Port Enable/Disable Change (PEDC) Interrupt Flag (Only for HOST Mode)
* @retval void
*/
void USB_hostINT_clrPEDC(void);
@@ -520,7 +520,7 @@ void USB_devINT_enDone(uint32_t ep, BOOL in, BOOL en);
* @brief Transaction Done Interrupt Asserted (Only for DEVICE Mode)
* @param[in] ep Endpoint
* @param[in] in Endpoint Direction, TRUE: IN; FALSE: OUT
- * @retval uint32_t Result, Bit0: Done; Bit1£ºBuffer Not Available Error; Bit2: SETUP Phase Done
+ * @retval uint32_t Result, Bit0: Done; Bit1: Buffer Not Available Error; Bit2: SETUP Phase Done
*/
uint32_t USB_devINT_isDone(uint32_t ep, BOOL in);
diff --git a/bsp/allwinner/libraries/sunxi-hal/hal/source/ccmu/sunxi-ng/ccu.h b/bsp/allwinner/libraries/sunxi-hal/hal/source/ccmu/sunxi-ng/ccu.h
index e7960d2ba9..4e47d1fae0 100644
--- a/bsp/allwinner/libraries/sunxi-hal/hal/source/ccmu/sunxi-ng/ccu.h
+++ b/bsp/allwinner/libraries/sunxi-hal/hal/source/ccmu/sunxi-ng/ccu.h
@@ -45,7 +45,7 @@ struct clk_core;
struct clk_ops;
#undef BIT
-#define BIT(x) (1 << (x))
+#define BIT(x) (1UL << (x))
#define BITS_PER_LONGS 32
#define GENMASK(h, l) \
diff --git a/bsp/allwinner/libraries/sunxi-hal/hal/source/regulator/type.h b/bsp/allwinner/libraries/sunxi-hal/hal/source/regulator/type.h
index 2f450c70de..d25307feb9 100644
--- a/bsp/allwinner/libraries/sunxi-hal/hal/source/regulator/type.h
+++ b/bsp/allwinner/libraries/sunxi-hal/hal/source/regulator/type.h
@@ -34,7 +34,7 @@ typedef unsigned long long int u64;
#define true 1
#define false 0
-#define BIT(nr) (1 << (nr))
+#define BIT(nr) (1UL << (nr))
/* Compute the number of elements in the given array */
#define ARRAY_SIZE(a) \
diff --git a/bsp/allwinner/libraries/sunxi-hal/hal/source/spinor/inter.h b/bsp/allwinner/libraries/sunxi-hal/hal/source/spinor/inter.h
index 3f74438e0b..d4815e28c6 100644
--- a/bsp/allwinner/libraries/sunxi-hal/hal/source/spinor/inter.h
+++ b/bsp/allwinner/libraries/sunxi-hal/hal/source/spinor/inter.h
@@ -13,7 +13,7 @@
#define SPINOR_INFO(fmt, arg...) hal_log_info(SPINOR_FMT(fmt), ##arg)
#ifndef BIT
-#define BIT(x) (1 << x)
+#define BIT(x) (1UL << (x))
#endif
#ifndef MIN
diff --git a/bsp/allwinner_tina/drivers/drv_sdio.h b/bsp/allwinner_tina/drivers/drv_sdio.h
index ef7a7c4108..987781d597 100644
--- a/bsp/allwinner_tina/drivers/drv_sdio.h
+++ b/bsp/allwinner_tina/drivers/drv_sdio.h
@@ -63,7 +63,7 @@ typedef struct tina_mmc *tina_mmc_t;
#define MMC1 ((tina_mmc_t)MMC1_BASE_ADDR)
-#define BIT(x) (1<<(x))
+#define BIT(x) (1UL<<(x))
/* Struct for Intrrrupt Information */
#define SDXC_RespErr BIT(1) //0x2
#define SDXC_CmdDone BIT(2) //0x4
diff --git a/bsp/bluetrum/libraries/hal_libraries/bmsis/include/ab32vgx.h b/bsp/bluetrum/libraries/hal_libraries/bmsis/include/ab32vgx.h
index fdf1404d4a..3644d64f3c 100644
--- a/bsp/bluetrum/libraries/hal_libraries/bmsis/include/ab32vgx.h
+++ b/bsp/bluetrum/libraries/hal_libraries/bmsis/include/ab32vgx.h
@@ -13,7 +13,7 @@
#define UINT_MAX 0xffffffff
#endif // UINT_MAX
-#define BIT(n) (1ul << (n))
+#define BIT(n) (1UL << (n))
#define AT(x) __attribute__((section(#x)))
#define ALIGNED(n) __attribute__((aligned(n)))
diff --git a/bsp/qemu-virt64-aarch64/drivers/drv_gpio.c b/bsp/qemu-virt64-aarch64/drivers/drv_gpio.c
index 33c80a513d..09712f098b 100644
--- a/bsp/qemu-virt64-aarch64/drivers/drv_gpio.c
+++ b/bsp/qemu-virt64-aarch64/drivers/drv_gpio.c
@@ -26,7 +26,7 @@
#define GPIOMIS 0x418
#define GPIOIC 0x41c
-#define BIT(x) (1 << (x))
+#define BIT(x) (1UL << (x))
#define PL061_GPIO_NR 8
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_pmic.h b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_pmic.h
index 72c4af3a49..0651d40deb 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_pmic.h
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_pmic.h
@@ -325,7 +325,7 @@ nvm_rank_ldo5:
#define OTP_OUTPUT_LDO5 ((NVM_SECTOR3_REGISTER_6 & 0x03)) // nvm_output_ldo5
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#define BIT(_x) (1<<(_x))
+#define BIT(_x) (1UL << (_x))
#define STM32_PMIC_NUM_IRQ_REGS 4
#define TURN_ON_REG 0x1
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_pmic.h b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_pmic.h
index 72c4af3a49..0651d40deb 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_pmic.h
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_pmic.h
@@ -325,7 +325,7 @@ nvm_rank_ldo5:
#define OTP_OUTPUT_LDO5 ((NVM_SECTOR3_REGISTER_6 & 0x03)) // nvm_output_ldo5
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#define BIT(_x) (1<<(_x))
+#define BIT(_x) (1UL << (_x))
#define STM32_PMIC_NUM_IRQ_REGS 4
#define TURN_ON_REG 0x1