rename port to rhport for clarification

12 files changed, 232 insertions, 232 deletions

diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c
index 84b3fa867..ab56135d8 100644
--- a/tinyusb/class/cdc/cdc_device.c
+++ b/tinyusb/class/cdc/cdc_device.c
@@ -63,7 +63,7 @@ typedef struct {
   uint8_t ep_out;

 }cdcd_data_t;

 

-// TODO multiple port

+// TODO multiple rhport

 TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) uint8_t _tmp_rx_buf[64];

 TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) uint8_t _tmp_tx_buf[64];

 

@@ -80,33 +80,33 @@ STATIC_VAR cdcd_data_t cdcd_data[CONTROLLER_DEVICE_NUMBER];
 //--------------------------------------------------------------------+

 // APPLICATION API

 //--------------------------------------------------------------------+

-bool tud_n_cdc_connected(uint8_t port)

+bool tud_n_cdc_connected(uint8_t rhport)

 {

-  return cdcd_data[port].connected;

+  return cdcd_data[rhport].connected;

 }

 

-uint32_t tud_n_cdc_available(uint8_t port)

+uint32_t tud_n_cdc_available(uint8_t rhport)

 {

   return fifo_count(&_rx_ff);

 }

 

-int tud_n_cdc_read_char(uint8_t port)

+int tud_n_cdc_read_char(uint8_t rhport)

 {

   uint8_t ch;

   return fifo_read(&_rx_ff, &ch) ? ch : (-1);

 }

 

-uint32_t tud_n_cdc_read(uint8_t port, void* buffer, uint32_t bufsize)

+uint32_t tud_n_cdc_read(uint8_t rhport, void* buffer, uint32_t bufsize)

 {

   return fifo_read_n(&_rx_ff, buffer, bufsize);

 }

 

-uint32_t tud_n_cdc_write_char(uint8_t port, char ch)

+uint32_t tud_n_cdc_write_char(uint8_t rhport, char ch)

 {

   return fifo_write(&_tx_ff, &ch);

 }

 

-uint32_t tud_n_cdc_write(uint8_t port, void const* buffer, uint32_t bufsize)

+uint32_t tud_n_cdc_write(uint8_t rhport, void const* buffer, uint32_t bufsize)

 {

   return fifo_write_n(&_tx_ff, buffer, bufsize);

 }

@@ -130,7 +130,7 @@ void cdcd_init(void)
   }

 }

 

-tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

+tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

 {

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

 

@@ -141,7 +141,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
   }

 

   uint8_t const * p_desc = descriptor_next ( (uint8_t const *) p_interface_desc );

-  cdcd_data_t * p_cdc = &cdcd_data[port];

+  cdcd_data_t * p_cdc = &cdcd_data[rhport];

 

   //------------- Communication Interface -------------//

   (*p_length) = sizeof(tusb_descriptor_interface_t);

@@ -159,7 +159,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
 

   if ( TUSB_DESC_ENDPOINT == p_desc[DESCRIPTOR_OFFSET_TYPE])

   { // notification endpoint if any

-    TU_ASSERT( tusb_dcd_edpt_open(port, (tusb_descriptor_endpoint_t const *) p_desc), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);

+    TU_ASSERT( tusb_dcd_edpt_open(rhport, (tusb_descriptor_endpoint_t const *) p_desc), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);

 

     p_cdc->ep_notif = ((tusb_descriptor_endpoint_t const *) p_desc)->bEndpointAddress;

 

@@ -181,7 +181,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
       TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType, TUSB_ERROR_DESCRIPTOR_CORRUPTED);

       TU_ASSERT(TUSB_XFER_BULK == p_endpoint->bmAttributes.xfer, TUSB_ERROR_DESCRIPTOR_CORRUPTED);

 

-      TU_ASSERT( tusb_dcd_edpt_open(port, p_endpoint), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);

+      TU_ASSERT( tusb_dcd_edpt_open(rhport, p_endpoint), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);

 

       if ( p_endpoint->bEndpointAddress &  TUSB_DIR_IN_MASK )

       {

@@ -199,22 +199,22 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
   p_cdc->interface_number   = p_interface_desc->bInterfaceNumber;

 

   // Prepare for incoming data

-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf)), TUSB_ERROR_DCD_EDPT_XFER);

+  TU_ASSERT( tusb_dcd_edpt_xfer(rhport, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf)), TUSB_ERROR_DCD_EDPT_XFER);

 

 

   return TUSB_ERROR_NONE;

 }

 

-void cdcd_close(uint8_t port)

+void cdcd_close(uint8_t rhport)

 {

   // no need to close opened pipe, dcd bus reset will put controller's endpoints to default state

-  memclr_(&cdcd_data[port], sizeof(cdcd_data_t));

+  memclr_(&cdcd_data[rhport], sizeof(cdcd_data_t));

 

   fifo_clear(&_rx_ff);

   fifo_clear(&_tx_ff);

 }

 

-tusb_error_t cdcd_control_request_st(uint8_t port, tusb_control_request_t const * p_request)

+tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request)

 {

   OSAL_SUBTASK_BEGIN

 

@@ -225,13 +225,13 @@ tusb_error_t cdcd_control_request_st(uint8_t port, tusb_control_request_t const
 

   if (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest)

   {

-    STASK_INVOKE( usbd_control_xfer_st(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,

-                                            (uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );

+    STASK_INVOKE( usbd_control_xfer_st(rhport, (tusb_dir_t) p_request->bmRequestType_bit.direction,

+                                            (uint8_t*) &cdcd_line_coding[rhport], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );

   }

   else if (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest)

   {

-    STASK_INVOKE( usbd_control_xfer_st(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,

-                                            (uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );

+    STASK_INVOKE( usbd_control_xfer_st(rhport, (tusb_dir_t) p_request->bmRequestType_bit.direction,

+                                            (uint8_t*) &cdcd_line_coding[rhport], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );

     // TODO notify application on xfer complete

   }

   else if (CDC_REQUEST_SET_CONTROL_LINE_STATE == p_request->bRequest )

@@ -241,7 +241,7 @@ tusb_error_t cdcd_control_request_st(uint8_t port, tusb_control_request_t const
       ACTIVE_DTE_NOT_PRESENT = 0x0002

     };

 

-    cdcd_data_t * p_cdc = &cdcd_data[port];

+    cdcd_data_t * p_cdc = &cdcd_data[rhport];

 

     if (p_request->wValue == ACTIVE_DTE_PRESENT)

     {

@@ -258,51 +258,51 @@ tusb_error_t cdcd_control_request_st(uint8_t port, tusb_control_request_t const
       p_cdc->connected = false;

     }

 

-    usbd_control_status(port, p_request->bmRequestType_bit.direction);

+    usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

   }

   else

   {

-    usbd_control_stall(port); // stall unsupported request

+    usbd_control_stall(rhport); // stall unsupported request

   }

 

   OSAL_SUBTASK_END

 }

 

-tusb_error_t cdcd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)

+tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)

 {

-  cdcd_data_t const * p_cdc = &cdcd_data[port];

+  cdcd_data_t const * p_cdc = &cdcd_data[rhport];

 

   if ( ep_addr == p_cdc->ep_out )

   {

     fifo_write_n(&_rx_ff, _tmp_rx_buf, xferred_bytes);

 

     // preparing for next

-    TU_ASSERT(tusb_dcd_edpt_xfer(port, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf)), TUSB_ERROR_DCD_EDPT_XFER);

+    TU_ASSERT(tusb_dcd_edpt_xfer(rhport, p_cdc->ep_out, _tmp_rx_buf, sizeof(_tmp_rx_buf)), TUSB_ERROR_DCD_EDPT_XFER);

 

     // fire callback

-    tud_cdc_rx_cb(port);

+    tud_cdc_rx_cb(rhport);

   }

 

   return TUSB_ERROR_NONE;

 }

 

-bool tud_n_cdc_flush (uint8_t port)

+bool tud_n_cdc_flush (uint8_t rhport)

 {

-  VERIFY( tud_n_cdc_connected(port) );

+  VERIFY( tud_n_cdc_connected(rhport) );

 

-  uint8_t edpt = cdcd_data[port].ep_in;

+  uint8_t edpt = cdcd_data[rhport].ep_in;

 

-  VERIFY( !tusb_dcd_edpt_busy(port, edpt) );

+  VERIFY( !tusb_dcd_edpt_busy(rhport, edpt) );

 

   uint16_t count = fifo_read_n(&_tx_ff, _tmp_tx_buf, sizeof(_tmp_tx_buf));

-  TU_ASSERT( tusb_dcd_edpt_xfer(port, edpt, _tmp_tx_buf, count) );

+  TU_ASSERT( tusb_dcd_edpt_xfer(rhport, edpt, _tmp_tx_buf, count) );

 

   return true;

 }

 

-void cdcd_sof(uint8_t port)

+void cdcd_sof(uint8_t rhport)

 {

-  tud_n_cdc_flush(port);

+  tud_n_cdc_flush(rhport);

 }

 

 #endif

diff --git a/tinyusb/class/cdc/cdc_device.h b/tinyusb/class/cdc/cdc_device.h
index 96cc1e868..c5c57c36e 100644
--- a/tinyusb/class/cdc/cdc_device.h
+++ b/tinyusb/class/cdc/cdc_device.h
@@ -55,15 +55,15 @@
 //--------------------------------------------------------------------+

 // APPLICATION API (Multiple Ports)

 //--------------------------------------------------------------------+

-bool     tud_n_cdc_connected  (uint8_t port);

-uint32_t tud_n_cdc_available  (uint8_t port);

+bool     tud_n_cdc_connected  (uint8_t rhport);

+uint32_t tud_n_cdc_available  (uint8_t rhport);

 

-int      tud_n_cdc_read_char  (uint8_t port);

-uint32_t tud_n_cdc_read       (uint8_t port, void* buffer, uint32_t bufsize);

+int      tud_n_cdc_read_char  (uint8_t rhport);

+uint32_t tud_n_cdc_read       (uint8_t rhport, void* buffer, uint32_t bufsize);

 

-uint32_t tud_n_cdc_write_char (uint8_t port, char ch);

-uint32_t tud_n_cdc_write      (uint8_t port, void const* buffer, uint32_t bufsize);

-bool     tud_n_cdc_flush      (uint8_t port);

+uint32_t tud_n_cdc_write_char (uint8_t rhport, char ch);

+uint32_t tud_n_cdc_write      (uint8_t rhport, void const* buffer, uint32_t bufsize);

+bool     tud_n_cdc_flush      (uint8_t rhport);

 

 //--------------------------------------------------------------------+

 // APPLICATION API (Single Port)

@@ -81,8 +81,8 @@ static inline bool     tud_cdc_flush      (void)
 //--------------------------------------------------------------------+

 // APPLICATION CALLBACK API

 //--------------------------------------------------------------------+

-//void tud_cdc_line_coding_changed_cb(uint8_t port, cdc_line_coding_t* p_line_coding);

-void tud_cdc_rx_cb(uint8_t port);

+//void tud_cdc_line_coding_changed_cb(uint8_t rhport, cdc_line_coding_t* p_line_coding);

+void tud_cdc_rx_cb(uint8_t rhport);

 

 //--------------------------------------------------------------------+

 // USBD-CLASS DRIVER API

@@ -90,12 +90,12 @@ void tud_cdc_rx_cb(uint8_t port);
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void cdcd_init(void);

-tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

-tusb_error_t cdcd_control_request_st(uint8_t port, tusb_control_request_t const * p_request);

-tusb_error_t cdcd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

-void cdcd_close(uint8_t port);

+tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

+tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

+tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

+void cdcd_close(uint8_t rhport);

 

-void cdcd_sof(uint8_t port);

+void cdcd_sof(uint8_t rhport);

 

 #endif

 

diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c
index f498b2adb..b75dfbcc5 100644
--- a/tinyusb/class/hid/hid_device.c
+++ b/tinyusb/class/hid/hid_device.c
@@ -108,18 +108,18 @@ TUSB_CFG_ATTR_USBRAM STATIC_VAR uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ];
 #if TUSB_CFG_DEVICE_HID_KEYBOARD

 STATIC_VAR hidd_interface_t keyboardd_data;

 

-bool tud_hid_keyboard_busy(uint8_t port)

+bool tud_hid_keyboard_busy(uint8_t rhport)

 {

-  return tusb_dcd_edpt_busy(port, keyboardd_data.edpt_addr);

+  return tusb_dcd_edpt_busy(rhport, keyboardd_data.edpt_addr);

 }

 

-tusb_error_t tud_hid_keyboard_send(uint8_t port, hid_keyboard_report_t const *p_report)

+tusb_error_t tud_hid_keyboard_send(uint8_t rhport, hid_keyboard_report_t const *p_report)

 {

   VERIFY(tud_mounted(), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED);

 

-  hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[port];

+  hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[rhport];

 

-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_kbd->edpt_addr, (void*) p_report, sizeof(hid_keyboard_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;

+  TU_ASSERT( tusb_dcd_edpt_xfer(rhport, p_kbd->edpt_addr, (void*) p_report, sizeof(hid_keyboard_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;

 

   return TUSB_ERROR_NONE;

 }

@@ -131,18 +131,18 @@ tusb_error_t tud_hid_keyboard_send(uint8_t port, hid_keyboard_report_t const *p_
 #if TUSB_CFG_DEVICE_HID_MOUSE

 STATIC_VAR hidd_interface_t moused_data;

 

-bool tud_hid_mouse_is_busy(uint8_t port)

+bool tud_hid_mouse_is_busy(uint8_t rhport)

 {

-  return tusb_dcd_edpt_busy(port, moused_data.edpt_addr);

+  return tusb_dcd_edpt_busy(rhport, moused_data.edpt_addr);

 }

 

-tusb_error_t tud_hid_mouse_send(uint8_t port, hid_mouse_report_t const *p_report)

+tusb_error_t tud_hid_mouse_send(uint8_t rhport, hid_mouse_report_t const *p_report)

 {

   VERIFY(tud_mounted(), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED);

 

-  hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[port];

+  hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[rhport];

 

-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_mouse->edpt_addr, (void*) p_report, sizeof(hid_mouse_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;

+  TU_ASSERT( tusb_dcd_edpt_xfer(rhport, p_mouse->edpt_addr, (void*) p_report, sizeof(hid_mouse_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;

 

   return TUSB_ERROR_NONE;

 }

@@ -168,7 +168,7 @@ void hidd_init(void)
   }

 }

 

-void hidd_close(uint8_t port)

+void hidd_close(uint8_t rhport)

 {

   for(uint8_t i=0; i<HIDD_NUMBER_OF_SUBCLASS; i++)

   {

@@ -176,7 +176,7 @@ void hidd_close(uint8_t port)
   }

 }

 

-tusb_error_t hidd_control_request_st(uint8_t port, tusb_control_request_t const * p_request)

+tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request)

 {

   uint8_t subclass_idx;

   for(subclass_idx=0; subclass_idx<HIDD_NUMBER_OF_SUBCLASS; subclass_idx++)

@@ -209,10 +209,10 @@ tusb_error_t hidd_control_request_st(uint8_t port, tusb_control_request_t const
       // copy to allow report descriptor not to be in USBRAM

       memcpy(m_hid_buffer, p_hid->p_report_desc, p_hid->report_length);

 

-      STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, m_hid_buffer, p_hid->report_length), err );

+      STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, m_hid_buffer, p_hid->report_length), err );

     }else

     {

-      usbd_control_stall(port);

+      usbd_control_stall(rhport);

     }

   }

   //------------- Class Specific Request -------------//

@@ -223,41 +223,41 @@ tusb_error_t hidd_control_request_st(uint8_t port, tusb_control_request_t const
       // wValue = Report Type | Report ID

       void* p_buffer = NULL;

 

-      uint16_t actual_length = p_driver->get_report_cb(port, (hid_request_report_type_t) u16_high_u8(p_request->wValue),

+      uint16_t actual_length = p_driver->get_report_cb(rhport, (hid_request_report_type_t) u16_high_u8(p_request->wValue),

                                                        &p_buffer, p_request->wLength);

       STASK_ASSERT( p_buffer != NULL && actual_length > 0 );

 

-      STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, p_buffer, actual_length), err );

+      STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_buffer, actual_length), err );

     }

     else if ( (HID_REQUEST_CONTROL_SET_REPORT == p_request->bRequest) && (p_driver->set_report_cb != NULL) )

     {

       //        return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT; // TODO test STALL control out endpoint (with mouse+keyboard)

       // wValue = Report Type | Report ID

-      STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, m_hid_buffer, p_request->wLength), err );

+      STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, m_hid_buffer, p_request->wLength), err );

       STASK_ASSERT_STATUS(err);

 

-      p_driver->set_report_cb(port, u16_high_u8(p_request->wValue), m_hid_buffer, p_request->wLength);

