Merge pull request #80 from hathach/develop

 added usbd_edpt_xfer/usbd_edpt_busy to replace dcd_edpt_transfer/dcd_edpt_busy()

4 files changed, 28 insertions, 28 deletions

diff --git a/src/class/msc/msc.h b/src/class/msc/msc.h
index 95fac6598..d461513fc 100644
--- a/src/class/msc/msc.h
+++ b/src/class/msc/msc.h
@@ -86,7 +86,7 @@ typedef enum
 }msc_csw_status_t;

 

 /// Command Block Wrapper

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint32_t signature;   ///< Signature that helps identify this data packet as a CBW. The signature field shall contain the value 43425355h (little endian), indicating a CBW.

   uint32_t tag;         ///< Tag sent by the host. The device shall echo the contents of this field back to the host in the dCSWTagfield of the associated CSW. The dCSWTagpositively associates a CSW with the corresponding CBW.

@@ -100,7 +100,7 @@ typedef struct ATTR_PACKED
 TU_VERIFY_STATIC(sizeof(msc_cbw_t) == 31, "size is not correct");

 

 /// Command Status Wrapper

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint32_t signature    ; ///< Signature that helps identify this data packet as a CSW. The signature field shall contain the value 53425355h (little endian), indicating CSW.

   uint32_t tag          ; ///< The device shall set this field to the value received in the dCBWTag of the associated CBW.

@@ -153,7 +153,7 @@ typedef enum
 //--------------------------------------------------------------------+

 

 /// SCSI Test Unit Ready Command

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t cmd_code    ; ///< SCSI OpCode for \ref SCSI_CMD_TEST_UNIT_READY

   uint8_t lun         ; ///< Logical Unit

@@ -164,7 +164,7 @@ typedef struct ATTR_PACKED
 TU_VERIFY_STATIC(sizeof(scsi_test_unit_ready_t) == 6, "size is not correct");

 

 /// SCSI Inquiry Command

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t cmd_code     ; ///< SCSI OpCode for \ref SCSI_CMD_INQUIRY

   uint8_t reserved1    ;

@@ -177,7 +177,7 @@ typedef struct ATTR_PACKED
 TU_VERIFY_STATIC(sizeof(scsi_inquiry_t) == 6, "size is not correct");

 

 /// SCSI Inquiry Response Data

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t peripheral_device_type     : 5;

   uint8_t peripheral_qualifier       : 3;

@@ -223,7 +223,7 @@ typedef struct ATTR_PACKED
 TU_VERIFY_STATIC(sizeof(scsi_inquiry_resp_t) == 36, "size is not correct");

 

 

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t response_code : 7; ///< 70h - current errors, Fixed Format 71h - deferred errors, Fixed Format

   uint8_t valid         : 1;

@@ -249,7 +249,7 @@ typedef struct ATTR_PACKED
 

 TU_VERIFY_STATIC(sizeof(scsi_sense_fixed_resp_t) == 18, "size is not correct");

 

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t cmd_code     ; ///< SCSI OpCode for \ref SCSI_CMD_MODE_SENSE_6

 

@@ -268,7 +268,7 @@ typedef struct ATTR_PACKED
 TU_VERIFY_STATIC( sizeof(scsi_mode_sense6_t) == 6, "size is not correct");

 

 // This is only a Mode parameter header(6).

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t data_len;

   uint8_t medium_type;

@@ -281,7 +281,7 @@ typedef struct ATTR_PACKED
 

 TU_VERIFY_STATIC( sizeof(scsi_mode_sense6_resp_t) == 4, "size is not correct");

 

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t cmd_code; ///< SCSI OpCode for \ref SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL

   uint8_t reserved[3];

@@ -291,7 +291,7 @@ typedef struct ATTR_PACKED
 

 TU_VERIFY_STATIC( sizeof(scsi_prevent_allow_medium_removal_t) == 6, "size is not correct");

 

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t cmd_code;

 

@@ -318,7 +318,7 @@ TU_VERIFY_STATIC( sizeof(scsi_start_stop_unit_t) == 6, "size is not correct");
 // SCSI MMC

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

 /// SCSI Read Format Capacity: Write Capacity

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t cmd_code;

   uint8_t reserved[6];

@@ -328,7 +328,7 @@ typedef struct ATTR_PACKED
 

 TU_VERIFY_STATIC( sizeof(scsi_read_format_capacity_t) == 10, "size is not correct");

 

