Merge pull request #80 from hathach/develop

 added usbd_edpt_xfer/usbd_edpt_busy to replace dcd_edpt_transfer/dcd_edpt_busy()

15 files changed, 345 insertions, 227 deletions

diff --git a/src/class/cdc/cdc.h b/src/class/cdc/cdc.h
index 200f6eaae..2e865bdbb 100644
--- a/src/class/cdc/cdc.h
+++ b/src/class/cdc/cdc.h
@@ -212,7 +212,7 @@ typedef enum
 // FUNCTIONAL DESCRIPTOR (COMMUNICATION INTERFACE)

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

 /// Header Functional Descriptor (Communication Interface)

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength            ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType    ; ///< Descriptor Type, must be Class-Specific

@@ -221,7 +221,7 @@ typedef struct ATTR_PACKED
 }cdc_desc_func_header_t;

 

 /// Union Functional Descriptor (Communication Interface)

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength                  ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType          ; ///< Descriptor Type, must be Class-Specific

@@ -231,7 +231,7 @@ typedef struct ATTR_PACKED
 }cdc_desc_func_union_t;

 

 #define cdc_desc_func_union_n_t(no_slave)\

- struct ATTR_PACKED { \

+ struct TU_ATTR_PACKED { \

   uint8_t bLength                         ;\

   uint8_t bDescriptorType                 ;\

   uint8_t bDescriptorSubType              ;\

@@ -240,7 +240,7 @@ typedef struct ATTR_PACKED
 }

 

 /// Country Selection Functional Descriptor (Communication Interface)

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength             ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType     ; ///< Descriptor Type, must be Class-Specific

@@ -250,7 +250,7 @@ typedef struct ATTR_PACKED
 }cdc_desc_func_country_selection_t;

 

 #define cdc_desc_func_country_selection_n_t(no_country) \

-  struct ATTR_PACKED {\

+  struct TU_ATTR_PACKED {\

   uint8_t bLength                   ;\

   uint8_t bDescriptorType           ;\

   uint8_t bDescriptorSubType        ;\

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

 /// \brief Call Management Functional Descriptor

 /// \details This functional descriptor describes the processing of calls for the Communications Class interface.

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength            ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType    ; ///< Descriptor Type, must be Class-Specific

@@ -280,7 +280,7 @@ typedef struct ATTR_PACKED
 }cdc_desc_func_call_management_t;

 

 

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t support_comm_request                    : 1; ///< Device supports the request combination of Set_Comm_Feature, Clear_Comm_Feature, and Get_Comm_Feature.

   uint8_t support_line_request                    : 1; ///< Device supports the request combination of Set_Line_Coding, Set_Control_Line_State, Get_Line_Coding, and the notification Serial_State.

@@ -293,7 +293,7 @@ TU_VERIFY_STATIC(sizeof(cdc_acm_capability_t) == 1, "mostly problem with compile
 

 /// \brief Abstract Control Management Functional Descriptor

 /// \details This functional descriptor describes the commands supported by by the Communications Class interface with SubClass code of \ref CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength                  ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType          ; ///< Descriptor Type, must be Class-Specific

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

 /// \brief Direct Line Management Functional Descriptor

 /// \details This functional descriptor describes the commands supported by the Communications Class interface with SubClass code of \ref CDC_FUNC_DESC_DIRECT_LINE_MANAGEMENT

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength            ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType    ; ///< Descriptor Type, must be Class-Specific

@@ -319,7 +319,7 @@ typedef struct ATTR_PACKED
 /// \brief Telephone Ringer Functional Descriptor

 /// \details The Telephone Ringer functional descriptor describes the ringer capabilities supported by the Communications Class interface,

 /// with the SubClass code of \ref CDC_COMM_SUBCLASS_TELEPHONE_CONTROL_MODEL

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength            ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType    ; ///< Descriptor Type, must be Class-Specific

@@ -331,7 +331,7 @@ typedef struct ATTR_PACKED
 /// \brief Telephone Operational Modes Functional Descriptor

 /// \details The Telephone Operational Modes functional descriptor describes the operational modes supported by

 /// the Communications Class interface, with the SubClass code of \ref CDC_COMM_SUBCLASS_TELEPHONE_CONTROL_MODEL

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength            ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType    ; ///< Descriptor Type, must be Class-Specific

@@ -347,7 +347,7 @@ typedef struct ATTR_PACKED
 /// \brief Telephone Call and Line State Reporting Capabilities Descriptor

 /// \details The Telephone Call and Line State Reporting Capabilities functional descriptor describes the abilities of a

 /// telephone device to report optional call and line states.

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength            ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType    ; ///< Descriptor Type, must be Class-Specific

@@ -371,7 +371,7 @@ static inline uint8_t cdc_functional_desc_typeof(uint8_t const * p_desc)
 //--------------------------------------------------------------------+

 // Requests

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

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint32_t bit_rate;

   uint8_t  stop_bits; ///< 0: 1 stop bit - 1: 1.5 stop bits - 2: 2 stop bits

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

 TU_VERIFY_STATIC(sizeof(cdc_line_coding_t) == 7, "size is not correct");

 

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint16_t dte_is_present : 1; ///< Indicates to DCE if DTE is presentor not. This signal corresponds to V.24 signal 108/2 and RS-232 signal DTR.

   uint16_t half_duplex_carrier_control : 1;

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 1583b71fa..0a41147c9 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -73,23 +73,21 @@ typedef struct
 //--------------------------------------------------------------------+

 CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];

 

-// TODO will be replaced by dcd_edpt_busy()

-bool pending_read_from_host;

+//bool pending_read_from_host; TODO remove

 static void _prep_out_transaction (uint8_t itf)

 {

   cdcd_interface_t* p_cdc = &_cdcd_itf[itf];

 

   // skip if previous transfer not complete

-  // dcd_edpt_busy() doesn't work, probably transfer is complete but not properly handled by the stack

-//  if ( dcd_edpt_busy(TUD_OPT_RHPORT, p_cdc->ep_out) ) return;

-  if (pending_read_from_host) return;

+  if ( usbd_edpt_busy(TUD_OPT_RHPORT, p_cdc->ep_out) ) return;

+  //if (pending_read_from_host) return;

 

   // Prepare for incoming data but only allow what we can store in the ring buffer.

   uint16_t max_read = tu_fifo_remaining(&p_cdc->rx_ff);

   if ( max_read >= CFG_TUD_CDC_EPSIZE )

   {

-    dcd_edpt_xfer(TUD_OPT_RHPORT, p_cdc->ep_out, p_cdc->epout_buf, CFG_TUD_CDC_EPSIZE);

-    pending_read_from_host = true;

+    usbd_edpt_xfer(TUD_OPT_RHPORT, p_cdc->ep_out, p_cdc->epout_buf, CFG_TUD_CDC_EPSIZE);

+//    pending_read_from_host = true;

   }

 }

 

@@ -183,13 +181,13 @@ uint32_t tud_cdc_n_write(uint8_t itf, void const* buffer, uint32_t bufsize)
 bool tud_cdc_n_write_flush (uint8_t itf)

 {

   cdcd_interface_t* p_cdc = &_cdcd_itf[itf];

-  TU_VERIFY( !dcd_edpt_busy(TUD_OPT_RHPORT, p_cdc->ep_in) ); // skip if previous transfer not complete

+  TU_VERIFY( !usbd_edpt_busy(TUD_OPT_RHPORT, p_cdc->ep_in) ); // skip if previous transfer not complete

 

   uint16_t count = tu_fifo_read_n(&_cdcd_itf[itf].tx_ff, p_cdc->epin_buf, CFG_TUD_CDC_EPSIZE);

   if ( count )

   {

     TU_VERIFY( tud_cdc_n_connected(itf) ); // fifo is empty if not connected

-    TU_ASSERT( dcd_edpt_xfer(TUD_OPT_RHPORT, p_cdc->ep_in, p_cdc->epin_buf, count) );

+    TU_ASSERT( usbd_edpt_xfer(TUD_OPT_RHPORT, p_cdc->ep_in, p_cdc->epin_buf, count) );

   }

 

   return true;

@@ -298,7 +296,7 @@ bool cdcd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t
   }

 

   // Prepare for incoming data

-  pending_read_from_host = false;

+//  pending_read_from_host = false;

   _prep_out_transaction(cdc_id);

 

   return true;

@@ -394,7 +392,7 @@ bool cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_
     if (tud_cdc_rx_cb && tu_fifo_count(&p_cdc->rx_ff) ) tud_cdc_rx_cb(itf);

 

     // prepare for OUT transaction

-    pending_read_from_host = false;

+//    pending_read_from_host = false;

     _prep_out_transaction(itf);

   }

 

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 9e1087631..3c1af9dbf 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -91,16 +91,16 @@ static inline bool        tud_cdc_write_flush     (void)
 //--------------------------------------------------------------------+

 

 // Invoked when received new data