+      p_driver->set_report_cb(rhport, u16_high_u8(p_request->wValue), m_hid_buffer, p_request->wLength);

     }

     else if (HID_REQUEST_CONTROL_SET_IDLE == p_request->bRequest)

     {

       // uint8_t idle_rate = u16_high_u8(p_request->wValue);

-      usbd_control_status(port, p_request->bmRequestType_bit.direction);

+      usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

     }else

     {

 //      HID_REQUEST_CONTROL_GET_IDLE:

 //      HID_REQUEST_CONTROL_GET_PROTOCOL:

 //      HID_REQUEST_CONTROL_SET_PROTOCOL:

-      usbd_control_stall(port);

+      usbd_control_stall(rhport);

     }

   }else

   {

-    usbd_control_stall(port);

+    usbd_control_stall(rhport);

   }

 

   OSAL_SUBTASK_END

 }

 

-tusb_error_t hidd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

+tusb_error_t hidd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

 {

   uint8_t const *p_desc = (uint8_t const *) p_interface_desc;

 

@@ -283,7 +283,7 @@ tusb_error_t hidd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
 

         VERIFY(p_hid, TUSB_ERROR_FAILED);

 

-        VERIFY( tusb_dcd_edpt_open(port, p_desc_endpoint), TUSB_ERROR_DCD_FAILED );

+        VERIFY( tusb_dcd_edpt_open(rhport, p_desc_endpoint), TUSB_ERROR_DCD_FAILED );

 

         p_hid->edpt_addr = p_desc_endpoint->bEndpointAddress;

 

@@ -308,14 +308,14 @@ tusb_error_t hidd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t hidd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes)

+tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes)

 {

   for(uint8_t i=0; i<HIDD_NUMBER_OF_SUBCLASS; i++)

   {

     hidd_interface_t * const p_interface = hidd_class_driver[i].p_interface;

     if ( (p_interface != NULL) && (edpt_addr == p_interface->edpt_addr) )

     {

-      hidd_class_driver[i].xfer_cb(port, event, xferred_bytes);

+      hidd_class_driver[i].xfer_cb(rhport, event, xferred_bytes);

     }

   }

 

diff --git a/tinyusb/class/hid/hid_device.h b/tinyusb/class/hid/hid_device.h
index 78274d492..a97394ea5 100644
--- a/tinyusb/class/hid/hid_device.h
+++ b/tinyusb/class/hid/hid_device.h
@@ -57,15 +57,15 @@
  *  @{ */

 

 /** \brief      Check if the interface is currently busy or not

- * \param[in]   port USB Controller ID

+ * \param[in]   rhport USB Controller ID

  * \retval      true if the interface is busy meaning the stack is still transferring/waiting data from/to host

  * \retval      false if the interface is not busy meaning the stack successfully transferred data from/to host

  * \note        This function is primarily used for polling/waiting result after \ref tusbd_hid_keyboard_send.

  */

-bool tud_hid_keyboard_busy(uint8_t port);

+bool tud_hid_keyboard_busy(uint8_t rhport);

 

 /** \brief        Submit USB transfer

- * \param[in]		  port USB Controller ID

+ * \param[in]		  rhport USB Controller ID

  * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

@@ -75,7 +75,7 @@ bool tud_hid_keyboard_busy(uint8_t port);
  * \note          This function is non-blocking and returns immediately. Data will be transferred when USB Host work with this interface.

  *                The result of usb transfer will be reported by the interface's callback function

  */

-tusb_error_t tud_hid_keyboard_send(uint8_t port, hid_keyboard_report_t const *p_report);

+tusb_error_t tud_hid_keyboard_send(uint8_t rhport, hid_keyboard_report_t const *p_report);

 

 //--------------------------------------------------------------------+

 // APPLICATION CALLBACK API

@@ -83,18 +83,18 @@ tusb_error_t tud_hid_keyboard_send(uint8_t port, hid_keyboard_report_t const *p_
 

 /** \brief      Callback function that is invoked when an transferring event occurred

  *              after invoking \ref tusbd_hid_keyboard_send

- * \param[in]		port	USB Controller ID

+ * \param[in]		rhport	USB Controller ID

  * \param[in]   event an value from \ref tusb_event_t

  * \note        event can be one of following

  *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.

  *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.

  *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.

  */

-void tud_hid_keyboard_cb(uint8_t port, tusb_event_t event, uint32_t xferred_bytes);

+void tud_hid_keyboard_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_bytes);

 

 /** \brief      Callback function that is invoked when USB host request \ref HID_REQUEST_CONTROL_GET_REPORT

  *              via control endpoint.

- * \param[in]		port	USB Controller ID

+ * \param[in]		rhport	USB Controller ID

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

  * \param[out]  pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

  * \param[in]   requested_length  number of bytes that host requested

@@ -105,18 +105,18 @@ void tud_hid_keyboard_cb(uint8_t port, tusb_event_t event, uint32_t xferred_byte
  *              the completion of this control request will not be reported to application.

  *              For Keyboard, USB host often uses this to turn on/off the LED for CAPLOCKS, NUMLOCK (\ref hid_keyboard_led_bm_t)

  */

-uint16_t tud_hid_keyboard_get_report_cb(uint8_t port, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length);

+uint16_t tud_hid_keyboard_get_report_cb(uint8_t rhport, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length);

 

 /** \brief      Callback function that is invoked when USB host request \ref HID_REQUEST_CONTROL_SET_REPORT

  *              via control endpoint.

- * \param[in]		port	USB Controller ID

+ * \param[in]		rhport	USB Controller ID

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

  * \param[in]   p_report_data buffer containing the report's data

  * \param[in]   length  number of bytes in the \a p_report_data

  * \note        By the time this callback is invoked, the USB control transfer is already completed in the hardware side.

  *              Application are free to handle data at its own will.

  */

-void tud_hid_keyboard_set_report_cb(uint8_t port, hid_request_report_type_t report_type, uint8_t p_report_data[], uint16_t length);

+void tud_hid_keyboard_set_report_cb(uint8_t rhport, hid_request_report_type_t report_type, uint8_t p_report_data[], uint16_t length);

 

 /** @} */

 /** @} */

@@ -130,15 +130,15 @@ void tud_hid_keyboard_set_report_cb(uint8_t port, hid_request_report_type_t repo
  *  @{ */

 

 /** \brief      Check if the interface is currently busy or not

- * \param[in]   port USB Controller ID

+ * \param[in]   rhport USB Controller ID

  * \retval      true if the interface is busy meaning the stack is still transferring/waiting data from/to host

  * \retval      false if the interface is not busy meaning the stack successfully transferred data from/to host

  * \note        This function is primarily used for polling/waiting result after \ref tusbd_hid_mouse_send.

  */

-bool tud_hid_mouse_is_busy(uint8_t port);

+bool tud_hid_mouse_is_busy(uint8_t rhport);

 

 /** \brief        Perform transfer queuing

- * \param[in]		  port USB Controller ID

+ * \param[in]		  rhport USB Controller ID

  * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

@@ -148,7 +148,7 @@ bool tud_hid_mouse_is_busy(uint8_t port);
  * \note          This function is non-blocking and returns immediately. Data will be transferred when USB Host work with this interface.

  *                The result of usb transfer will be reported by the interface's callback function

  */

-tusb_error_t tud_hid_mouse_send(uint8_t port, hid_mouse_report_t const *p_report);

+tusb_error_t tud_hid_mouse_send(uint8_t rhport, hid_mouse_report_t const *p_report);

 

 //--------------------------------------------------------------------+

 // APPLICATION CALLBACK API

@@ -156,18 +156,18 @@ tusb_error_t tud_hid_mouse_send(uint8_t port, hid_mouse_report_t const *p_report
 

 /** \brief      Callback function that is invoked when an transferring event occurred

  *              after invoking \ref tusbd_hid_mouse_send

- * \param[in]		port	USB Controller ID

+ * \param[in]		rhport	USB Controller ID

  * \param[in]   event an value from \ref tusb_event_t

  * \note        event can be one of following

  *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.

  *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.

  *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.

  */

-void tud_hid_mouse_cb(uint8_t port, tusb_event_t event, uint32_t xferred_bytes);

+void tud_hid_mouse_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_bytes);

 

 /** \brief      Callback function that is invoked when USB host request \ref HID_REQUEST_CONTROL_GET_REPORT

  *              via control endpoint.

- * \param[in]		port	USB Controller ID

+ * \param[in]		rhport	USB Controller ID

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

  * \param[out]  pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

  * \param[in]   requested_length  number of bytes that host requested

@@ -177,18 +177,18 @@ void tud_hid_mouse_cb(uint8_t port, tusb_event_t event, uint32_t xferred_bytes);
  * \note        After this callback, the request is silently executed by the tinyusb stack, thus

  *              the completion of this control request will not be reported to application

  */

-uint16_t tud_hid_mouse_get_report_cb(uint8_t port, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length);

+uint16_t tud_hid_mouse_get_report_cb(uint8_t rhport, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length);

 

 /** \brief      Callback function that is invoked when USB host request \ref HID_REQUEST_CONTROL_SET_REPORT

  *              via control endpoint.

- * \param[in]		port	USB Controller ID

+ * \param[in]		rhport	USB Controller ID

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

  * \param[in]   p_report_data buffer containing the report's data

  * \param[in]   length  number of bytes in the \a p_report_data

  * \note        By the time this callback is invoked, the USB control transfer is already completed in the hardware side.

  *              Application are free to handle data at its own will.

  */

-void tud_hid_mouse_set_report_cb(uint8_t port, hid_request_report_type_t report_type, uint8_t p_report_data[], uint16_t length);

+void tud_hid_mouse_set_report_cb(uint8_t rhport, hid_request_report_type_t report_type, uint8_t p_report_data[], uint16_t length);

 

 /** @} */

 /** @} */

@@ -201,10 +201,10 @@ void tud_hid_mouse_set_report_cb(uint8_t port, hid_request_report_type_t report_
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void hidd_init(void);

-tusb_error_t hidd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

-tusb_error_t hidd_control_request_st(uint8_t port, tusb_control_request_t const * p_request);

-tusb_error_t hidd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

-void hidd_close(uint8_t port);

+tusb_error_t hidd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

+tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

+tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

+void hidd_close(uint8_t rhport);

 

 #endif

 

diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c
index 0be14200c..e3ccd038e 100644
--- a/tinyusb/class/msc/msc_device.c
+++ b/tinyusb/class/msc/msc_device.c
@@ -83,7 +83,7 @@ TUSB_CFG_ATTR_USBRAM STATIC_VAR mscd_interface_t mscd_data;
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

-static bool read10_write10_data_xfer(uint8_t port, mscd_interface_t* p_msc);

+static bool read10_write10_data_xfer(uint8_t rhport, mscd_interface_t* p_msc);

 

 //--------------------------------------------------------------------+

 // USBD-CLASS API

@@ -93,12 +93,12 @@ void mscd_init(void)
   memclr_(&mscd_data, sizeof(mscd_interface_t));

 }

 

-void mscd_close(uint8_t port)

+void mscd_close(uint8_t rhport)

 {

   memclr_(&mscd_data, sizeof(mscd_interface_t));

 }

 

-tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

+tusb_error_t mscd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

 {

   VERIFY( ( MSC_SUBCLASS_SCSI == p_interface_desc->bInterfaceSubClass &&

             MSC_PROTOCOL_BOT  == p_interface_desc->bInterfaceProtocol ), TUSB_ERROR_MSC_UNSUPPORTED_PROTOCOL );

@@ -112,7 +112,7 @@ tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
     TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType &&

               TUSB_XFER_BULK == p_endpoint->bmAttributes.xfer, TUSB_ERROR_DESCRIPTOR_CORRUPTED);

 

-    TU_ASSERT( tusb_dcd_edpt_open(port, p_endpoint), TUSB_ERROR_DCD_FAILED );

+    TU_ASSERT( tusb_dcd_edpt_open(rhport, p_endpoint), TUSB_ERROR_DCD_FAILED );

 

     if ( p_endpoint->bEndpointAddress &  TUSB_DIR_IN_MASK )

     {

@@ -130,12 +130,12 @@ tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
   (*p_length) += sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t);

 

   //------------- Queue Endpoint OUT for Command Block Wrapper -------------//

-  TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)), TUSB_ERROR_DCD_EDPT_XFER );

+  TU_ASSERT( tusb_dcd_edpt_xfer(rhport, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)), TUSB_ERROR_DCD_EDPT_XFER );

 

   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t mscd_control_request_st(uint8_t port, tusb_control_request_t const * p_request)

+tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request)

 {

   OSAL_SUBTASK_BEGIN

 

@@ -147,16 +147,16 @@ tusb_error_t mscd_control_request_st(uint8_t port, tusb_control_request_t const
 

   if(MSC_REQUEST_RESET == p_request->bRequest)

   {

-    usbd_control_status(port, p_request->bmRequestType_bit.direction);

+    usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

   }

   else if (MSC_REQUEST_GET_MAX_LUN == p_request->bRequest)

   {

     // Note: lpc11/13u need xfer data's address to be aligned 64 -> make use of scsi_data instead of using max_lun directly

     p_msc->scsi_data[0] = p_msc->max_lun;

-    STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1), err);

+    STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1), err);

   }else

   {

-    usbd_control_stall(port); // stall unsupported request

+    usbd_control_stall(rhport); // stall unsupported request

   }

 

   OSAL_SUBTASK_END

@@ -165,7 +165,7 @@ tusb_error_t mscd_control_request_st(uint8_t port, tusb_control_request_t const
 //--------------------------------------------------------------------+

 // MSCD APPLICATION CALLBACK

 //--------------------------------------------------------------------+

-tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)

+tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)

 {

   mscd_interface_t* const p_msc = &mscd_data;

   msc_cbw_t*        const p_cbw = &p_msc->cbw;

@@ -195,7 +195,7 @@ tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uin
       if ( (SCSI_CMD_READ_10 == p_cbw->command[0]) || (SCSI_CMD_WRITE_10 == p_cbw->command[0]) )

       {

         // Read10 & Write10 data len is same as CBW's xfer bytes

-        read10_write10_data_xfer(port, p_msc);

+        read10_write10_data_xfer(rhport, p_msc);

       }

       else

       {

@@ -205,7 +205,7 @@ tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uin
         // TODO SCSI data out transfer is not yet supported

         ASSERT_FALSE( p_cbw->xfer_bytes > 0 && !BIT_TEST_(p_cbw->dir, 7), TUSB_ERROR_NOT_SUPPORTED_YET);

 

-        p_csw->status = tud_msc_scsi_cb(port, p_cbw->lun, p_cbw->command, &p_buffer, &p_msc->data_len);

+        p_csw->status = tud_msc_scsi_cb(rhport, p_cbw->lun, p_cbw->command, &p_buffer, &p_msc->data_len);

 

         if ( p_cbw->xfer_bytes == 0)

         {

@@ -223,14 +223,14 @@ tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uin
           if ( p_buffer == NULL || p_msc->data_len == 0 )

           {

             // application does not provide data to response --> possibly unsupported SCSI command

-            tusb_dcd_edpt_stall(port, ep_data);

+            tusb_dcd_edpt_stall(rhport, ep_data);

             p_csw->status = MSC_CSW_STATUS_FAILED;

 

             p_msc->stage = MSC_STAGE_STATUS;

           }else

           {

             memcpy(p_msc->scsi_data, p_buffer, p_msc->data_len);

-            TU_ASSERT( tusb_dcd_edpt_xfer(port, ep_data, p_msc->scsi_data, p_msc->data_len), TUSB_ERROR_DCD_EDPT_XFER );

+            TU_ASSERT( tusb_dcd_edpt_xfer(rhport, ep_data, p_msc->scsi_data, p_msc->data_len), TUSB_ERROR_DCD_EDPT_XFER );

           }

         }

       }

@@ -247,7 +247,7 @@ tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uin
       else if ( (SCSI_CMD_READ_10 == p_cbw->command[0]) || (SCSI_CMD_WRITE_10 == p_cbw->command[0]) )

       {

         // Can be executed several times e.g write 8K bytes (several flash write)

-        read10_write10_data_xfer(port, p_msc);

+        read10_write10_data_xfer(rhport, p_msc);

       }else

       {

         // unlikely error

@@ -264,17 +264,17 @@ tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t ep_addr, tusb_event_t event, uin
     // Move to default CMD stage after sending status

     p_msc->stage         = MSC_STAGE_CMD;

 

-    TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_in , (uint8_t*) &p_msc->csw, sizeof(msc_csw_t)) );

+    TU_ASSERT( tusb_dcd_edpt_xfer(rhport, p_msc->ep_in , (uint8_t*) &p_msc->csw, sizeof(msc_csw_t)) );

 

     //------------- Queue the next CBW -------------//

-    TU_ASSERT( tusb_dcd_edpt_xfer(port, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)) );

+    TU_ASSERT( tusb_dcd_edpt_xfer(rhport, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)) );

   }

 

   return TUSB_ERROR_NONE;

 }

 

 // return true if data phase is complete, false if not yet complete

-static bool read10_write10_data_xfer(uint8_t port, mscd_interface_t* p_msc)

