rename bit_* helper to tu_bit_*, BIT_* to TU_BIT_* for consistency

4 files changed, 23 insertions, 23 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 7ec7a1eb2..b8678c1c4 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -93,7 +93,7 @@ CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];
 bool tud_cdc_n_connected(uint8_t itf)

 {

   // DTR (bit 0) active  is considered as connected

-  return BIT_TEST_(_cdcd_itf[itf].line_state, 0);

+  return TU_BIT_TEST(_cdcd_itf[itf].line_state, 0);

 }

 

 uint8_t tud_cdc_n_get_line_state (uint8_t itf)

@@ -349,7 +349,7 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
       usbd_control_status(rhport, request);

 

       // Invoke callback

-      if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, BIT_TEST_(request->wValue, 0), BIT_TEST_(request->wValue, 1));

+      if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, TU_BIT_TEST(request->wValue, 0), TU_BIT_TEST(request->wValue, 1));

     break;

 

     default: return false; // stall unsupported request

diff --git a/src/class/custom/custom_host.h b/src/class/custom/custom_host.h
index 5522db58b..a5fcb6fb4 100644
--- a/src/class/custom/custom_host.h
+++ b/src/class/custom/custom_host.h
@@ -62,7 +62,7 @@ static inline bool tusbh_custom_is_mounted(uint8_t dev_addr, uint16_t vendor_id,
 {
   (void) vendor_id; // TODO check this later
   (void) product_id;
-//  return (tusbh_device_get_mounted_class_flag(dev_addr) & BIT_(TUSB_CLASS_MAPPED_INDEX_END-1) ) != 0;
+//  return (tusbh_device_get_mounted_class_flag(dev_addr) & TU_BIT(TUSB_CLASS_MAPPED_INDEX_END-1) ) != 0;
   return false;
 }
 
diff --git a/src/class/hid/hid.h b/src/class/hid/hid.h
index 8bfede2da..2e2b45585 100644
--- a/src/class/hid/hid.h
+++ b/src/class/hid/hid.h
@@ -173,11 +173,11 @@ typedef struct ATTR_PACKED
 /// Standard Mouse Buttons Bitmap

 typedef enum

 {

-	MOUSE_BUTTON_LEFT     = BIT_(0), ///< Left button

-	MOUSE_BUTTON_RIGHT    = BIT_(1), ///< Right button

-	MOUSE_BUTTON_MIDDLE   = BIT_(2), ///< Middle button

-  MOUSE_BUTTON_BACKWARD = BIT_(3), ///< Backward button,

-  MOUSE_BUTTON_FORWARD  = BIT_(4), ///< Forward button,

+	MOUSE_BUTTON_LEFT     = TU_BIT(0), ///< Left button

+	MOUSE_BUTTON_RIGHT    = TU_BIT(1), ///< Right button

+	MOUSE_BUTTON_MIDDLE   = TU_BIT(2), ///< Middle button

+  MOUSE_BUTTON_BACKWARD = TU_BIT(3), ///< Backward button,

+  MOUSE_BUTTON_FORWARD  = TU_BIT(4), ///< Forward button,

 }hid_mouse_button_bm_t;

 

 /// @}

@@ -199,23 +199,23 @@ typedef struct ATTR_PACKED
 /// Keyboard modifier codes bitmap

 typedef enum

 {

-	KEYBOARD_MODIFIER_LEFTCTRL   = BIT_(0), ///< Left Control

-	KEYBOARD_MODIFIER_LEFTSHIFT  = BIT_(1), ///< Left Shift

-	KEYBOARD_MODIFIER_LEFTALT    = BIT_(2), ///< Left Alt

-	KEYBOARD_MODIFIER_LEFTGUI    = BIT_(3), ///< Left Window

-	KEYBOARD_MODIFIER_RIGHTCTRL  = BIT_(4), ///< Right Control

-	KEYBOARD_MODIFIER_RIGHTSHIFT = BIT_(5), ///< Right Shift

-	KEYBOARD_MODIFIER_RIGHTALT   = BIT_(6), ///< Right Alt

-	KEYBOARD_MODIFIER_RIGHTGUI   = BIT_(7)  ///< Right Window

+	KEYBOARD_MODIFIER_LEFTCTRL   = TU_BIT(0), ///< Left Control

+	KEYBOARD_MODIFIER_LEFTSHIFT  = TU_BIT(1), ///< Left Shift

+	KEYBOARD_MODIFIER_LEFTALT    = TU_BIT(2), ///< Left Alt

+	KEYBOARD_MODIFIER_LEFTGUI    = TU_BIT(3), ///< Left Window

+	KEYBOARD_MODIFIER_RIGHTCTRL  = TU_BIT(4), ///< Right Control

+	KEYBOARD_MODIFIER_RIGHTSHIFT = TU_BIT(5), ///< Right Shift

+	KEYBOARD_MODIFIER_RIGHTALT   = TU_BIT(6), ///< Right Alt

+	KEYBOARD_MODIFIER_RIGHTGUI   = TU_BIT(7)  ///< Right Window

 }hid_keyboard_modifier_bm_t;

 

 typedef enum

 {

-  KEYBOARD_LED_NUMLOCK    = BIT_(0), ///< Num Lock LED

-  KEYBOARD_LED_CAPSLOCK   = BIT_(1), ///< Caps Lock LED

-  KEYBOARD_LED_SCROLLLOCK = BIT_(2), ///< Scroll Lock LED

-  KEYBOARD_LED_COMPOSE    = BIT_(3), ///< Composition Mode

-  KEYBOARD_LED_KANA       = BIT_(4) ///< Kana mode

+  KEYBOARD_LED_NUMLOCK    = TU_BIT(0), ///< Num Lock LED

+  KEYBOARD_LED_CAPSLOCK   = TU_BIT(1), ///< Caps Lock LED

+  KEYBOARD_LED_SCROLLLOCK = TU_BIT(2), ///< Scroll Lock LED

+  KEYBOARD_LED_COMPOSE    = TU_BIT(3), ///< Composition Mode

+  KEYBOARD_LED_KANA       = TU_BIT(4) ///< Kana mode

 }hid_keyboard_led_bm_t;

 

 /// @}

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index d4d115bce..5d2758414 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -385,7 +385,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
             p_csw->status = MSC_CSW_STATUS_PASSED;

           }

         }

-        else if ( !BIT_TEST_(p_cbw->dir, 7) )

+        else if ( !TU_BIT_TEST(p_cbw->dir, 7) )

         {

           // OUT transfer

           TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, p_msc->total_len) );

@@ -426,7 +426,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
 

     case MSC_STAGE_DATA:

       // OUT transfer, invoke callback if needed

-      if ( !BIT_TEST_(p_cbw->dir, 7) )

+      if ( !TU_BIT_TEST(p_cbw->dir, 7) )

       {

         if ( SCSI_CMD_WRITE_10 != p_cbw->command[0] )

         {