rename common func to avoid conflict

4 files changed, 12 insertions, 12 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 075a7f8db..2a598f051 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -208,7 +208,7 @@ tusb_error_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface
 {

   if ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL != p_interface_desc->bInterfaceSubClass) return TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS;

 

-  if ( !(is_in_range(CDC_COMM_PROTOCOL_ATCOMMAND, p_interface_desc->bInterfaceProtocol, CDC_COMM_PROTOCOL_ATCOMMAND_CDMA) ||

+  if ( !(tu_within(CDC_COMM_PROTOCOL_ATCOMMAND, p_interface_desc->bInterfaceProtocol, CDC_COMM_PROTOCOL_ATCOMMAND_CDMA) ||

          0xff == p_interface_desc->bInterfaceProtocol) )

   {

     return TUSB_ERROR_CDC_UNSUPPORTED_PROTOCOL;

@@ -282,7 +282,7 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons
 

   if ( (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest) || (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest) )

   {

-    uint16_t len = min16_of(sizeof(cdc_line_coding_t), p_request->wLength);

+    uint16_t len = tu_min16(sizeof(cdc_line_coding_t), p_request->wLength);

     usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, &p_cdc->line_coding, len);

 

     // Invoke callback

diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index 6950759d1..ca448ba5e 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -149,7 +149,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
 

   if ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL != p_interface_desc->bInterfaceSubClass) return TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS;

 

-  if ( !(is_in_range(CDC_COMM_PROTOCOL_ATCOMMAND, p_interface_desc->bInterfaceProtocol, CDC_COMM_PROTOCOL_ATCOMMAND_CDMA) ||

+  if ( !(tu_within(CDC_COMM_PROTOCOL_ATCOMMAND, p_interface_desc->bInterfaceProtocol, CDC_COMM_PROTOCOL_ATCOMMAND_CDMA) ||

          0xff == p_interface_desc->bInterfaceProtocol) )

   {

     return TUSB_ERROR_CDC_UNSUPPORTED_PROTOCOL;

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 410359e6d..b1cd1d1bd 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -412,8 +412,8 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
   //------------- STD Request -------------//

   if (p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_STANDARD)

   {

-    uint8_t const desc_type  = u16_high_u8(p_request->wValue);

-    uint8_t const desc_index = u16_low_u8 (p_request->wValue);

+    uint8_t const desc_type  = tu_u16_high(p_request->wValue);

+    uint8_t const desc_index = tu_u16_low (p_request->wValue);

     (void) desc_index;

 

     if (p_request->bRequest == TUSB_REQ_GET_DESCRIPTOR && desc_type == HID_DESC_TYPE_REPORT)

@@ -434,8 +434,8 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
     if( HID_REQ_CONTROL_GET_REPORT == p_request->bRequest )

     {

       // wValue = Report Type | Report ID

-      uint8_t const report_type = u16_high_u8(p_request->wValue);

-      uint8_t const report_id   = u16_low_u8(p_request->wValue);

+      uint8_t const report_type = tu_u16_high(p_request->wValue);

+      uint8_t const report_id   = tu_u16_low(p_request->wValue);

 

       uint16_t xferlen;

       if ( p_hid->get_report_cb )

@@ -455,8 +455,8 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
       usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, _usbd_ctrl_buf, p_request->wLength);

 

       // wValue = Report Type | Report ID

-      uint8_t const report_type = u16_high_u8(p_request->wValue);

-      uint8_t const report_id   = u16_low_u8(p_request->wValue);

+      uint8_t const report_type = tu_u16_high(p_request->wValue);

+      uint8_t const report_id   = tu_u16_low(p_request->wValue);

 

       if ( p_hid->set_report_cb )

       {

@@ -466,7 +466,7 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
     else if (HID_REQ_CONTROL_SET_IDLE == p_request->bRequest)

     {

       // TODO idle rate of report

-      p_hid->idle_rate = u16_high_u8(p_request->wValue);

+      p_hid->idle_rate = tu_u16_high(p_request->wValue);

       dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

     }

     else if (HID_REQ_CONTROL_GET_IDLE == p_request->bRequest)

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index a11212c4b..3335ad9b3 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -531,7 +531,7 @@ static void proc_read10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
   uint32_t const lba = rdwr10_get_lba(p_cbw->command) + (p_msc->xferred_len / block_sz);

 

   // remaining bytes capped at class buffer

-  int32_t nbytes = (int32_t) min32_of(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len);

+  int32_t nbytes = (int32_t) tu_min32(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len);

 

   // Application can consume smaller bytes

   nbytes = tud_msc_read10_cb(p_cbw->lun, lba, p_msc->xferred_len % block_sz, _mscd_buf, (uint32_t) nbytes);

@@ -561,7 +561,7 @@ static void proc_write10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
   msc_cbw_t const * p_cbw = &p_msc->cbw;

 

   // remaining bytes capped at class buffer

-  int32_t nbytes = (int32_t) min32_of(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len);

+  int32_t nbytes = (int32_t) tu_min32(sizeof(_mscd_buf), p_cbw->xfer_bytes-p_msc->xferred_len);

 

   // Write10 callback will be called later when usb transfer complete

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