rename coreid to port

2 files changed, 18 insertions, 18 deletions

diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c
index 381bbf07f..df3a4f327 100644
--- a/tinyusb/class/msc/msc_device.c
+++ b/tinyusb/class/msc/msc_device.c
@@ -79,12 +79,12 @@ void mscd_init(void)
   memclr_(&mscd_data, sizeof(mscd_interface_t));

 }

 

-void mscd_close(uint8_t coreid)

+void mscd_close(uint8_t port)

 {

   memclr_(&mscd_data, sizeof(mscd_interface_t));

 }

 

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

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

 {

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

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

@@ -101,7 +101,7 @@ tusb_error_t mscd_open(uint8_t coreid, tusb_descriptor_interface_t const * p_int
     endpoint_handle_t * p_edpt_hdl =  ( p_endpoint->bEndpointAddress &  TUSB_DIR_DEV_TO_HOST_MASK ) ?

         &p_msc->edpt_in : &p_msc->edpt_out;

 

-    VERIFY( hal_dcd_pipe_open(coreid, p_endpoint, p_edpt_hdl), TUSB_ERROR_DCD_FAILED );

+    VERIFY( hal_dcd_pipe_open(port, p_endpoint, p_edpt_hdl), TUSB_ERROR_DCD_FAILED );

     p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*)  p_endpoint );

   }

 

@@ -115,7 +115,7 @@ tusb_error_t mscd_open(uint8_t coreid, tusb_descriptor_interface_t const * p_int
   return TUSB_ERROR_NONE;

 }

 

-tusb_error_t mscd_control_request_subtask(uint8_t coreid, tusb_control_request_t const * p_request)

+tusb_error_t mscd_control_request_subtask(uint8_t port, tusb_control_request_t const * p_request)

 {

   ASSERT(p_request->bmRequestType_bit.type == TUSB_REQUEST_TYPE_CLASS, TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT);

 

@@ -124,12 +124,12 @@ tusb_error_t mscd_control_request_subtask(uint8_t coreid, tusb_control_request_t
   switch(p_request->bRequest)

   {

     case MSC_REQUEST_RESET:

-      hal_dcd_control_xfer(coreid, TUSB_DIR_HOST_TO_DEV, NULL, 0, false);

+      hal_dcd_control_xfer(port, TUSB_DIR_HOST_TO_DEV, NULL, 0, false);

     break;

 

     case MSC_REQUEST_GET_MAX_LUN:

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

-      hal_dcd_control_xfer(coreid, TUSB_DIR_DEV_TO_HOST, p_msc->scsi_data, 1, false);

+      hal_dcd_control_xfer(port, TUSB_DIR_DEV_TO_HOST, p_msc->scsi_data, 1, false);

     break;

 

     default:

@@ -174,7 +174,7 @@ tusb_error_t mscd_xfer_cb(endpoint_handle_t edpt_hdl, tusb_event_t event, uint32
       // 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(edpt_hdl.coreid, p_cbw->lun, p_cbw->command, &p_buffer, &actual_length);

+      p_csw->status = tud_msc_scsi_cb(edpt_hdl.port, p_cbw->lun, p_cbw->command, &p_buffer, &actual_length);

 

       //------------- Data Phase (non READ10, WRITE10) -------------//

       if ( p_cbw->xfer_bytes )

@@ -230,8 +230,8 @@ static bool read10_write10_data_xfer(mscd_interface_t* p_msc)
   uint16_t const block_count = __be2n_16(p_readwrite->block_count);

   void *p_buffer = NULL;

 

-  uint16_t xferred_block = (SCSI_CMD_READ_10 == p_cbw->command[0]) ? tud_msc_read10_cb (edpt_hdl.coreid, p_cbw->lun, &p_buffer, lba, block_count) :

-                                                                     tud_msc_write10_cb(edpt_hdl.coreid, p_cbw->lun, &p_buffer, lba, block_count);

+  uint16_t xferred_block = (SCSI_CMD_READ_10 == p_cbw->command[0]) ? tud_msc_read10_cb (edpt_hdl.port, p_cbw->lun, &p_buffer, lba, block_count) :

+                                                                     tud_msc_write10_cb(edpt_hdl.port, p_cbw->lun, &p_buffer, lba, block_count);

   xferred_block = min16_of(xferred_block, block_count);

 

   uint16_t const xferred_byte = xferred_block * (p_cbw->xfer_bytes / block_count);

diff --git a/tinyusb/class/msc/msc_device.h b/tinyusb/class/msc/msc_device.h
index c8cc29db8..0fde78a47 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]		coreid	    USB Controller ID

+ * \param[in]		port	    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 coreid, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count);

+uint16_t tud_msc_read10_cb (uint8_t port, 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]		coreid	    USB Controller ID

+ * \param[in]		port	    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 coreid, uint8_t lun, void** pp_buffer, uint3
  *              \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 coreid, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count);

+uint16_t tud_msc_write10_cb(uint8_t port, 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]		coreid	    USB Controller ID

+ * \param[in]		port	    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 coreid, uint8_t lun, void** pp_buffer, uint3
  * \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 coreid, 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 port, 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 coreid, uint8_t lun, uint8_t scsi_cmd[
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void mscd_init(void);

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

-tusb_error_t mscd_control_request_subtask(uint8_t coreid, tusb_control_request_t const * p_request);

+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_subtask(uint8_t port, tusb_control_request_t const * p_request);

 tusb_error_t mscd_xfer_cb(endpoint_handle_t edpt_hdl, tusb_event_t event, uint32_t xferred_bytes);

-void mscd_close(uint8_t coreid);

+void mscd_close(uint8_t port);

 

 #endif