-ATTR_WEAK void tud_cdc_rx_cb(uint8_t itf);

+TU_ATTR_WEAK void tud_cdc_rx_cb(uint8_t itf);

 

 // Invoked when received `wanted_char`

-ATTR_WEAK void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char);

+TU_ATTR_WEAK void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char);

 

 // Invoked when line state DTR & RTS are changed via SET_CONTROL_LINE_STATE

-ATTR_WEAK void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts);

+TU_ATTR_WEAK void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts);

 

 // Invoked when line coding is change via SET_LINE_CODING

-ATTR_WEAK void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_line_coding);

+TU_ATTR_WEAK void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_line_coding);

 

 /** @} */

 /** @} */

diff --git a/src/class/cdc/cdc_rndis_host.c b/src/class/cdc/cdc_rndis_host.c
index c604aef4a..767b917a1 100644
--- a/src/class/cdc/cdc_rndis_host.c
+++ b/src/class/cdc/cdc_rndis_host.c
@@ -41,7 +41,7 @@
 #define RNDIS_MSG_PAYLOAD_MAX   (1024*4)
 
 CFG_TUSB_MEM_SECTION static uint8_t msg_notification[CFG_TUSB_HOST_DEVICE_MAX][8];
-CFG_TUSB_MEM_SECTION ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
+CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
 
 static rndish_data_t rndish_data[CFG_TUSB_HOST_DEVICE_MAX];
 
diff --git a/src/class/custom/custom_device.c b/src/class/custom/custom_device.c
index 18aea94cc..02a711621 100644
--- a/src/class/custom/custom_device.c
+++ b/src/class/custom/custom_device.c
@@ -70,7 +70,7 @@ bool cusd_open(uint8_t rhport, tusb_desc_interface_t const * p_desc_itf, uint16_
   (*p_len) = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
 
   // TODO Prepare for incoming data
-//  TU_ASSERT( dcd_edpt_xfer(rhport, p_itf->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)) );
+//  TU_ASSERT( usbd_edpt_xfer(rhport, p_itf->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)) );
 
   return true;
 }
