rename tusb_event_t to xfer_result_t

4 files changed, 7 insertions, 7 deletions

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 78e6d0a6b..1f4252f22 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -324,7 +324,7 @@ int32_t proc_builtin_scsi(msc_cbw_t const * p_cbw, uint8_t* buffer, uint32_t buf
   return ret;

 }

 

-tusb_error_t mscd_xfer_cb(uint8_t rhport, 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, xfer_result_t event, uint32_t xferred_bytes)

 {

   mscd_interface_t* p_msc = &_mscd_itf;

   msc_cbw_t const * p_cbw = &p_msc->cbw;

@@ -337,7 +337,7 @@ tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u
       // Complete IN while waiting for CMD is usually Status of previous SCSI op, ignore it

       if(ep_addr != p_msc->ep_out) return TUSB_ERROR_NONE;

 

-      TU_ASSERT( event == DCD_XFER_SUCCESS  &&

+      TU_ASSERT( ((uint8_t) event) == DCD_XFER_SUCCESS &&

                  xferred_bytes == sizeof(msc_cbw_t) && p_cbw->signature == MSC_CBW_SIGNATURE, TUSB_ERROR_INVALID_PARA );

 

       p_csw->signature    = MSC_CSW_SIGNATURE;

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index c1c51255a..c4476f56f 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -180,7 +180,7 @@ void mscd_init(void);
 tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

 bool mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_request);

 bool mscd_control_request_complete (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);

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

 void mscd_reset(uint8_t rhport);

 

 #endif

diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index bd3e92de1..baef7ff44 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -397,7 +397,7 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
   OSAL_SUBTASK_END

 }

 

-void msch_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes)

+void msch_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes)

 {

   if ( pipehandle_is_equal(pipe_hdl, msch_data[pipe_hdl.dev_addr-1].bulk_in) )

   {

diff --git a/src/class/msc/msc_host.h b/src/class/msc/msc_host.h
index 6d95cfe34..0afe5c515 100644
--- a/src/class/msc/msc_host.h
+++ b/src/class/msc/msc_host.h
@@ -171,7 +171,7 @@ void tuh_msc_unmounted_cb(uint8_t dev_addr);
 

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

  * \param[in]		dev_addr	Address of device

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

+ * \param[in]   event an value from \ref xfer_result_t

  * \param[in]   xferred_bytes Number of bytes transferred via USB bus

  * \note        event can be one of following

  *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.

@@ -179,7 +179,7 @@ void tuh_msc_unmounted_cb(uint8_t dev_addr);
  *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.

  * \note

  */

-void tuh_msc_isr(uint8_t dev_addr, tusb_event_t event, uint32_t xferred_bytes);

+void tuh_msc_isr(uint8_t dev_addr, xfer_result_t event, uint32_t xferred_bytes);

 

 

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

@@ -205,7 +205,7 @@ typedef struct {
 

 void         msch_init(void);

 tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

-void         msch_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes);

+void         msch_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);

 void         msch_close(uint8_t dev_addr);

 #endif