+static bool read10_write10_data_xfer(uint8_t rhport, mscd_interface_t* p_msc)

 {

   msc_cbw_t* const p_cbw = &p_msc->cbw;

   msc_csw_t* const p_csw = &p_msc->csw;

@@ -297,10 +297,10 @@ static bool read10_write10_data_xfer(uint8_t port, mscd_interface_t* p_msc)
 

   if (SCSI_CMD_READ_10 == p_cbw->command[0])

   {

-    xfer_block = tud_msc_read10_cb (port, p_cbw->lun, &p_buffer, lba, block_count);

+    xfer_block = tud_msc_read10_cb (rhport, p_cbw->lun, &p_buffer, lba, block_count);

   }else

   {

-    xfer_block = tud_msc_write10_cb(port, p_cbw->lun, &p_buffer, lba, block_count);

+    xfer_block = tud_msc_write10_cb(rhport, p_cbw->lun, &p_buffer, lba, block_count);

   }

 

   xfer_block = min16_of(xfer_block, block_count);

@@ -311,12 +311,12 @@ static bool read10_write10_data_xfer(uint8_t port, mscd_interface_t* p_msc)
     p_csw->data_residue = p_cbw->xfer_bytes;

     p_csw->status       = MSC_CSW_STATUS_FAILED;

 

-    tusb_dcd_edpt_stall(port, ep_data);

+    tusb_dcd_edpt_stall(rhport, ep_data);

 

     return true;

   }else

   {

-    TU_ASSERT( tusb_dcd_edpt_xfer(port, ep_data, p_buffer, xfer_block * block_size) );

+    TU_ASSERT( tusb_dcd_edpt_xfer(rhport, ep_data, p_buffer, xfer_block * block_size) );

   }

 

   return true;

diff --git a/tinyusb/class/msc/msc_device.h b/tinyusb/class/msc/msc_device.h
index cf8362250..56f5d06d5 100644
--- a/tinyusb/class/msc/msc_device.h
+++ b/tinyusb/class/msc/msc_device.h
@@ -61,7 +61,7 @@
 //--------------------------------------------------------------------+

 

 /** \brief 			Callback that is invoked when tinyusb stack received \ref SCSI_CMD_READ_10 command from host

- * \param[in]		port	    USB Controller ID

+ * \param[in]		rhport	    USB Controller ID

  * \param[in]		lun         Targeted Logical Unit

  * \param[out]	pp_buffer   Pointer to buffer which application need to update with the response data's address.

  *                          Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

@@ -76,10 +76,10 @@
  *              \n\n Although this callback is called by tinyusb device task (non-isr context), however as all the classes share

  *              the same task (to save resource), any delay in this callback will cause delay in reponse on other classes.

  */

-uint16_t tud_msc_read10_cb (uint8_t port, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count);

+uint16_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count);

 

 /** \brief 			Callback that is invoked when tinyusb stack received \ref SCSI_CMD_WRITE_10 command from host

- * \param[in]		port	    USB Controller ID

+ * \param[in]		rhport	    USB Controller ID

  * \param[in]		lun         Targeted Logical Unit

  * \param[out]	pp_buffer   Pointer to buffer which application need to update with the address to hold data from host

  *                          Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

@@ -94,12 +94,12 @@ uint16_t tud_msc_read10_cb (uint8_t port, uint8_t lun, void** pp_buffer, uint32_
  *              \n\n Although this callback is called by tinyusb device task (non-isr context), however as all the classes share

  *              the same task (to save resource), any delay in this callback will cause delay in reponse on other classes.

  */

-uint16_t tud_msc_write10_cb(uint8_t port, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count);

+uint16_t tud_msc_write10_cb(uint8_t rhport, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count);

 

 // p_length [in,out] allocated/maximum length, application update with actual length

 /** \brief 			Callback that is invoked when tinyusb stack received an SCSI command other than \ref SCSI_CMD_WRITE_10 and

  *              \ref SCSI_CMD_READ_10 command from host

- * \param[in]		port	    USB Controller ID

+ * \param[in]		rhport	    USB Controller ID

  * \param[in]		lun         Targeted Logical Unit

  * \param[in]		scsi_cmd    SCSI command contents, application should examine this command block to know which command host requested

  * \param[out]	pp_buffer   Pointer to buffer which application need to update with the address to transfer data with host.

@@ -111,7 +111,7 @@ uint16_t tud_msc_write10_cb(uint8_t port, uint8_t lun, void** pp_buffer, uint32_
  * \note        Although this callback is called by tinyusb device task (non-isr context), however as all the classes share

  *              the same task (to save resource), any delay in this callback will cause delay in reponse on other classes.

  */

-msc_csw_status_t tud_msc_scsi_cb (uint8_t port, uint8_t lun, uint8_t scsi_cmd[16], void const ** pp_buffer, uint16_t* p_length);

+msc_csw_status_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[16], void const ** pp_buffer, uint16_t* p_length);

 

 /** @} */

 /** @} */