diff --git a/src/class/hid/hid.h b/src/class/hid/hid.h
index 902c01ef5..a3a9ffc88 100644
--- a/src/class/hid/hid.h
+++ b/src/class/hid/hid.h
@@ -44,7 +44,7 @@
  *  @{ */

 

  /// USB HID Descriptor

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t  bLength;         /**< Numeric expression that is the total size of the HID descriptor */

   uint8_t  bDescriptorType; /**< Constant name specifying type of HID descriptor. */

@@ -150,7 +150,7 @@ typedef enum
  *  @{ */

 

 /// Standard HID Boot Protocol Mouse Report.

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t buttons; /**< buttons mask for currently pressed buttons in the mouse. */

   int8_t  x;       /**< Current delta x movement of the mouse. */

@@ -178,7 +178,7 @@ typedef enum
  *  @{ */

 

 /// Standard HID Boot Protocol Keyboard Report.

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t modifier;   /**< Keyboard modifier (KEYBOARD_MODIFER_* masks). */

   uint8_t reserved;   /**< Reserved for OEM use, always set to 0. */

@@ -598,6 +598,272 @@ enum
   HID_USAGE_CONSUMER_AC_PAN                            = 0x0238,

 };

 

+/*--------------------------------------------------------------------

+ * ASCII to KEYCODE Conversion

+ *  Expand to array of [128][2] (shift, keycode)

+ *

+ * Usage: example to convert input chr into keyboard report (modifier + keycode)

+ *

+ *  uint8_t const conv_table[128][2] =  { HID_ASCII_TO_KEYCODE };

+ *

+ *  uint8_t keycode[6] = { 0 };

+ *  uint8_t modifier   = 0;

+ *

+ *  if ( conv_table[chr][0] ) modifier = KEYBOARD_MODIFIER_LEFTSHIFT;

+ *  keycode[0] = conv_table[chr][1];

+ *  tud_hid_keyboard_report(report_id, modifier, keycode);

+ *

+ *--------------------------------------------------------------------*/

+#define HID_ASCII_TO_KEYCODE \

+    {0, 0                     }, /* 0x00 Null      */ \

+    {0, 0                     }, /* 0x01           */ \

+    {0, 0                     }, /* 0x02           */ \

+    {0, 0                     }, /* 0x03           */ \

+    {0, 0                     }, /* 0x04           */ \

+    {0, 0                     }, /* 0x05           */ \

+    {0, 0                     }, /* 0x06           */ \

+    {0, 0                     }, /* 0x07           */ \

+    {0, HID_KEY_BACKSPACE     }, /* 0x08 Backspace */ \

+    {0, HID_KEY_TAB           }, /* 0x09 Tab       */ \

+    {0, HID_KEY_RETURN        }, /* 0x0A Line Feed */ \

+    {0, 0                     }, /* 0x0B           */ \

+    {0, 0                     }, /* 0x0C           */ \

+    {0, HID_KEY_RETURN        }, /* 0x0D CR        */ \

+    {0, 0                     }, /* 0x0E           */ \

+    {0, 0                     }, /* 0x0F           */ \

+    {0, 0                     }, /* 0x10           */ \

+    {0, 0                     }, /* 0x11           */ \

+    {0, 0                     }, /* 0x12           */ \

+    {0, 0                     }, /* 0x13           */ \

+    {0, 0                     }, /* 0x14           */ \

+    {0, 0                     }, /* 0x15           */ \

+    {0, 0                     }, /* 0x16           */ \

+    {0, 0                     }, /* 0x17           */ \

+    {0, 0                     }, /* 0x18           */ \

+    {0, 0                     }, /* 0x19           */ \

+    {0, 0                     }, /* 0x1A           */ \

+    {0, HID_KEY_ESCAPE        }, /* 0x1B Escape    */ \

+    {0, 0                     }, /* 0x1C           */ \

+    {0, 0                     }, /* 0x1D           */ \

+    {0, 0                     }, /* 0x1E           */ \

+    {0, 0                     }, /* 0x1F           */ \

+                                                      \

+    {0, HID_KEY_SPACE         }, /* 0x20           */ \

+    {1, HID_KEY_1             }, /* 0x21 !         */ \

+    {1, HID_KEY_APOSTROPHE    }, /* 0x22 "         */ \

+    {1, HID_KEY_3             }, /* 0x23 #         */ \

+    {1, HID_KEY_4             }, /* 0x24 $         */ \

+    {1, HID_KEY_5             }, /* 0x25 %         */ \

+    {1, HID_KEY_7             }, /* 0x26 &         */ \

+    {0, HID_KEY_APOSTROPHE    }, /* 0x27 '         */ \

+    {1, HID_KEY_9             }, /* 0x28 (         */ \

+    {1, HID_KEY_0             }, /* 0x29 )         */ \

+    {1, HID_KEY_8             }, /* 0x2A *         */ \

+    {1, HID_KEY_EQUAL         }, /* 0x2B +         */ \

+    {0, HID_KEY_COMMA         }, /* 0x2C ,         */ \

+    {0, HID_KEY_MINUS         }, /* 0x2D -         */ \

+    {0, HID_KEY_PERIOD        }, /* 0x2E .         */ \

+    {0, HID_KEY_SLASH         }, /* 0x2F /         */ \

+    {0, HID_KEY_0             }, /* 0x30 0         */ \

+    {0, HID_KEY_1             }, /* 0x31 1         */ \

+    {0, HID_KEY_2             }, /* 0x32 2         */ \

+    {0, HID_KEY_3             }, /* 0x33 3         */ \

+    {0, HID_KEY_4             }, /* 0x34 4         */ \

+    {0, HID_KEY_5             }, /* 0x35 5         */ \

+    {0, HID_KEY_6             }, /* 0x36 6         */ \

+    {0, HID_KEY_7             }, /* 0x37 7         */ \

+    {0, HID_KEY_8             }, /* 0x38 8         */ \

+    {0, HID_KEY_9             }, /* 0x39 9         */ \

+    {1, HID_KEY_SEMICOLON     }, /* 0x3A :         */ \

+    {0, HID_KEY_SEMICOLON     }, /* 0x3B ;         */ \

+    {1, HID_KEY_COMMA         }, /* 0x3C <         */ \

+    {0, HID_KEY_EQUAL         }, /* 0x3D =         */ \

+    {1, HID_KEY_PERIOD        }, /* 0x3E >         */ \

+    {1, HID_KEY_SLASH         }, /* 0x3F ?         */ \

+                                                      \

+    {1, HID_KEY_2             }, /* 0x40 @         */ \

+    {1, HID_KEY_A             }, /* 0x41 A         */ \

+    {1, HID_KEY_B             }, /* 0x42 B         */ \

+    {1, HID_KEY_C             }, /* 0x43 C         */ \

+    {1, HID_KEY_D             }, /* 0x44 D         */ \

+    {1, HID_KEY_E             }, /* 0x45 E         */ \

+    {1, HID_KEY_F             }, /* 0x46 F         */ \

+    {1, HID_KEY_G             }, /* 0x47 G         */ \

+    {1, HID_KEY_H             }, /* 0x48 H         */ \

+    {1, HID_KEY_I             }, /* 0x49 I         */ \

+    {1, HID_KEY_J             }, /* 0x4A J         */ \

+    {1, HID_KEY_K             }, /* 0x4B K         */ \

+    {1, HID_KEY_L             }, /* 0x4C L         */ \

+    {1, HID_KEY_M             }, /* 0x4D M         */ \

+    {1, HID_KEY_N             }, /* 0x4E N         */ \

+    {1, HID_KEY_O             }, /* 0x4F O         */ \

+    {1, HID_KEY_P             }, /* 0x50 P         */ \

+    {1, HID_KEY_Q             }, /* 0x51 Q         */ \

+    {1, HID_KEY_R             }, /* 0x52 R         */ \

+    {1, HID_KEY_S             }, /* 0x53 S         */ \

+    {1, HID_KEY_T             }, /* 0x55 T         */ \

+    {1, HID_KEY_U             }, /* 0x55 U         */ \

+    {1, HID_KEY_V             }, /* 0x56 V         */ \

+    {1, HID_KEY_W             }, /* 0x57 W         */ \

+    {1, HID_KEY_X             }, /* 0x58 X         */ \

+    {1, HID_KEY_Y             }, /* 0x59 Y         */ \

+    {1, HID_KEY_Z             }, /* 0x5A Z         */ \

+    {0, HID_KEY_BRACKET_LEFT  }, /* 0x5B [         */ \

+    {0, HID_KEY_BACKSLASH     }, /* 0x5C '\'       */ \

+    {0, HID_KEY_BRACKET_RIGHT }, /* 0x5D ]         */ \

+    {1, HID_KEY_6             }, /* 0x5E ^         */ \

+    {1, HID_KEY_MINUS         }, /* 0x5F _         */ \

+                                                      \

+    {0, HID_KEY_GRAVE         }, /* 0x60 `         */ \

+    {0, HID_KEY_A             }, /* 0x61 a         */ \

+    {0, HID_KEY_B             }, /* 0x62 b         */ \

+    {0, HID_KEY_C             }, /* 0x63 c         */ \

+    {0, HID_KEY_D             }, /* 0x66 d         */ \

+    {0, HID_KEY_E             }, /* 0x65 e         */ \

+    {0, HID_KEY_F             }, /* 0x66 f         */ \

+    {0, HID_KEY_G             }, /* 0x67 g         */ \

+    {0, HID_KEY_H             }, /* 0x68 h         */ \

+    {0, HID_KEY_I             }, /* 0x69 i         */ \

+    {0, HID_KEY_J             }, /* 0x6A j         */ \

+    {0, HID_KEY_K             }, /* 0x6B k         */ \

+    {0, HID_KEY_L             }, /* 0x6C l         */ \

+    {0, HID_KEY_M             }, /* 0x6D m         */ \

+    {0, HID_KEY_N             }, /* 0x6E n         */ \

+    {0, HID_KEY_O             }, /* 0x6F o         */ \

+    {0, HID_KEY_P             }, /* 0x70 p         */ \

+    {0, HID_KEY_Q             }, /* 0x71 q         */ \

+    {0, HID_KEY_R             }, /* 0x72 r         */ \

+    {0, HID_KEY_S             }, /* 0x73 s         */ \

+    {0, HID_KEY_T             }, /* 0x75 t         */ \

+    {0, HID_KEY_U             }, /* 0x75 u         */ \

+    {0, HID_KEY_V             }, /* 0x76 v         */ \

+    {0, HID_KEY_W             }, /* 0x77 w         */ \

+    {0, HID_KEY_X             }, /* 0x78 x         */ \

+    {0, HID_KEY_Y             }, /* 0x79 y         */ \

+    {0, HID_KEY_Z             }, /* 0x7A z         */ \

+    {1, HID_KEY_BRACKET_LEFT  }, /* 0x7B {         */ \

+    {1, HID_KEY_BACKSLASH     }, /* 0x7C |         */ \

+    {1, HID_KEY_BRACKET_RIGHT }, /* 0x7D }         */ \

+    {1, HID_KEY_GRAVE         }, /* 0x7E ~         */ \

+    {0, HID_KEY_DELETE        }  /* 0x7F Delete    */ \

+

+/*--------------------------------------------------------------------

+ * KEYCODE to Ascii Conversion

+ *  Expand to array of [128][2] (ascii without shift, ascii with shift)

+ *

+ * Usage: example to convert ascii from keycode (key) and shift modifier (shift).

+ * Here we assume key < 128 ( printable )

+ *

+ *  uint8_t const conv_table[128][2] =  { HID_KEYCODE_TO_ASCII };

+ *  char ch = shift ? conv_table[chr][1] : conv_table[chr][0];

+ *

+ *--------------------------------------------------------------------*/

+#define HID_KEYCODE_TO_ASCII    \

+    {0     , 0      }, /* 0x00 */ \

+    {0     , 0      }, /* 0x01 */ \

+    {0     , 0      }, /* 0x02 */ \

+    {0     , 0      }, /* 0x03 */ \

+    {'a'   , 'A'    }, /* 0x04 */ \

+    {'b'   , 'B'    }, /* 0x05 */ \

+    {'c'   , 'C'    }, /* 0x06 */ \

+    {'d'   , 'D'    }, /* 0x07 */ \

+    {'e'   , 'E'    }, /* 0x08 */ \

+    {'f'   , 'F'    }, /* 0x09 */ \

+    {'g'   , 'G'    }, /* 0x0a */ \

+    {'h'   , 'H'    }, /* 0x0b */ \

+    {'i'   , 'I'    }, /* 0x0c */ \

+    {'j'   , 'J'    }, /* 0x0d */ \

+    {'k'   , 'K'    }, /* 0x0e */ \

+    {'l'   , 'L'    }, /* 0x0f */ \

+    {'m'   , 'M'    }, /* 0x10 */ \

+    {'n'   , 'N'    }, /* 0x11 */ \

+    {'o'   , 'O'    }, /* 0x12 */ \

+    {'p'   , 'P'    }, /* 0x13 */ \

+    {'q'   , 'Q'    }, /* 0x14 */ \

+    {'r'   , 'R'    }, /* 0x15 */ \

+    {'s'   , 'S'    }, /* 0x16 */ \

+    {'t'   , 'T'    }, /* 0x17 */ \

+    {'u'   , 'U'    }, /* 0x18 */ \

+    {'v'   , 'V'    }, /* 0x19 */ \

+    {'w'   , 'W'    }, /* 0x1a */ \

+    {'x'   , 'X'    }, /* 0x1b */ \

+    {'y'   , 'Y'    }, /* 0x1c */ \

+    {'z'   , 'Z'    }, /* 0x1d */ \

+    {'1'   , '!'    }, /* 0x1e */ \

+    {'2'   , '@'    }, /* 0x1f */ \

+    {'3'   , '#'    }, /* 0x20 */ \

+    {'4'   , '$'    }, /* 0x21 */ \

+    {'5'   , '%'    }, /* 0x22 */ \

+    {'6'   , '^'    }, /* 0x23 */ \

+    {'7'   , '&'    }, /* 0x24 */ \

+    {'8'   , '*'    }, /* 0x25 */ \

+    {'9'   , '('    }, /* 0x26 */ \

+    {'0'   , ')'    }, /* 0x27 */ \

+    {'\r'  , '\r'   }, /* 0x28 */ \

+    {'\x1b', '\x1b' }, /* 0x29 */ \

+    {'\b'  , '\b'   }, /* 0x2a */ \

+    {'\t'  , '\t'   }, /* 0x2b */ \

+    {' '   , ' '    }, /* 0x2c */ \

+    {'-'   , '_'    }, /* 0x2d */ \

+    {'='   , '+'    }, /* 0x2e */ \

+    {'['   , '{'    }, /* 0x2f */ \

+    {']'   , '}'    }, /* 0x30 */ \

+    {'\\'  , '|'    }, /* 0x31 */ \

+    {'#'   , '~'    }, /* 0x32 */ \

+    {';'   , ':'    }, /* 0x33 */ \

+    {'\''  , '\"'   }, /* 0x34 */ \

+    {0     , 0      }, /* 0x35 */ \

+    {','   , '<'    }, /* 0x36 */ \

+    {'.'   , '>'    }, /* 0x37 */ \

+    {'/'   , '?'    }, /* 0x38 */ \

+                                  \

+    {0     , 0      }, /* 0x39 */ \

+    {0     , 0      }, /* 0x3a */ \

+    {0     , 0      }, /* 0x3b */ \

+    {0     , 0      }, /* 0x3c */ \

+    {0     , 0      }, /* 0x3d */ \

+    {0     , 0      }, /* 0x3e */ \

+    {0     , 0      }, /* 0x3f */ \

+    {0     , 0      }, /* 0x40 */ \

+    {0     , 0      }, /* 0x41 */ \

+    {0     , 0      }, /* 0x42 */ \

+    {0     , 0      }, /* 0x43 */ \

+    {0     , 0      }, /* 0x44 */ \

+    {0     , 0      }, /* 0x45 */ \

+    {0     , 0      }, /* 0x46 */ \

+    {0     , 0      }, /* 0x47 */ \

+    {0     , 0      }, /* 0x48 */ \

+    {0     , 0      }, /* 0x49 */ \

+    {0     , 0      }, /* 0x4a */ \

+    {0     , 0      }, /* 0x4b */ \

+    {0     , 0      }, /* 0x4c */ \

+    {0     , 0      }, /* 0x4d */ \

+    {0     , 0      }, /* 0x4e */ \

+    {0     , 0      }, /* 0x4f */ \

+    {0     , 0      }, /* 0x50 */ \

+    {0     , 0      }, /* 0x51 */ \

+    {0     , 0      }, /* 0x52 */ \

+    {0     , 0      }, /* 0x53 */ \

+                                  \

+    {'/'   , '/'    }, /* 0x54 */ \

+    {'*'   , '*'    }, /* 0x55 */ \

+    {'-'   , '-'    }, /* 0x56 */ \

+    {'+'   , '+'    }, /* 0x57 */ \

+    {'\r'  , '\r'   }, /* 0x58 */ \

+    {'1'   , 0      }, /* 0x59 */ \

+    {'2'   , 0      }, /* 0x5a */ \

+    {'3'   , 0      }, /* 0x5b */ \

+    {'4'   , 0      }, /* 0x5c */ \

+    {'5'   , '5'    }, /* 0x5d */ \

+    {'6'   , 0      }, /* 0x5e */ \

+    {'7'   , 0      }, /* 0x5f */ \

+    {'8'   , 0      }, /* 0x60 */ \

+    {'9'   , 0      }, /* 0x61 */ \

+    {'0'   , 0      }, /* 0x62 */ \

+    {'0'   , 0      }, /* 0x63 */ \

+    {'='   , '='    }, /* 0x67 */ \

+

+

 #ifdef __cplusplus

  }

 #endif

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index aea16efc1..d3f59ed62 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -73,28 +73,31 @@ bool tud_hid_ready(void)
 {

   uint8_t itf = 0;

   uint8_t const ep_in = _hidd_itf[itf].ep_in;

-  return tud_ready() && (ep_in != 0) && !dcd_edpt_busy(TUD_OPT_RHPORT, ep_in);

+  return tud_ready() && (ep_in != 0) && !usbd_edpt_busy(TUD_OPT_RHPORT, ep_in);

 }

 

 bool tud_hid_report(uint8_t report_id, void const* report, uint8_t len)

 {

-  TU_VERIFY( tud_hid_ready() && (len <= CFG_TUD_HID_BUFSIZE) );

+  TU_VERIFY( tud_hid_ready() );

 

   uint8_t itf = 0;

   hidd_interface_t * p_hid = &_hidd_itf[itf];

 

-  // If report id = 0, skip ID field

   if (report_id)

   {

+    len = tu_min8(len, CFG_TUD_HID_BUFSIZE-1);

+

     p_hid->epin_buf[0] = report_id;

     memcpy(p_hid->epin_buf+1, report, len);

     len++;

   }else

   {

+    // If report id = 0, skip ID field

+    len = tu_min8(len, CFG_TUD_HID_BUFSIZE);

     memcpy(p_hid->epin_buf, report, len);

   }

 

-  return dcd_edpt_xfer(TUD_OPT_RHPORT, p_hid->ep_in, p_hid->epin_buf, len);

+  return usbd_edpt_xfer(TUD_OPT_RHPORT, p_hid->ep_in, p_hid->epin_buf, len);

 }

 

 bool tud_hid_boot_mode(void)

@@ -180,7 +183,7 @@ bool hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, uint16_t
   *p_len = sizeof(tusb_desc_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + desc_itf->bNumEndpoints*sizeof(tusb_desc_endpoint_t);

 

   // Prepare for output endpoint

-  if (p_hid->ep_out) TU_ASSERT(dcd_edpt_xfer(rhport, p_hid->ep_out, p_hid->epout_buf, sizeof(p_hid->epout_buf)));

+  if (p_hid->ep_out) TU_ASSERT(usbd_edpt_xfer(rhport, p_hid->ep_out, p_hid->epout_buf, sizeof(p_hid->epout_buf)));

 

   return true;

 }

@@ -303,7 +306,7 @@ bool hidd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_
   if (ep_addr == p_hid->ep_out)

   {

     tud_hid_set_report_cb(0, HID_REPORT_TYPE_INVALID, p_hid->epout_buf, xferred_bytes);

-    TU_ASSERT(dcd_edpt_xfer(rhport, p_hid->ep_out, p_hid->epout_buf, sizeof(p_hid->epout_buf)));

+    TU_ASSERT(usbd_edpt_xfer(rhport, p_hid->ep_out, p_hid->epout_buf, sizeof(p_hid->epout_buf)));

   }

 

   return true;

diff --git a/src/class/hid/hid_device.h b/src/class/hid/hid_device.h
index be7999770..da239cc84 100644
--- a/src/class/hid/hid_device.h
+++ b/src/class/hid/hid_device.h
@@ -82,12 +82,12 @@ uint16_t tud_hid_get_report_cb(uint8_t report_id, hid_report_type_t report_type,
 void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize);

 

 // Invoked when received SET_PROTOCOL request ( mode switch Boot <-> Report )

-ATTR_WEAK void tud_hid_boot_mode_cb(uint8_t boot_mode);

+TU_ATTR_WEAK void tud_hid_boot_mode_cb(uint8_t boot_mode);

 

 // Invoked when received SET_IDLE request. return false will stall the request

 // - Idle Rate = 0 : only send report if there is changes, i.e skip duplication

 // - Idle Rate > 0 : skip duplication, but send at least 1 report every idle rate (in unit of 4 ms).

-ATTR_WEAK bool tud_hid_set_idle_cb(uint8_t idle_rate);

+TU_ATTR_WEAK bool tud_hid_set_idle_cb(uint8_t idle_rate);

 

 /* --------------------------------------------------------------------+

  * HID Report Descriptor Template

@@ -297,155 +297,6 @@ ATTR_WEAK bool tud_hid_set_idle_cb(uint8_t idle_rate);
       HID_OUTPUT      ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE  ),\

     HID_COLLECTION_END \

 

-/*--------------------------------------------------------------------

- * ASCII to KEYCODE Conversion

- *  Expand to array of [128][2] (shift, keycode)

- *

- * Usage: example to convert input char into keyboard report (modifier + keycode)

- *

- *  uint8_t const conv_table[128][2] =  { HID_ASCII_TO_KEYCODE };

- *

- *  uint8_t keycode[6] = { 0 };

- *  uint8_t modifier   = 0;

- *

- *  if ( conv_table[chr][0] ) modifier = KEYBOARD_MODIFIER_LEFTSHIFT;

- *  keycode[0] = conv_table[chr][1];

- *  tud_hid_keyboard_report(report_id, modifier, keycode);

- *

- *--------------------------------------------------------------------*/

-#define HID_ASCII_TO_KEYCODE \

-    {0, 0                     }, /* 0x00 Null      */ \

-    {0, 0                     }, /* 0x01           */ \

-    {0, 0                     }, /* 0x02           */ \

-    {0, 0                     }, /* 0x03           */ \

-    {0, 0                     }, /* 0x04           */ \

-    {0, 0                     }, /* 0x05           */ \

-    {0, 0                     }, /* 0x06           */ \

-    {0, 0                     }, /* 0x07           */ \

-    {0, HID_KEY_BACKSPACE     }, /* 0x08 Backspace */ \

-    {0, HID_KEY_TAB           }, /* 0x09 Tab       */ \

-    {0, HID_KEY_RETURN        }, /* 0x0A Line Feed */ \

-    {0, 0                     }, /* 0x0B           */ \

-    {0, 0                     }, /* 0x0C           */ \

-    {0, HID_KEY_RETURN        }, /* 0x0D CR        */ \

-    {0, 0                     }, /* 0x0E           */ \

-    {0, 0                     }, /* 0x0F           */ \

-    {0, 0                     }, /* 0x10           */ \

-    {0, 0                     }, /* 0x11           */ \

-    {0, 0                     }, /* 0x12           */ \

-    {0, 0                     }, /* 0x13           */ \

-    {0, 0                     }, /* 0x14           */ \

-    {0, 0                     }, /* 0x15           */ \

-    {0, 0                     }, /* 0x16           */ \

-    {0, 0                     }, /* 0x17           */ \

-    {0, 0                     }, /* 0x18           */ \

-    {0, 0                     }, /* 0x19           */ \

-    {0, 0                     }, /* 0x1A           */ \

-    {0, HID_KEY_ESCAPE        }, /* 0x1B Escape    */ \

-    {0, 0                     }, /* 0x1C           */ \

-    {0, 0                     }, /* 0x1D           */ \

-    {0, 0                     }, /* 0x1E           */ \

-    {0, 0                     }, /* 0x1F           */ \

-                                                      \

-    {0, HID_KEY_SPACE         }, /* 0x20           */ \

-    {1, HID_KEY_1             }, /* 0x21 !         */ \

-    {1, HID_KEY_APOSTROPHE    }, /* 0x22 "         */ \

-    {1, HID_KEY_3             }, /* 0x23 #         */ \

-    {1, HID_KEY_4             }, /* 0x24 $         */ \

-    {1, HID_KEY_5             }, /* 0x25 %         */ \

-    {1, HID_KEY_7             }, /* 0x26 &         */ \

-    {0, HID_KEY_APOSTROPHE    }, /* 0x27 '         */ \

-    {1, HID_KEY_9             }, /* 0x28 (         */ \

-    {1, HID_KEY_0             }, /* 0x29 )         */ \

-    {1, HID_KEY_8             }, /* 0x2A *         */ \

-    {1, HID_KEY_EQUAL         }, /* 0x2B +         */ \

-    {0, HID_KEY_COMMA         }, /* 0x2C ,         */ \

-    {0, HID_KEY_MINUS         }, /* 0x2D -         */ \

-    {0, HID_KEY_PERIOD        }, /* 0x2E .         */ \

-    {0, HID_KEY_SLASH         }, /* 0x2F /         */ \

-    {0, HID_KEY_0             }, /* 0x30 0         */ \

-    {0, HID_KEY_1             }, /* 0x31 1         */ \

-    {0, HID_KEY_2             }, /* 0x32 2         */ \

-    {0, HID_KEY_3             }, /* 0x33 3         */ \

-    {0, HID_KEY_4             }, /* 0x34 4         */ \

-    {0, HID_KEY_5             }, /* 0x35 5         */ \

-    {0, HID_KEY_6             }, /* 0x36 6         */ \

-    {0, HID_KEY_7             }, /* 0x37 7         */ \

-    {0, HID_KEY_8             }, /* 0x38 8         */ \

-    {0, HID_KEY_9             }, /* 0x39 9         */ \

-    {1, HID_KEY_SEMICOLON     }, /* 0x3A :         */ \

-    {0, HID_KEY_SEMICOLON     }, /* 0x3B ;         */ \

-    {1, HID_KEY_COMMA         }, /* 0x3C <         */ \

-    {0, HID_KEY_EQUAL         }, /* 0x3D =         */ \

-    {1, HID_KEY_PERIOD        }, /* 0x3E >         */ \

-    {1, HID_KEY_SLASH         }, /* 0x3F ?         */ \

-                                                      \

-    {1, HID_KEY_2             }, /* 0x40 @         */ \

-    {1, HID_KEY_A             }, /* 0x41 A         */ \

-    {1, HID_KEY_B             }, /* 0x42 B         */ \

-    {1, HID_KEY_C             }, /* 0x43 C         */ \

-    {1, HID_KEY_D             }, /* 0x44 D         */ \

-    {1, HID_KEY_E             }, /* 0x45 E         */ \

-    {1, HID_KEY_F             }, /* 0x46 F         */ \

-    {1, HID_KEY_G             }, /* 0x47 G         */ \

-    {1, HID_KEY_H             }, /* 0x48 H         */ \

-    {1, HID_KEY_I             }, /* 0x49 I         */ \

-    {1, HID_KEY_J             }, /* 0x4A J         */ \

-    {1, HID_KEY_K             }, /* 0x4B K         */ \

-    {1, HID_KEY_L             }, /* 0x4C L         */ \

-    {1, HID_KEY_M             }, /* 0x4D M         */ \

-    {1, HID_KEY_N             }, /* 0x4E N         */ \

-    {1, HID_KEY_O             }, /* 0x4F O         */ \

-    {1, HID_KEY_P             }, /* 0x50 P         */ \

-    {1, HID_KEY_Q             }, /* 0x51 Q         */ \

-    {1, HID_KEY_R             }, /* 0x52 R         */ \

-    {1, HID_KEY_S             }, /* 0x53 S         */ \

-    {1, HID_KEY_T             }, /* 0x55 T         */ \

-    {1, HID_KEY_U             }, /* 0x55 U         */ \

-    {1, HID_KEY_V             }, /* 0x56 V         */ \

-    {1, HID_KEY_W             }, /* 0x57 W         */ \

-    {1, HID_KEY_X             }, /* 0x58 X         */ \

-    {1, HID_KEY_Y             }, /* 0x59 Y         */ \

-    {1, HID_KEY_Z             }, /* 0x5A Z         */ \

-    {0, HID_KEY_BRACKET_LEFT  }, /* 0x5B [         */ \

-    {0, HID_KEY_BACKSLASH     }, /* 0x5C '\'       */ \

-    {0, HID_KEY_BRACKET_RIGHT }, /* 0x5D ]         */ \

-    {1, HID_KEY_6             }, /* 0x5E ^         */ \

-    {1, HID_KEY_MINUS         }, /* 0x5F _         */ \

-                                                      \

-    {0, HID_KEY_GRAVE         }, /* 0x60 `         */ \

-    {0, HID_KEY_A             }, /* 0x61 a         */ \

-    {0, HID_KEY_B             }, /* 0x62 b         */ \

-    {0, HID_KEY_C             }, /* 0x63 c         */ \

-    {0, HID_KEY_D             }, /* 0x66 d         */ \

-    {0, HID_KEY_E             }, /* 0x65 e         */ \

-    {0, HID_KEY_F             }, /* 0x66 f         */ \

-    {0, HID_KEY_G             }, /* 0x67 g         */ \

-    {0, HID_KEY_H             }, /* 0x68 h         */ \

-    {0, HID_KEY_I             }, /* 0x69 i         */ \

-    {0, HID_KEY_J             }, /* 0x6A j         */ \

-    {0, HID_KEY_K             }, /* 0x6B k         */ \

-    {0, HID_KEY_L             }, /* 0x6C l         */ \

-    {0, HID_KEY_M             }, /* 0x6D m         */ \

-    {0, HID_KEY_N             }, /* 0x6E n         */ \

-    {0, HID_KEY_O             }, /* 0x6F o         */ \

-    {0, HID_KEY_P             }, /* 0x70 p         */ \

-    {0, HID_KEY_Q             }, /* 0x71 q         */ \

-    {0, HID_KEY_R             }, /* 0x72 r         */ \

-    {0, HID_KEY_S             }, /* 0x73 s         */ \

-    {0, HID_KEY_T             }, /* 0x75 t         */ \

-    {0, HID_KEY_U             }, /* 0x75 u         */ \

-    {0, HID_KEY_V             }, /* 0x76 v         */ \

-    {0, HID_KEY_W             }, /* 0x77 w         */ \

-    {0, HID_KEY_X             }, /* 0x78 x         */ \

-    {0, HID_KEY_Y             }, /* 0x79 y         */ \

-    {0, HID_KEY_Z             }, /* 0x7A z         */ \

-    {1, HID_KEY_BRACKET_LEFT  }, /* 0x7B {         */ \

-    {1, HID_KEY_BACKSLASH     }, /* 0x7C |         */ \

-    {1, HID_KEY_BRACKET_RIGHT }, /* 0x7D }         */ \

-    {1, HID_KEY_GRAVE         }, /* 0x7E ~         */ \

-    {0, HID_KEY_DELETE        }  /* 0x7F Delete    */ \

-

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

 // Internal Class Driver API

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

diff --git a/src/class/midi/midi.h b/src/class/midi/midi.h
index ee318f788..50f2be679 100644
--- a/src/class/midi/midi.h
+++ b/src/class/midi/midi.h
@@ -42,7 +42,7 @@
 // FUNCTIONAL DESCRIPTOR (COMMUNICATION INTERFACE)

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

 /// Header Functional Descriptor (Communication Interface)

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength            ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType    ; ///< Descriptor Type, must be Class-Specific

@@ -52,7 +52,7 @@ typedef struct ATTR_PACKED
 }midi_desc_func_header_t;

 

 /// Union Functional Descriptor (Communication Interface)

