drivers: restore C89 compatibility by avoiding binary constants

Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
pkarashchenko · Jul 31, 2023 · 21567b3 · 21567b3
1 parent a652787
commit 21567b3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/drivers/can/mcp2515.c b/drivers/can/mcp2515.c
@@ -1209,7 +1209,7 @@ static void mcp2515_reset_lowlevel(FAR struct mcp2515_can_s *priv)
   /* Make sure that all buffers are released. */
 
   nxsem_reset(&priv->txfsem, MCP2515_NUM_TX_BUFFERS);
-  priv->txbuffers = 0b111;
+  priv->txbuffers = (1 << MCP2515_NUM_TX_BUFFERS) - 1;
 
   /* Define the current state and unlock */
 
@@ -2540,7 +2540,7 @@ FAR struct mcp2515_can_s *
 
   /* Initialize bitmask */
 
-  priv->txbuffers = (1 << MCP2515_NUM_TX_BUFFERS)-1;
+  priv->txbuffers = (1 << MCP2515_NUM_TX_BUFFERS) - 1;
 
   /* And put the hardware in the initial state */
 

diff --git a/drivers/i2c/i2c_bitbang.c b/drivers/i2c/i2c_bitbang.c
@@ -294,7 +294,7 @@ static int i2c_bitbang_wait_ack(FAR struct i2c_bitbang_dev_s *priv)
 static void i2c_bitbang_send(FAR struct i2c_bitbang_dev_s *priv,
                              uint8_t data)
 {
-  uint8_t bit = 0b10000000;
+  uint8_t bit = 1u << 7;
 
   while (bit)
     {

diff --git a/include/nuttx/sensors/hall3ph.h b/include/nuttx/sensors/hall3ph.h
@@ -38,24 +38,24 @@
 
 enum hall3_120deg_position_e
 {
-  HALL3_120DEG_POS_1 = 0b001,
-  HALL3_120DEG_POS_2 = 0b011,
-  HALL3_120DEG_POS_3 = 0b010,
-  HALL3_120DEG_POS_4 = 0b110,
-  HALL3_120DEG_POS_5 = 0b100,
-  HALL3_120DEG_POS_6 = 0b101
+  HALL3_120DEG_POS_1 = 1, /* 0b001 */
+  HALL3_120DEG_POS_2 = 3, /* 0b011 */
+  HALL3_120DEG_POS_3 = 2, /* 0b010 */
+  HALL3_120DEG_POS_4 = 6, /* 0b110 */
+  HALL3_120DEG_POS_5 = 4, /* 0b100 */
+  HALL3_120DEG_POS_6 = 5  /* 0b101 */
 };
 
 /* 60-degree Hall effect sensors positions */
 
 enum hall3_60deg_position_e
 {
-  HALL3_60DEG_POS_1 = 0b000,
-  HALL3_60DEG_POS_2 = 0b001,
-  HALL3_60DEG_POS_3 = 0b101,
-  HALL3_60DEG_POS_4 = 0b111,
-  HALL3_60DEG_POS_5 = 0b110,
-  HALL3_60DEG_POS_6 = 0b010
+  HALL3_60DEG_POS_1 = 0, /* 0b000 */
+  HALL3_60DEG_POS_2 = 1, /* 0b001 */
+  HALL3_60DEG_POS_3 = 5, /* 0b101 */
+  HALL3_60DEG_POS_4 = 7, /* 0b111 */
+  HALL3_60DEG_POS_5 = 6, /* 0b110 */
+  HALL3_60DEG_POS_6 = 2  /* 0b010 */
 };
 
 /* This structure provides the "lower-half" driver operations available to

diff --git a/include/nuttx/sensors/mpu9250.h b/include/nuttx/sensors/mpu9250.h
@@ -84,7 +84,7 @@ enum accel_config_bit
   ACCEL_FS_SEL_2G  = 0, /* 0b00000 */
   ACCEL_FS_SEL_4G  = 1, /* 0b01000 */
   ACCEL_FS_SEL_8G  = 2, /* 0b10000 */
-  ACCEL_FS_SEL_16G = 3, /* 0b11000 */
+  ACCEL_FS_SEL_16G = 3  /* 0b11000 */
 };
 
 /* These structures are defined elsewhere, and we don't need their