@@ -122,10 +122,10 @@ msc_csw_status_t tud_msc_scsi_cb (uint8_t port, uint8_t lun, uint8_t scsi_cmd[16
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void mscd_init(void);

-tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

-tusb_error_t mscd_control_request_st(uint8_t port, tusb_control_request_t const * p_request);

-tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

-void mscd_close(uint8_t port);

+tusb_error_t mscd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

+tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

+tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

+void mscd_close(uint8_t rhport);

 

 #endif

 

diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
index 92d2ded3e..08bfa07f8 100644
--- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c
+++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
@@ -164,28 +164,28 @@ static void queue_xfer_in_next_td(uint8_t ep_id);
 //--------------------------------------------------------------------+

 // CONTROLLER API

 //--------------------------------------------------------------------+

-void tusb_dcd_connect(uint8_t port)

+void tusb_dcd_connect(uint8_t rhport)

 {

-  (void) port;

+  (void) rhport;

   LPC_USB->DEVCMDSTAT |= CMDSTAT_DEVICE_CONNECT_MASK;

 }

 

-void tusb_dcd_set_config(uint8_t port, uint8_t config_num)

+void tusb_dcd_set_config(uint8_t rhport, uint8_t config_num)

 {

 

 }

 

-void tusb_dcd_set_address(uint8_t port, uint8_t dev_addr)

+void tusb_dcd_set_address(uint8_t rhport, uint8_t dev_addr)

 {

-  (void) port;

+  (void) rhport;

 

   LPC_USB->DEVCMDSTAT &= ~CMDSTAT_DEVICE_ADDR_MASK;

   LPC_USB->DEVCMDSTAT |= dev_addr;

 }

 

-bool tusb_dcd_init(uint8_t port)

+bool tusb_dcd_init(uint8_t rhport)

 {

-  (void) port;

+  (void) rhport;

 

   LPC_USB->EPLISTSTART  = (uint32_t) dcd_data.qhd;

   LPC_USB->DATABUFSTART = 0x20000000; // only SRAM1 & USB RAM can be used for transfer

@@ -250,7 +250,7 @@ static void endpoint_non_control_isr(uint32_t int_status)
         {

           edpt_hdl_t edpt_hdl =

           {

-              .port     = 0,

+              .rhport     = 0,

               .index      = ep_id,

               .class_code = dcd_data.class_code[ep_id]

           };

@@ -288,7 +288,7 @@ static void endpoint_control_isr(uint32_t int_status)
 

     if ( BIT_TEST_(dcd_data.current_ioc, ep_id) )

     {

-      edpt_hdl_t edpt_hdl = { .port = 0 };

+      edpt_hdl_t edpt_hdl = { .rhport = 0 };

 

       dcd_data.current_ioc = BIT_CLR_(dcd_data.current_ioc, ep_id);

 

@@ -298,9 +298,9 @@ static void endpoint_control_isr(uint32_t int_status)
   }

 }

 

-void hal_dcd_isr(uint8_t port)

+void hal_dcd_isr(uint8_t rhport)

 {

-  (void) port;

+  (void) rhport;

 

   uint32_t const int_enable = LPC_USB->INTEN;

   uint32_t const int_status = LPC_USB->INTSTAT & int_enable;

@@ -351,7 +351,7 @@ void hal_dcd_isr(uint8_t port)
   if ( BIT_TEST_(int_status, 0) && (dev_cmd_stat & CMDSTAT_SETUP_RECEIVED_MASK) )

   { // received control request from host

     // copy setup request & acknowledge so that the next setup can be received by hw

-    tusb_dcd_setup_received(port, (uint8_t*)&dcd_data.setup_request);

+    tusb_dcd_setup_received(rhport, (uint8_t*)&dcd_data.setup_request);

 

     // NXP control flowchart clear Active & Stall on both Control IN/OUT endpoints

     dcd_data.qhd[0][0].stall = dcd_data.qhd[1][0].stall = 0;

@@ -375,16 +375,16 @@ void hal_dcd_isr(uint8_t port)
 //--------------------------------------------------------------------+

 // CONTROL PIPE API

 //--------------------------------------------------------------------+

-void tusb_dcd_control_stall(uint8_t port)

+void tusb_dcd_control_stall(uint8_t rhport)

 {

-  (void) port;

+  (void) rhport;

   // TODO cannot able to STALL Control OUT endpoint !!!!! FIXME try some walk-around

   dcd_data.qhd[0][0].stall = dcd_data.qhd[1][0].stall = 1;

 }

 

-bool tusb_dcd_control_xfer(uint8_t port, tusb_dir_t dir, uint8_t * p_buffer, uint16_t length, bool int_on_complete)

+bool tusb_dcd_control_xfer(uint8_t rhport, tusb_dir_t dir, uint8_t * p_buffer, uint16_t length, bool int_on_complete)

 {

-  (void) port;

+  (void) rhport;

 

   // determine Endpoint where Data & Status phase occurred (IN or OUT)

   uint8_t const ep_data   = (dir == TUSB_DIR_IN) ? 1 : 0;

@@ -440,7 +440,7 @@ bool dcd_pipe_is_stalled(edpt_hdl_t edpt_hdl)
   return dcd_data.qhd[edpt_hdl.index][0].stall || dcd_data.qhd[edpt_hdl.index][1].stall;

 }

 

-void tusb_dcd_edpt_clear_stall(uint8_t port, uint8_t edpt_addr)

+void tusb_dcd_edpt_clear_stall(uint8_t rhport, uint8_t edpt_addr)

 {

   uint8_t ep_id = edpt_addr2phy(edpt_addr);

 //  uint8_t active_buffer = BIT_TEST_(LPC_USB->EPINUSE, ep_id) ? 1 : 0;

@@ -458,9 +458,9 @@ void tusb_dcd_edpt_clear_stall(uint8_t port, uint8_t edpt_addr)
   }

 }

 

-edpt_hdl_t tusb_dcd_edpt_open(uint8_t port, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)

+edpt_hdl_t tusb_dcd_edpt_open(uint8_t rhport, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)

 {

-  (void) port;

+  (void) rhport;

   edpt_hdl_t const null_handle = { 0 };

 

   if (p_endpoint_desc->bmAttributes.xfer == TUSB_XFER_ISOCHRONOUS) return null_handle; // TODO not support ISO yet

@@ -485,7 +485,7 @@ edpt_hdl_t tusb_dcd_edpt_open(uint8_t port, tusb_descriptor_endpoint_t const * p
 

   return (edpt_hdl_t)

       {

-          .port     = 0,

+          .rhport     = 0,

           .index      = ep_id,

           .class_code = class_code

       };

diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index f2b73e1de..97e6821ea 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -113,15 +113,15 @@ enum { USBD_CLASS_DRIVER_COUNT = sizeof(usbd_class_drivers) / sizeof(usbd_class_
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

-static tusb_error_t proc_set_config_req(uint8_t port, uint8_t config_number);

-static uint16_t get_descriptor(uint8_t port, tusb_control_request_t const * const p_request, uint8_t const ** pp_buffer);

+static tusb_error_t proc_set_config_req(uint8_t rhport, uint8_t config_number);

+static uint16_t get_descriptor(uint8_t rhport, tusb_control_request_t const * const p_request, uint8_t const ** pp_buffer);

 

 //--------------------------------------------------------------------+

 // APPLICATION INTERFACE

 //--------------------------------------------------------------------+

-bool tud_n_mounted(uint8_t port)

+bool tud_n_mounted(uint8_t rhport)

 {

-    return usbd_devices[port].state == TUSB_DEVICE_STATE_CONFIGURED;

+    return usbd_devices[rhport].state == TUSB_DEVICE_STATE_CONFIGURED;

 }

 

 //--------------------------------------------------------------------+

@@ -140,7 +140,7 @@ typedef enum
 

 typedef struct ATTR_ALIGNED(4)

 {

-  uint8_t port;

+  uint8_t rhport;

   uint8_t event_id;

   uint8_t sub_event_id;

   uint8_t reserved;

@@ -172,7 +172,7 @@ static osal_queue_t usbd_queue_hdl;
 //--------------------------------------------------------------------+

 // IMPLEMENTATION

 //--------------------------------------------------------------------+

-static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t const * const p_request);

+static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request_t const * const p_request);

 static tusb_error_t usbd_main_stk(void);

 

 tusb_error_t usbd_init (void)

@@ -255,7 +255,7 @@ static tusb_error_t usbd_main_stk(void)
 

   if ( USBD_EVENTID_SETUP_RECEIVED == event.event_id )

   {

-    STASK_INVOKE( proc_control_request_st(event.port, &event.setup_received), error );

+    STASK_INVOKE( proc_control_request_st(event.rhport, &event.setup_received), error );

   }else if (USBD_EVENTID_XFER_DONE == event.event_id)

   {

     // Call class handling function. Those doest not own the endpoint should check and return

@@ -263,7 +263,7 @@ static tusb_error_t usbd_main_stk(void)
     {

       if ( usbd_class_drivers[class_code].xfer_cb )

       {

-        usbd_class_drivers[class_code].xfer_cb( event.port, event.xfer_done.ep_addr, (tusb_event_t) event.sub_event_id, event.xfer_done.xferred_byte);

+        usbd_class_drivers[class_code].xfer_cb( event.rhport, event.xfer_done.ep_addr, (tusb_event_t) event.sub_event_id, event.xfer_done.xferred_byte);

       }

     }

   }else if (USBD_EVENTID_SOF == event.event_id)

@@ -272,7 +272,7 @@ static tusb_error_t usbd_main_stk(void)
     {

       if ( usbd_class_drivers[class_code].sof )

       {

-        usbd_class_drivers[class_code].sof( event.port );

+        usbd_class_drivers[class_code].sof( event.rhport );

       }

     }

   }

@@ -287,7 +287,7 @@ static tusb_error_t usbd_main_stk(void)
 //--------------------------------------------------------------------+

 // CONTROL REQUEST

 //--------------------------------------------------------------------+

-tusb_error_t usbd_control_xfer_st(uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length)

+tusb_error_t usbd_control_xfer_st(uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length)

 {

   OSAL_SUBTASK_BEGIN

 

@@ -296,7 +296,7 @@ tusb_error_t usbd_control_xfer_st(uint8_t port, tusb_dir_t dir, uint8_t * buffer
   // Data

   if ( length )

   {

-    tusb_dcd_control_xfer(port, dir, buffer, length);

+    tusb_dcd_control_xfer(rhport, dir, buffer, length);

     osal_semaphore_wait( usbd_control_xfer_sem_hdl, 100, &error );

 

     STASK_ASSERT_STATUS( error );

@@ -305,12 +305,12 @@ tusb_error_t usbd_control_xfer_st(uint8_t port, tusb_dir_t dir, uint8_t * buffer
   // Status opposite direction with Zero Length

   // No need to wait for status to complete therefore

   // status phase must not call tusb_dcd_control_complete/tusb_dcd_xfer_complete

-  usbd_control_status(port, dir);

+  usbd_control_status(rhport, dir);

 

   OSAL_SUBTASK_END

 }

 

-static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t const * const p_request)

+static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request_t const * const p_request)

 {

   OSAL_SUBTASK_BEGIN

 

@@ -324,33 +324,33 @@ static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t
     if ( TUSB_REQ_GET_DESCRIPTOR == p_request->bRequest )

     {

       uint8_t  const * buffer = NULL;

-      uint16_t const   len    = get_descriptor(port, p_request, &buffer);

+      uint16_t const   len    = get_descriptor(rhport, p_request, &buffer);

 

       if ( len )

       {

-        STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, (uint8_t*) buffer, len ), error );

+        STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) buffer, len ), error );

       }else

       {

-        usbd_control_stall(port); // stall unsupported descriptor

+        usbd_control_stall(rhport); // stall unsupported descriptor

       }

     }

     else if ( TUSB_REQ_SET_ADDRESS == p_request->bRequest )

     {

-      tusb_dcd_set_address(port, (uint8_t) p_request->wValue);

-      usbd_devices[port].state = TUSB_DEVICE_STATE_ADDRESSED;

+      tusb_dcd_set_address(rhport, (uint8_t) p_request->wValue);

+      usbd_devices[rhport].state = TUSB_DEVICE_STATE_ADDRESSED;

 

       #ifndef NRF52840_XXAA // nrf52 auto handle set address, we must not return status

-      usbd_control_status(port, p_request->bmRequestType_bit.direction);

+      usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

       #endif

     }

     else if ( TUSB_REQ_SET_CONFIGURATION == p_request->bRequest )

     {

-      proc_set_config_req(port, (uint8_t) p_request->wValue);

-      usbd_control_status(port, p_request->bmRequestType_bit.direction);

+      proc_set_config_req(rhport, (uint8_t) p_request->wValue);

+      usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

     }

     else

     {

-      usbd_control_stall(port); // Stall unsupported request

+      usbd_control_stall(rhport); // Stall unsupported request

     }

   }

 

@@ -359,16 +359,16 @@ static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t
   {

     static uint8_t class_code;

 

-    class_code = usbd_devices[port].interface2class[ u16_low_u8(p_request->wIndex) ];

+    class_code = usbd_devices[rhport].interface2class[ u16_low_u8(p_request->wIndex) ];

 

     // TODO [Custom] TUSB_CLASS_DIAGNOSTIC, vendor etc ...

     if ( (class_code > 0) && (class_code < USBD_CLASS_DRIVER_COUNT) &&

          usbd_class_drivers[class_code].control_request_st )

     {

-      STASK_INVOKE( usbd_class_drivers[class_code].control_request_st(port, p_request), error );

+      STASK_INVOKE( usbd_class_drivers[class_code].control_request_st(rhport, p_request), error );

     }else

     {

-      usbd_control_stall(port); // Stall unsupported request

+      usbd_control_stall(rhport); // Stall unsupported request

     }

   }

 

@@ -378,18 +378,18 @@ static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t
   {

     if (TUSB_REQ_CLEAR_FEATURE == p_request->bRequest )

     {

-      tusb_dcd_edpt_clear_stall(port, u16_low_u8(p_request->wIndex) );

-      usbd_control_status(port, p_request->bmRequestType_bit.direction);

+      tusb_dcd_edpt_clear_stall(rhport, u16_low_u8(p_request->wIndex) );

+      usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

     } else

     {

-      usbd_control_stall(port); // Stall unsupported request

+      usbd_control_stall(rhport); // Stall unsupported request

     }

   }

 

   //------------- Unsupported Request -------------//

   else

   {

-    usbd_control_stall(port); // Stall unsupported request

+    usbd_control_stall(rhport); // Stall unsupported request

   }

 

   OSAL_SUBTASK_END

@@ -397,10 +397,10 @@ static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t
 

 // TODO Host (windows) can get HID report descriptor before set configured

 // may need to open interface before set configured

-static tusb_error_t proc_set_config_req(uint8_t port, uint8_t config_number)

+static tusb_error_t proc_set_config_req(uint8_t rhport, uint8_t config_number)

 {

-  tusb_dcd_set_config(port, config_number);

-  usbd_devices[port].state = TUSB_DEVICE_STATE_CONFIGURED;

+  tusb_dcd_set_config(rhport, config_number);

+  usbd_devices[rhport].state = TUSB_DEVICE_STATE_CONFIGURED;

 

   //------------- parse configuration & open drivers -------------//

   uint8_t const * p_desc_config = tusbd_descriptor_pointers.p_configuration;

@@ -423,12 +423,12 @@ static tusb_error_t proc_set_config_req(uint8_t port, uint8_t config_number)
       class_index = p_desc_interface->bInterfaceClass;

 

       ASSERT( class_index != 0 && class_index < USBD_CLASS_DRIVER_COUNT && usbd_class_drivers[class_index].open != NULL, TUSB_ERROR_NOT_SUPPORTED_YET );

-      ASSERT( 0 == usbd_devices[port].interface2class[p_desc_interface->bInterfaceNumber], TUSB_ERROR_FAILED); // duplicate interface number TODO alternate setting

+      ASSERT( 0 == usbd_devices[rhport].interface2class[p_desc_interface->bInterfaceNumber], TUSB_ERROR_FAILED); // duplicate interface number TODO alternate setting

 

-      usbd_devices[port].interface2class[p_desc_interface->bInterfaceNumber] = class_index;

+      usbd_devices[rhport].interface2class[p_desc_interface->bInterfaceNumber] = class_index;

 

       uint16_t length=0;

-      ASSERT_STATUS( usbd_class_drivers[class_index].open( port, p_desc_interface, &length ) );

+      ASSERT_STATUS( usbd_class_drivers[class_index].open( rhport, p_desc_interface, &length ) );

 

       ASSERT( length >= sizeof(tusb_descriptor_interface_t), TUSB_ERROR_FAILED );

       p_desc += length;

@@ -436,12 +436,12 @@ static tusb_error_t proc_set_config_req(uint8_t port, uint8_t config_number)
   }

 

   // invoke callback

-  tud_mount_cb(port);

+  tud_mount_cb(rhport);

 

   return TUSB_ERROR_NONE;

 }

 

-static uint16_t get_descriptor(uint8_t port, tusb_control_request_t const * const p_request, uint8_t const ** pp_buffer)

+static uint16_t get_descriptor(uint8_t rhport, tusb_control_request_t const * const p_request, uint8_t const ** pp_buffer)

 {

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

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

@@ -496,28 +496,28 @@ static uint16_t get_descriptor(uint8_t port, tusb_control_request_t const * cons
 //--------------------------------------------------------------------+

 // USBD-DCD Callback API

 //--------------------------------------------------------------------+

-void tusb_dcd_bus_event(uint8_t port, usbd_bus_event_type_t bus_event)

+void tusb_dcd_bus_event(uint8_t rhport, usbd_bus_event_type_t bus_event)

 {

   switch(bus_event)

   {

     case USBD_BUS_EVENT_RESET     :

-      memclr_(&usbd_devices[port], sizeof(usbd_device_info_t));

+      memclr_(&usbd_devices[rhport], sizeof(usbd_device_info_t));

       osal_queue_flush(usbd_queue_hdl);

       osal_semaphore_reset(usbd_control_xfer_sem_hdl);

       for (uint8_t class_code = TUSB_CLASS_AUDIO; class_code < USBD_CLASS_DRIVER_COUNT; class_code++)

       {

-        if ( usbd_class_drivers[class_code].close ) usbd_class_drivers[class_code].close( port );

+        if ( usbd_class_drivers[class_code].close ) usbd_class_drivers[class_code].close( rhport );

       }

 

       // invoke callback

-      tud_umount_cb(port);

+      tud_umount_cb(rhport);

     break;

 

     case USBD_BUS_EVENT_SOF:

     {

       usbd_task_event_t task_event =

       {

-          .port          = port,

+          .rhport          = rhport,

           .event_id        = USBD_EVENTID_SOF,

       };

       osal_queue_send(usbd_queue_hdl, &task_event);

@@ -527,18 +527,18 @@ void tusb_dcd_bus_event(uint8_t port, usbd_bus_event_type_t bus_event)
     case USBD_BUS_EVENT_UNPLUGGED : break;

 

     case USBD_BUS_EVENT_SUSPENDED:

-      usbd_devices[port].state = TUSB_DEVICE_STATE_SUSPENDED;

+      usbd_devices[rhport].state = TUSB_DEVICE_STATE_SUSPENDED;

     break;

 

     default: break;

   }

 }

 

-void tusb_dcd_setup_received(uint8_t port, uint8_t const* p_request)

+void tusb_dcd_setup_received(uint8_t rhport, uint8_t const* p_request)

 {

   usbd_task_event_t task_event =

   {

-      .port          = port,

+      .rhport          = rhport,

       .event_id        = USBD_EVENTID_SETUP_RECEIVED,

   };

 

@@ -546,11 +546,11 @@ void tusb_dcd_setup_received(uint8_t port, uint8_t const* p_request)
   osal_queue_send(usbd_queue_hdl, &task_event);

 }

 

-void tusb_dcd_xfer_complete(uint8_t port, uint8_t ep_addr, uint32_t xferred_bytes, bool succeeded)

+void tusb_dcd_xfer_complete(uint8_t rhport, uint8_t ep_addr, uint32_t xferred_bytes, bool succeeded)

 {

   if (ep_addr == 0 )

   {

-    (void) port;

+    (void) rhport;

     (void) xferred_bytes;

     (void) succeeded;

 

@@ -560,7 +560,7 @@ void tusb_dcd_xfer_complete(uint8_t port, uint8_t ep_addr, uint32_t xferred_byte
   {

     usbd_task_event_t task_event =

     {

-        .port         = port,

+        .rhport         = rhport,

         .event_id     = USBD_EVENTID_XFER_DONE,

         .sub_event_id = succeeded ? TUSB_EVENT_XFER_COMPLETE : TUSB_EVENT_XFER_ERROR

     };

diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h
index 326e74806..ae8ca3a8c 100644
--- a/tinyusb/device/usbd.h
+++ b/tinyusb/device/usbd.h
@@ -72,11 +72,11 @@ extern tusbd_descriptor_pointer_t tusbd_descriptor_pointers;
 

 typedef struct {

   void (* init) (void);

-  tusb_error_t (* open)(uint8_t port, tusb_descriptor_interface_t const * desc_intf, uint16_t* p_length);

-  tusb_error_t (* control_request_st) (uint8_t port, tusb_control_request_t const *);

-  tusb_error_t (* xfer_cb) (uint8_t port, uint8_t ep_addr, tusb_event_t, uint32_t);

+  tusb_error_t (* open)(uint8_t rhport, tusb_descriptor_interface_t const * desc_intf, uint16_t* p_length);

+  tusb_error_t (* control_request_st) (uint8_t rhport, tusb_control_request_t const *);

+  tusb_error_t (* xfer_cb) (uint8_t rhport, uint8_t ep_addr, tusb_event_t, uint32_t);

 //  void (* routine)(void);

-  void (* sof)(uint8_t port);

+  void (* sof)(uint8_t rhport);

   void (* close) (uint8_t);

 } usbd_class_driver_t;

 

@@ -94,7 +94,7 @@ typedef struct {
 //--------------------------------------------------------------------+

 // APPLICATION API

 //--------------------------------------------------------------------+

-bool tud_n_mounted(uint8_t port);

+bool tud_n_mounted(uint8_t rhport);

 

 static inline bool tud_mounted(void)

 {

@@ -104,18 +104,18 @@ static inline bool tud_mounted(void)
 

 /*------------- Callback -------------*/

 /** \brief 			Callback function that will be invoked device is mounted (configured) by USB host

- * \param[in] 	port USB Controller ID of the interface

+ * \param[in] 	rhport USB Controller ID of the interface

  * \note        This callback should be used by Application to \b set-up application data

  */

-void tud_mount_cb(uint8_t port);

+void tud_mount_cb(uint8_t rhport);

 

 /** \brief 			Callback function that will be invoked when device is unmounted (bus reset/unplugged)

- * \param[in] 	port USB Controller ID of the interface

+ * \param[in] 	rhport USB Controller ID of the interface

  * \note        This callback should be used by Application to \b tear-down application data

  */

-void tud_umount_cb(uint8_t port);

+void tud_umount_cb(uint8_t rhport);

 

-//void tud_device_suspended_cb(uint8_t port);

+//void tud_device_suspended_cb(uint8_t rhport);

 

 #ifdef __cplusplus

  }

diff --git a/tinyusb/device/usbd_pvt.h b/tinyusb/device/usbd_pvt.h
index d68f5c9fc..366fae3e7 100644
--- a/tinyusb/device/usbd_pvt.h
+++ b/tinyusb/device/usbd_pvt.h
@@ -50,19 +50,19 @@ tusb_error_t usbd_init(void);
 void         usbd_task( void* param);
 
 // Carry out Data and Status stage of control transfer
-tusb_error_t usbd_control_xfer_st(uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length);
+tusb_error_t usbd_control_xfer_st(uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);
 
 // Return Status of control transfer
 // Note dir is value of direction bit in setup packet (aka DATA stage direction)
-static inline bool usbd_control_status(uint8_t port, tusb_dir_t dir)
+static inline bool usbd_control_status(uint8_t rhport, tusb_dir_t dir)
 {
   // status direction is reversed to one in the setup packet
-  return tusb_dcd_control_xfer(port, 1-dir, NULL, 0);
+  return tusb_dcd_control_xfer(rhport, 1-dir, NULL, 0);
 }
 
-static inline void usbd_control_stall(uint8_t port)
+static inline void usbd_control_stall(uint8_t rhport)
 {
-  tusb_dcd_edpt_stall(port, 0);
+  tusb_dcd_edpt_stall(rhport, 0);
 }
 
 
diff --git a/tinyusb/tusb_dcd.h b/tinyusb/tusb_dcd.h
index 07c2d5d81..a859c7cdd 100644
--- a/tinyusb/tusb_dcd.h
+++ b/tinyusb/tusb_dcd.h
@@ -61,39 +61,39 @@ typedef enum
 /*------------------------------------------------------------------*/

 /* Controller API

  *------------------------------------------------------------------*/

-bool tusb_dcd_init             (uint8_t port);

-void tusb_dcd_connect          (uint8_t port);

-void tusb_dcd_disconnect       (uint8_t port);

-void tusb_dcd_set_address      (uint8_t port, uint8_t dev_addr);

-void tusb_dcd_set_config       (uint8_t port, uint8_t config_num);

+bool tusb_dcd_init             (uint8_t rhport);

+void tusb_dcd_connect          (uint8_t rhport);

+void tusb_dcd_disconnect       (uint8_t rhport);

+void tusb_dcd_set_address      (uint8_t rhport, uint8_t dev_addr);

+void tusb_dcd_set_config       (uint8_t rhport, uint8_t config_num);

 

 /*------------------------------------------------------------------*/

 /* Event Function

  * Called by DCD to notify USBD

  *------------------------------------------------------------------*/

-void tusb_dcd_bus_event        (uint8_t port, usbd_bus_event_type_t bus_event);

-void tusb_dcd_setup_received   (uint8_t port, uint8_t const* p_request);

-void tusb_dcd_xfer_complete    (uint8_t port, uint8_t ep_addr, uint32_t xferred_bytes, bool succeeded);

+void tusb_dcd_bus_event        (uint8_t rhport, usbd_bus_event_type_t bus_event);

+void tusb_dcd_setup_received   (uint8_t rhport, uint8_t const* p_request);

+void tusb_dcd_xfer_complete    (uint8_t rhport, uint8_t ep_addr, uint32_t xferred_bytes, bool succeeded);

 

-static inline void tusb_dcd_control_complete(uint8_t port)

+static inline void tusb_dcd_control_complete(uint8_t rhport)

 {

   // TODO all control complete is successful !!

-  tusb_dcd_xfer_complete(port, 0, 0, true);

+  tusb_dcd_xfer_complete(rhport, 0, 0, true);

 }

 

 /*------------------------------------------------------------------*/

 /* Endpoint API

  *------------------------------------------------------------------*/

 //------------- Control Endpoint -------------//

-bool tusb_dcd_control_xfer     (uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length);

+bool tusb_dcd_control_xfer     (uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);

 

 //------------- Other Endpoints -------------//

-bool tusb_dcd_edpt_open        (uint8_t port, tusb_descriptor_endpoint_t const * p_endpoint_desc);

-bool tusb_dcd_edpt_xfer        (uint8_t port, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes);

-bool tusb_dcd_edpt_busy        (uint8_t port, uint8_t ep_addr);

+bool tusb_dcd_edpt_open        (uint8_t rhport, tusb_descriptor_endpoint_t const * p_endpoint_desc);

+bool tusb_dcd_edpt_xfer        (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes);

+bool tusb_dcd_edpt_busy        (uint8_t rhport, uint8_t ep_addr);

 

-void tusb_dcd_edpt_stall       (uint8_t port, uint8_t ep_addr);

-void tusb_dcd_edpt_clear_stall (uint8_t port, uint8_t ep_addr);

+void tusb_dcd_edpt_stall       (uint8_t rhport, uint8_t ep_addr);

+void tusb_dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr);

 

 #ifdef __cplusplus

  }

diff --git a/tinyusb/tusb_hal.h b/tinyusb/tusb_hal.h
index b85763cd4..e89495fc6 100644
--- a/tinyusb/tusb_hal.h
+++ b/tinyusb/tusb_hal.h
@@ -66,14 +66,14 @@ extern "C" {
 bool tusb_hal_init(void);

 

 /** \brief 			Enable USB Interrupt on a specific USB Controller

- * \param[in]		port	is a zero-based index to identify USB controller's ID

+ * \param[in]		rhport	is a zero-based index to identify USB controller's ID

  */

-void tusb_hal_int_enable(uint8_t port);

+void tusb_hal_int_enable(uint8_t rhport);

 

 /** \brief 			Disable USB Interrupt on a specific USB Controller

- * \param[in]		port	is a zero-based index to identify USB controller's ID

+ * \param[in]		rhport	is a zero-based index to identify USB controller's ID

  */

-void tusb_hal_int_disable(uint8_t port);

+void tusb_hal_int_disable(uint8_t rhport);

 

 uint32_t tusb_hal_tick_get(void);