Merge pull request #49 from hathach/develop

clean up porting API

4 files changed, 6 insertions, 21 deletions

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 728f4d363..04a3178a3 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -28,11 +28,6 @@
 

 #if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_MSC)

 

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

-// INCLUDE

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

-#define _TINY_USB_SOURCE_FILE_

-

 #include "common/tusb_common.h"

 #include "msc_device.h"

 #include "device/usbd_pvt.h"

@@ -412,7 +407,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
             p_msc->stage = MSC_STAGE_STATUS;

 

             tud_msc_set_sense(p_cbw->lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00); // Sense = Invalid Command Operation

-            dcd_edpt_stall(rhport, p_msc->ep_in);

+            usbd_edpt_stall(rhport, p_msc->ep_in);

           }

         }

       }

@@ -512,7 +507,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
   if ( p_msc->stage == MSC_STAGE_STATUS )

   {

     // Either endpoints is stalled, need to wait until it is cleared by host

-    if ( dcd_edpt_stalled(rhport,  p_msc->ep_in) || dcd_edpt_stalled(rhport,  p_msc->ep_out) )

+    if ( usbd_edpt_stalled(rhport,  p_msc->ep_in) || usbd_edpt_stalled(rhport,  p_msc->ep_out) )

     {

       // simulate an transfer complete with adjusted parameters --> this driver callback will fired again

       dcd_event_xfer_complete(rhport, p_msc->ep_out, 0, XFER_RESULT_SUCCESS, false);

@@ -573,7 +568,7 @@ static void proc_read10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
     p_csw->status       = MSC_CSW_STATUS_FAILED;

 

     tud_msc_set_sense(p_cbw->lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00); // Sense = Invalid Command Operation

-    dcd_edpt_stall(rhport, p_msc->ep_in);

+    usbd_edpt_stall(rhport, p_msc->ep_in);

   }

   else if ( nbytes == 0 )

   {

@@ -599,7 +594,7 @@ static void proc_write10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
     p_csw->status       = MSC_CSW_STATUS_FAILED;

 

     tud_msc_set_sense(p_cbw->lun, SCSI_SENSE_DATA_PROTECT, 0x27, 0x00); // Sense = Write protected

-    dcd_edpt_stall(rhport, p_msc->ep_out);

+    usbd_edpt_stall(rhport, p_msc->ep_out);

     return;

   }

 

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index c97f6d111..e030951be 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -154,10 +154,8 @@ ATTR_WEAK bool tud_msc_is_writable_cb(uint8_t lun);
 /** @} */

 

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

-// USBD-CLASS DRIVER API

+// Internal Class Driver API

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

-#ifdef _TINY_USB_SOURCE_FILE_

-

 void mscd_init(void);

 bool mscd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);

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

@@ -165,8 +163,6 @@ bool mscd_control_request_complete (uint8_t rhport, tusb_control_request_t const
 bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);

 void mscd_reset(uint8_t rhport);

 

-#endif

-

 #ifdef __cplusplus

  }

 #endif

diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 4e438a787..bb12c52d7 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -28,8 +28,6 @@
 

 #if TUSB_OPT_HOST_ENABLED & CFG_TUH_MSC

 

-#define _TINY_USB_SOURCE_FILE_

-

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

 // INCLUDE

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

diff --git a/src/class/msc/msc_host.h b/src/class/msc/msc_host.h
index dea090a94..1edce82c5 100644
--- a/src/class/msc/msc_host.h
+++ b/src/class/msc/msc_host.h
@@ -171,10 +171,8 @@ void tuh_msc_isr(uint8_t dev_addr, xfer_result_t event, uint32_t xferred_bytes);
 

 

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

-// USBH-CLASS DRIVER API

+// Internal Class Driver API

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

-#ifdef _TINY_USB_SOURCE_FILE_

-

 typedef struct

 {

   uint8_t itf_numr;

@@ -198,8 +196,6 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
 void msch_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);

 void msch_close(uint8_t dev_addr);

 

-#endif

-

 #ifdef __cplusplus

  }

 #endif