-typedef struct ATTR_PACKED{

+typedef struct TU_ATTR_PACKED{

   uint8_t reserved[3];

   uint8_t list_length; /// must be 8*n, length in bytes of formattable capacity descriptor followed it.

 

@@ -348,7 +348,7 @@ TU_VERIFY_STATIC( sizeof(scsi_read_format_capacity_data_t) == 12, "size is not c
 //--------------------------------------------------------------------+

 

 /// SCSI Read Capacity 10 Command: Read Capacity

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t  cmd_code                 ; ///< SCSI OpCode for \ref SCSI_CMD_READ_CAPACITY_10

   uint8_t  reserved1                ;

@@ -369,7 +369,7 @@ typedef struct {
 TU_VERIFY_STATIC(sizeof(scsi_read_capacity10_resp_t) == 8, "size is not correct");

 

 /// SCSI Read 10 Command

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t  cmd_code    ; ///< SCSI OpCode

   uint8_t  reserved    ; // has LUN according to wiki

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 2fd3d44a1..5681e4f07 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -139,7 +139,7 @@ bool mscd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t
   (*p_len) = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);

 

   // Prepare for Command Block Wrapper

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

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

 

   return true;

 }

@@ -394,7 +394,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
         if ( (p_cbw->total_bytes > 0 ) && !tu_bit_test(p_cbw->dir, 7) )

         {

           // queue transfer

-          TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, p_msc->total_len) );

+          TU_ASSERT( usbd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, p_msc->total_len) );

         }else

         {

           int32_t resplen;

@@ -428,7 +428,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
             if (p_msc->total_len)

             {

               TU_ASSERT( p_cbw->total_bytes >= p_msc->total_len ); // cannot return more than host expect

-              TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_in, _mscd_buf, p_msc->total_len) );

+              TU_ASSERT( usbd_edpt_xfer(rhport, p_msc->ep_in, _mscd_buf, p_msc->total_len) );

             }else

             {

               p_msc->stage = MSC_STAGE_STATUS;

@@ -543,7 +543,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
       p_msc->stage = MSC_STAGE_CMD;

 

       // Send SCSI Status

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

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

 

       // Invoke complete callback if defined

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

@@ -560,7 +560,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
       }

 

       // Queue for the next CBW

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

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

     }

   }

 

@@ -602,7 +602,7 @@ static void proc_read10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
   }

   else

   {

-    TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_in, _mscd_buf, nbytes), );

+    TU_ASSERT( usbd_edpt_xfer(rhport, p_msc->ep_in, _mscd_buf, nbytes), );

   }

 }

 

@@ -627,7 +627,7 @@ static void proc_write10_cmd(uint8_t rhport, mscd_interface_t* p_msc)
   int32_t nbytes = (int32_t) tu_min32(sizeof(_mscd_buf), p_cbw->total_bytes-p_msc->xferred_len);

 

   // Write10 callback will be called later when usb transfer complete

-  TU_ASSERT( dcd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, nbytes), );

+  TU_ASSERT( usbd_edpt_xfer(rhport, p_msc->ep_out, _mscd_buf, nbytes), );

 }

 

 #endif

diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index cf228dad9..03a4afadb 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -126,24 +126,24 @@ int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer,
 /*------------- Optional callbacks -------------*/

 

 // Invoked when received GET_MAX_LUN request, required for multiple LUNs implementation

-ATTR_WEAK uint8_t tud_msc_get_maxlun_cb(void);

+TU_ATTR_WEAK uint8_t tud_msc_get_maxlun_cb(void);

 

 // Invoked when received Start Stop Unit command

 // - Start = 0 : stopped power mode, if load_eject = 1 : unload disk storage

 // - Start = 1 : active mode, if load_eject = 1 : load disk storage

-ATTR_WEAK void tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject);

+TU_ATTR_WEAK void tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject);

 

 // Invoked when Read10 command is complete

-ATTR_WEAK void tud_msc_read10_complete_cb(uint8_t lun);

+TU_ATTR_WEAK void tud_msc_read10_complete_cb(uint8_t lun);

 

 // Invoke when Write10 command is complete, can be used to flush flash caching

-ATTR_WEAK void tud_msc_write10_complete_cb(uint8_t lun);

+TU_ATTR_WEAK void tud_msc_write10_complete_cb(uint8_t lun);

 

 // Invoked when command in tud_msc_scsi_cb is complete

-ATTR_WEAK void tud_msc_scsi_complete_cb(uint8_t lun, uint8_t const scsi_cmd[16]);

+TU_ATTR_WEAK void tud_msc_scsi_complete_cb(uint8_t lun, uint8_t const scsi_cmd[16]);

 

 // Hook to make a mass storage device read-only. TODO remove

-ATTR_WEAK bool tud_msc_is_writable_cb(uint8_t lun);

+TU_ATTR_WEAK bool tud_msc_is_writable_cb(uint8_t lun);

 

 /** @} */

 /** @} */

diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index d2a1a00f7..0507c5f6d 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -44,7 +44,7 @@ static osal_semaphore_def_t msch_sem_def;
 static osal_semaphore_t msch_sem_hdl;

 

 // buffer used to read scsi information when mounted, largest response data currently is inquiry

-CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) static uint8_t msch_buffer[sizeof(scsi_inquiry_resp_t)];

+CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) static uint8_t msch_buffer[sizeof(scsi_inquiry_resp_t)];

 

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

 // INTERNAL OBJECT & FUNCTION DECLARATION