From 6d50d05d9544a5f560242d3c8685413f814aaa76 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 23 Mar 2018 12:17:47 +0700 Subject: rename port to rhport for clarification --- tinyusb/class/msc/msc_device.c | 44 +++++++++++++++++++++--------------------- tinyusb/class/msc/msc_device.h | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tinyusb/class/msc') 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 -- cgit v1.3.1