-typedef struct ATTR_PACKED

+typedef struct TU_ATTR_PACKED

 {

   uint8_t bLength                  ; ///< Size of this descriptor in bytes.

   uint8_t bDescriptorType          ; ///< Descriptor Type, must be Class-Specific

diff --git a/src/class/midi/midi_device.c b/src/class/midi/midi_device.c
index e834e0632..2454db47e 100644
--- a/src/class/midi/midi_device.c
+++ b/src/class/midi/midi_device.c
@@ -72,7 +72,7 @@ typedef struct
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-CFG_TUSB_ATTR_USBRAM midid_interface_t _midid_itf[CFG_TUD_MIDI];

+CFG_TUSB_MEM_SECTION midid_interface_t _midid_itf[CFG_TUD_MIDI];

 

 bool tud_midi_n_connected(uint8_t itf) {

   midid_interface_t* midi = &_midid_itf[itf];

@@ -133,13 +133,13 @@ void midi_rx_done_cb(midid_interface_t* midi, uint8_t const* buffer, uint32_t bu
 

 static bool maybe_transmit(midid_interface_t* midi, uint8_t itf_index)

 {

-    TU_VERIFY( !dcd_edpt_busy(TUD_OPT_RHPORT, midi->ep_in) ); // skip if previous transfer not complete

+    TU_VERIFY( !usbd_edpt_busy(TUD_OPT_RHPORT, midi->ep_in) ); // skip if previous transfer not complete

 

     uint16_t count = tu_fifo_read_n(&midi->tx_ff, midi->epin_buf, CFG_TUD_MIDI_EPSIZE);

     if (count > 0)

     {

       TU_VERIFY( tud_midi_n_connected(itf_index) ); // fifo is empty if not connected

-      TU_ASSERT( dcd_edpt_xfer(TUD_OPT_RHPORT, midi->ep_in, midi->epin_buf, count) );

+      TU_ASSERT( usbd_edpt_xfer(TUD_OPT_RHPORT, midi->ep_in, midi->epin_buf, count) );

     }

     return true;

 }

@@ -304,7 +304,7 @@ bool midid_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc,
   }

 

   // Prepare for incoming data

-  TU_ASSERT( dcd_edpt_xfer(rhport, p_midi->ep_out, p_midi->epout_buf, CFG_TUD_MIDI_EPSIZE), false);

+  TU_ASSERT( usbd_edpt_xfer(rhport, p_midi->ep_out, p_midi->epout_buf, CFG_TUD_MIDI_EPSIZE), false);

 

   return true;

 }

@@ -334,7 +334,7 @@ bool midid_xfer_cb(uint8_t rhport, uint8_t edpt_addr, xfer_result_t result, uint
     midi_rx_done_cb(p_midi, p_midi->epout_buf, xferred_bytes);

 

     // prepare for next

-    TU_ASSERT( dcd_edpt_xfer(rhport, p_midi->ep_out, p_midi->epout_buf, CFG_TUD_MIDI_EPSIZE), false );

+    TU_ASSERT( usbd_edpt_xfer(rhport, p_midi->ep_out, p_midi->epout_buf, CFG_TUD_MIDI_EPSIZE), false );

   } else if ( edpt_addr == p_midi->ep_in ) {

     maybe_transmit(p_midi, itf);

   }

diff --git a/src/class/midi/midi_device.h b/src/class/midi/midi_device.h
index 84f4c57bd..45e009010 100644
--- a/src/class/midi/midi_device.h
+++ b/src/class/midi/midi_device.h
@@ -82,7 +82,7 @@ static inline bool     tud_midi_write_flush     (void)
 //--------------------------------------------------------------------+

 // APPLICATION CALLBACK API (WEAK is optional)

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

-ATTR_WEAK void tud_midi_rx_cb(uint8_t itf);

+TU_ATTR_WEAK void tud_midi_rx_cb(uint8_t itf);

 

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

 // Internal Class Driver API

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