update mtp device, just enum done

4 files changed, 966 insertions, 133 deletions

diff --git a/class/mtp/usb_mtp.h b/class/mtp/usb_mtp.h
index a3b68789..968c4d0e 100644
--- a/class/mtp/usb_mtp.h
+++ b/class/mtp/usb_mtp.h
@@ -11,15 +11,196 @@
 #define USB_MTP_SUB_CLASS 0x01U
 #define USB_MTP_PROTOCOL  0x01U
 
+/* MTP class requests */
 #define MTP_REQUEST_CANCEL             0x64U
 #define MTP_REQUEST_GET_EXT_EVENT_DATA 0x65U
 #define MTP_REQUEST_RESET              0x66U
 #define MTP_REQUEST_GET_DEVICE_STATUS  0x67U
 
+/* Container Types */
+#define MTP_CONTAINER_TYPE_UNDEFINED 0U
+#define MTP_CONTAINER_TYPE_COMMAND   1U
+#define MTP_CONTAINER_TYPE_DATA      2U
+#define MTP_CONTAINER_TYPE_RESPONSE  3U
+#define MTP_CONTAINER_TYPE_EVENT     4U
+
+/*
+ * MTP Class specification Revision 1.1
+ * Appendix D. Operations
+ */
+
+/* Operations code */
+#define MTP_OP_GET_DEVICE_INFO            0x1001U
+#define MTP_OP_OPEN_SESSION               0x1002U
+#define MTP_OP_CLOSE_SESSION              0x1003U
+#define MTP_OP_GET_STORAGE_IDS            0x1004U
+#define MTP_OP_GET_STORAGE_INFO           0x1005U
+#define MTP_OP_GET_NUM_OBJECTS            0x1006U
+#define MTP_OP_GET_OBJECT_HANDLES         0x1007U
+#define MTP_OP_GET_OBJECT_INFO            0x1008U
+#define MTP_OP_GET_OBJECT                 0x1009U
+#define MTP_OP_GET_THUMB                  0x100AU
+#define MTP_OP_DELETE_OBJECT              0x100BU
+#define MTP_OP_SEND_OBJECT_INFO           0x100CU
+#define MTP_OP_SEND_OBJECT                0x100DU
+#define MTP_OP_FORMAT_STORE               0x100FU
+#define MTP_OP_RESET_DEVICE               0x1010U
+#define MTP_OP_GET_DEVICE_PROP_DESC       0x1014U
+#define MTP_OP_GET_DEVICE_PROP_VALUE      0x1015U
+#define MTP_OP_SET_DEVICE_PROP_VALUE      0x1016U
+#define MTP_OP_RESET_DEVICE_PROP_VALUE    0x1017U
+#define MTP_OP_TERMINATE_OPEN_CAPTURE     0x1018U
+#define MTP_OP_MOVE_OBJECT                0x1019U
+#define MTP_OP_COPY_OBJECT                0x101AU
+#define MTP_OP_GET_PARTIAL_OBJECT         0x101BU
+#define MTP_OP_INITIATE_OPEN_CAPTURE      0x101CU
+#define MTP_OP_GET_OBJECT_PROPS_SUPPORTED 0x9801U
+#define MTP_OP_GET_OBJECT_PROP_DESC       0x9802U
+#define MTP_OP_GET_OBJECT_PROP_VALUE      0x9803U
+#define MTP_OP_SET_OBJECT_PROP_VALUE      0x9804U
+#define MTP_OP_GET_OBJECT_PROPLIST        0x9805U
+#define MTP_OP_GET_OBJECT_PROP_REFERENCES 0x9810U
+#define MTP_OP_GETSERVICEIDS              0x9301U
+#define MTP_OP_GETSERVICEINFO             0x9302U
+#define MTP_OP_GETSERVICECAPABILITIES     0x9303U
+#define MTP_OP_GETSERVICEPROPDESC         0x9304U
+
+/* MTP response code */
+#define MTP_RESPONSE_OK                                    0x2001U
+#define MTP_RESPONSE_GENERAL_ERROR                         0x2002U
+#define MTP_RESPONSE_PARAMETER_NOT_SUPPORTED               0x2006U
+#define MTP_RESPONSE_INCOMPLETE_TRANSFER                   0x2007U
+#define MTP_RESPONSE_INVALID_STORAGE_ID                    0x2008U
+#define MTP_RESPONSE_INVALID_OBJECT_HANDLE                 0x2009U
+#define MTP_RESPONSE_DEVICEPROP_NOT_SUPPORTED              0x200AU
+#define MTP_RESPONSE_STORE_FULL                            0x200CU
+#define MTP_RESPONSE_ACCESS_DENIED                         0x200FU
+#define MTP_RESPONSE_STORE_NOT_AVAILABLE                   0x2013U
+#define MTP_RESPONSE_SPECIFICATION_BY_FORMAT_NOT_SUPPORTED 0x2014U
+#define MTP_RESPONSE_NO_VALID_OBJECT_INFO                  0x2015U
+#define MTP_RESPONSE_DEVICE_BUSY                           0x2019U
+#define MTP_RESPONSE_INVALID_PARENT_OBJECT                 0x201AU
+#define MTP_RESPONSE_INVALID_PARAMETER                     0x201DU
+#define MTP_RESPONSE_SESSION_ALREADY_OPEN                  0x201EU
+#define MTP_RESPONSE_TRANSACTION_CANCELLED                 0x201FU
+#define MTP_RESPONSE_INVALID_OBJECT_PROP_CODE              0xA801U
+#define MTP_RESPONSE_SPECIFICATION_BY_GROUP_UNSUPPORTED    0xA807U
+#define MTP_RESPONSE_OBJECT_PROP_NOT_SUPPORTED             0xA80AU
+
+/* MTP Object format codes */
+#define MTP_OBJ_FORMAT_UNDEFINED            0x3000U
+#define MTP_OBJ_FORMAT_ASSOCIATION          0x3001U
+#define MTP_OBJ_FORMAT_SCRIPT               0x3002U
+#define MTP_OBJ_FORMAT_EXECUTABLE           0x3003U
+#define MTP_OBJ_FORMAT_TEXT                 0x3004U
+#define MTP_OBJ_FORMAT_HTML                 0x3005U
+#define MTP_OBJ_FORMAT_DPOF                 0x3006U
+#define MTP_OBJ_FORMAT_AIFF                 0x3007U
+#define MTP_OBJ_FORMAT_WAV                  0x3008U
+#define MTP_OBJ_FORMAT_MP3                  0x3009U
+#define MTP_OBJ_FORMAT_AVI                  0x300AU
+#define MTP_OBJ_FORMAT_MPEG                 0x300BU
+#define MTP_OBJ_FORMAT_ASF                  0x300CU
+#define MTP_OBJ_FORMAT_DEFINED              0x3800U
+#define MTP_OBJ_FORMAT_EXIF_JPEG            0x3801U
+#define MTP_OBJ_FORMAT_TIFF_EP              0x3802U
+#define MTP_OBJ_FORMAT_FLASHPIX             0x3803U
+#define MTP_OBJ_FORMAT_BMP                  0x3804U
+#define MTP_OBJ_FORMAT_CIFF                 0x3805U
+#define MTP_OBJ_FORMAT_UNDEFINED_RESERVED0  0x3806U
+#define MTP_OBJ_FORMAT_GIF                  0x3807U
+#define MTP_OBJ_FORMAT_JFIF                 0x3808U
+#define MTP_OBJ_FORMAT_CD                   0x3809U
+#define MTP_OBJ_FORMAT_PICT                 0x380AU
+#define MTP_OBJ_FORMAT_PNG                  0x380BU
+#define MTP_OBJ_FORMAT_UNDEFINED_RESERVED1  0x380CU
+#define MTP_OBJ_FORMAT_TIFF                 0x380DU
+#define MTP_OBJ_FORMAT_TIFF_IT              0x380EU
+#define MTP_OBJ_FORMAT_JP2                  0x380FU
+#define MTP_OBJ_FORMAT_JPX                  0x3810U
+#define MTP_OBJ_FORMAT_UNDEFINED_FIRMWARE   0xB802U
+#define MTP_OBJ_FORMAT_WINDOWS_IMAGE_FORMAT 0xB881U
+#define MTP_OBJ_FORMAT_UNDEFINED_AUDIO      0xB900U
+#define MTP_OBJ_FORMAT_WMA                  0xB901U
+#define MTP_OBJ_FORMAT_OGG                  0xB902U
+#define MTP_OBJ_FORMAT_AAC                  0xB903U
+#define MTP_OBJ_FORMAT_AUDIBLE              0xB904U
+#define MTP_OBJ_FORMAT_FLAC                 0xB906U
+#define MTP_OBJ_FORMAT_UNDEFINED_VIDEO      0xB980U
+#define MTP_OBJ_FORMAT_WMV                  0xB981U
+#define MTP_OBJ_FORMAT_MP4_CONTAINER        0xB982U
+#define MTP_OBJ_FORMAT_MP2                  0xB983U
+#define MTP_OBJ_FORMAT_3GP_CONTAINER        0xB984U
+
+/*  MTP event codes*/
+#define MTP_EVENT_UNDEFINED               0x4000U
+#define MTP_EVENT_CANCELTRANSACTION       0x4001U
+#define MTP_EVENT_OBJECTADDED             0x4002U
+#define MTP_EVENT_OBJECTREMOVED           0x4003U
+#define MTP_EVENT_STOREADDED              0x4004U
+#define MTP_EVENT_STOREREMOVED            0x4005U
+#define MTP_EVENT_DEVICEPROPCHANGED       0x4006U
+#define MTP_EVENT_OBJECTINFOCHANGED       0x4007U
+#define MTP_EVENT_DEVICEINFOCHANGED       0x4008U
+#define MTP_EVENT_REQUESTOBJECTTRANSFER   0x4009U
+#define MTP_EVENT_STOREFULL               0x400AU
+#define MTP_EVENT_DEVICERESET             0x400BU
+#define MTP_EVENT_STORAGEINFOCHANGED      0x400CU
+#define MTP_EVENT_CAPTURECOMPLETE         0x400DU
+#define MTP_EVENT_UNREPORTEDSTATUS        0x400EU
+#define MTP_EVENT_OBJECTPROPCHANGED       0xC801U
+#define MTP_EVENT_OBJECTPROPDESCCHANGED   0xC802U
+#define MTP_EVENT_OBJECTREFERENCESCHANGED 0xC803U
+
+/* MTP device properties code*/
+#define MTP_DEV_PROP_UNDEFINED                      0x5000U
+#define MTP_DEV_PROP_BATTERY_LEVEL                  0x5001U
+#define MTP_DEV_PROP_FUNCTIONAL_MODE                0x5002U
+#define MTP_DEV_PROP_IMAGE_SIZE                     0x5003U
+#define MTP_DEV_PROP_COMPRESSION_SETTING            0x5004U
+#define MTP_DEV_PROP_WHITE_BALANCE                  0x5005U
+#define MTP_DEV_PROP_RGB_GAIN                       0x5006U
+#define MTP_DEV_PROP_F_NUMBER                       0x5007U
+#define MTP_DEV_PROP_FOCAL_LENGTH                   0x5008U
+#define MTP_DEV_PROP_FOCUS_DISTANCE                 0x5009U
+#define MTP_DEV_PROP_FOCUS_MODE                     0x500AU
+#define MTP_DEV_PROP_EXPOSURE_METERING_MODE         0x500BU
+#define MTP_DEV_PROP_FLASH_MODE                     0x500CU
+#define MTP_DEV_PROP_EXPOSURE_TIME                  0x500DU
+#define MTP_DEV_PROP_EXPOSURE_PROGRAM_MODE          0x500EU
+#define MTP_DEV_PROP_EXPOSURE_INDEX                 0x500FU
+#define MTP_DEV_PROP_EXPOSURE_BIAS_COMPENSATION     0x5010U
+#define MTP_DEV_PROP_DATETIME                       0x5011U
+#define MTP_DEV_PROP_CAPTURE_DELAY                  0x5012U
+#define MTP_DEV_PROP_STILL_CAPTURE_MODE             0x5013U
+#define MTP_DEV_PROP_CONTRAST                       0x5014U
+#define MTP_DEV_PROP_SHARPNESS                      0x5015U
+#define MTP_DEV_PROP_DIGITAL_ZOOM                   0x5016U
+#define MTP_DEV_PROP_EFFECT_MODE                    0x5017U
+#define MTP_DEV_PROP_BURST_NUMBER                   0x5018U
+#define MTP_DEV_PROP_BURST_INTERVAL                 0x5019U
+#define MTP_DEV_PROP_TIMELAPSE_NUMBER               0x501AU
+#define MTP_DEV_PROP_TIMELAPSE_INTERVAL             0x501BU
+#define MTP_DEV_PROP_FOCUS_METERING_MODE            0x501CU
+#define MTP_DEV_PROP_UPLOAD_URL                     0x501DU
+#define MTP_DEV_PROP_ARTIST                         0x501EU
+#define MTP_DEV_PROP_COPYRIGHT_INFO                 0x501FU
+#define MTP_DEV_PROP_SYNCHRONIZATION_PARTNER        0xD401U
+#define MTP_DEV_PROP_DEVICE_FRIENDLY_NAME           0xD402U
+#define MTP_DEV_PROP_VOLUME                         0xD403U
+#define MTP_DEV_PROP_SUPPORTEDFORMATSORDERED        0xD404U
+#define MTP_DEV_PROP_DEVICEICON                     0xD405U
+#define MTP_DEV_PROP_PLAYBACK_RATE                  0xD410U
+#define MTP_DEV_PROP_PLAYBACK_OBJECT                0xD411U
+#define MTP_DEV_PROP_PLAYBACK_CONTAINER             0xD412U
+#define MTP_DEV_PROP_SESSION_INITIATOR_VERSION_INFO 0xD406U
+#define MTP_DEV_PROP_PERCEIVED_DEVICE_TYPE          0xD407U
+
 /*
  * MTP Class specification Revision 1.1
  * Appendix B. Object Properties
  */
+
 /* MTP OBJECT PROPERTIES supported*/
 #define MTP_OB_PROP_STORAGE_ID                          0xDC01U
 #define MTP_OB_PROP_OBJECT_FORMAT                       0xDC02U
@@ -188,130 +369,6 @@
 #define MTP_OB_PROP_TIME_TO_LIVE                        0xDD71U
 #define MTP_OB_PROP_MEDIA_GUID                          0xDD72U
 
-/*  MTP event codes*/
-#define MTP_EVENT_UNDEFINED               0x4000U
-#define MTP_EVENT_CANCELTRANSACTION       0x4001U
-#define MTP_EVENT_OBJECTADDED             0x4002U
-#define MTP_EVENT_OBJECTREMOVED           0x4003U
-#define MTP_EVENT_STOREADDED              0x4004U
-#define MTP_EVENT_STOREREMOVED            0x4005U
-#define MTP_EVENT_DEVICEPROPCHANGED       0x4006U
-#define MTP_EVENT_OBJECTINFOCHANGED       0x4007U
-#define MTP_EVENT_DEVICEINFOCHANGED       0x4008U
-#define MTP_EVENT_REQUESTOBJECTTRANSFER   0x4009U
-#define MTP_EVENT_STOREFULL               0x400AU
-#define MTP_EVENT_DEVICERESET             0x400BU
-#define MTP_EVENT_STORAGEINFOCHANGED      0x400CU
-#define MTP_EVENT_CAPTURECOMPLETE         0x400DU
-#define MTP_EVENT_UNREPORTEDSTATUS        0x400EU
-#define MTP_EVENT_OBJECTPROPCHANGED       0xC801U
-#define MTP_EVENT_OBJECTPROPDESCCHANGED   0xC802U
-#define MTP_EVENT_OBJECTREFERENCESCHANGED 0xC803U
-
-/*
- * MTP Class specification Revision 1.1
- * Appendix D. Operations
- */
-
-/* Operations code */
-#define MTP_OP_GET_DEVICE_INFO            0x1001U
-#define MTP_OP_OPEN_SESSION               0x1002U
-#define MTP_OP_CLOSE_SESSION              0x1003U
-#define MTP_OP_GET_STORAGE_IDS            0x1004U
-#define MTP_OP_GET_STORAGE_INFO           0x1005U
-#define MTP_OP_GET_NUM_OBJECTS            0x1006U
-#define MTP_OP_GET_OBJECT_HANDLES         0x1007U
-#define MTP_OP_GET_OBJECT_INFO            0x1008U
-#define MTP_OP_GET_OBJECT                 0x1009U
-#define MTP_OP_GET_THUMB                  0x100AU
-#define MTP_OP_DELETE_OBJECT              0x100BU
-#define MTP_OP_SEND_OBJECT_INFO           0x100CU
-#define MTP_OP_SEND_OBJECT                0x100DU
-#define MTP_OP_FORMAT_STORE               0x100FU
-#define MTP_OP_RESET_DEVICE               0x1010U
-#define MTP_OP_GET_DEVICE_PROP_DESC       0x1014U
-#define MTP_OP_GET_DEVICE_PROP_VALUE      0x1015U
-#define MTP_OP_SET_DEVICE_PROP_VALUE      0x1016U
-#define MTP_OP_RESET_DEVICE_PROP_VALUE    0x1017U
-#define MTP_OP_TERMINATE_OPEN_CAPTURE     0x1018U
-#define MTP_OP_MOVE_OBJECT                0x1019U
-#define MTP_OP_COPY_OBJECT                0x101AU
-#define MTP_OP_GET_PARTIAL_OBJECT         0x101BU
-#define MTP_OP_INITIATE_OPEN_CAPTURE      0x101CU
-#define MTP_OP_GET_OBJECT_PROPS_SUPPORTED 0x9801U
-#define MTP_OP_GET_OBJECT_PROP_DESC       0x9802U
-#define MTP_OP_GET_OBJECT_PROP_VALUE      0x9803U
-#define MTP_OP_SET_OBJECT_PROP_VALUE      0x9804U
-#define MTP_OP_GET_OBJECT_PROPLIST        0x9805U
-#define MTP_OP_GET_OBJECT_PROP_REFERENCES 0x9810U
-#define MTP_OP_GETSERVICEIDS              0x9301U
-#define MTP_OP_GETSERVICEINFO             0x9302U
-#define MTP_OP_GETSERVICECAPABILITIES     0x9303U
-#define MTP_OP_GETSERVICEPROPDESC         0x9304U
-
-/*
- * MTP Class specification Revision 1.1
- * Appendix C. Device Properties
- */
-
-/* MTP device properties code*/
-#define MTP_DEV_PROP_UNDEFINED                      0x5000U
-#define MTP_DEV_PROP_BATTERY_LEVEL                  0x5001U
-#define MTP_DEV_PROP_FUNCTIONAL_MODE                0x5002U
-#define MTP_DEV_PROP_IMAGE_SIZE                     0x5003U
-#define MTP_DEV_PROP_COMPRESSION_SETTING            0x5004U
-#define MTP_DEV_PROP_WHITE_BALANCE                  0x5005U
-#define MTP_DEV_PROP_RGB_GAIN                       0x5006U
-#define MTP_DEV_PROP_F_NUMBER                       0x5007U
-#define MTP_DEV_PROP_FOCAL_LENGTH                   0x5008U
-#define MTP_DEV_PROP_FOCUS_DISTANCE                 0x5009U
-#define MTP_DEV_PROP_FOCUS_MODE                     0x500AU
-#define MTP_DEV_PROP_EXPOSURE_METERING_MODE         0x500BU
-#define MTP_DEV_PROP_FLASH_MODE                     0x500CU
-#define MTP_DEV_PROP_EXPOSURE_TIME                  0x500DU
-#define MTP_DEV_PROP_EXPOSURE_PROGRAM_MODE          0x500EU
-#define MTP_DEV_PROP_EXPOSURE_INDEX                 0x500FU
-#define MTP_DEV_PROP_EXPOSURE_BIAS_COMPENSATION     0x5010U
-#define MTP_DEV_PROP_DATETIME                       0x5011U
-#define MTP_DEV_PROP_CAPTURE_DELAY                  0x5012U
-#define MTP_DEV_PROP_STILL_CAPTURE_MODE             0x5013U
-#define MTP_DEV_PROP_CONTRAST                       0x5014U
-#define MTP_DEV_PROP_SHARPNESS                      0x5015U
-#define MTP_DEV_PROP_DIGITAL_ZOOM                   0x5016U
-#define MTP_DEV_PROP_EFFECT_MODE                    0x5017U
-#define MTP_DEV_PROP_BURST_NUMBER                   0x5018U
-#define MTP_DEV_PROP_BURST_INTERVAL                 0x5019U
-#define MTP_DEV_PROP_TIMELAPSE_NUMBER               0x501AU
-#define MTP_DEV_PROP_TIMELAPSE_INTERVAL             0x501BU
-#define MTP_DEV_PROP_FOCUS_METERING_MODE            0x501CU
-#define MTP_DEV_PROP_UPLOAD_URL                     0x501DU
-#define MTP_DEV_PROP_ARTIST                         0x501EU
-#define MTP_DEV_PROP_COPYRIGHT_INFO                 0x501FU
-#define MTP_DEV_PROP_SYNCHRONIZATION_PARTNER        0xD401U
-#define MTP_DEV_PROP_DEVICE_FRIENDLY_NAME           0xD402U
-#define MTP_DEV_PROP_VOLUME                         0xD403U
-#define MTP_DEV_PROP_SUPPORTEDFORMATSORDERED        0xD404U
-#define MTP_DEV_PROP_DEVICEICON                     0xD405U
-#define MTP_DEV_PROP_PLAYBACK_RATE                  0xD410U
-#define MTP_DEV_PROP_PLAYBACK_OBJECT                0xD411U
-#define MTP_DEV_PROP_PLAYBACK_CONTAINER             0xD412U
-#define MTP_DEV_PROP_SESSION_INITIATOR_VERSION_INFO 0xD406U
-#define MTP_DEV_PROP_PERCEIVED_DEVICE_TYPE          0xD407U
-
-/* Container Types */
-#define MTP_CONT_TYPE_UNDEFINED 0U
-#define MTP_CONT_TYPE_COMMAND   1U
-#define MTP_CONT_TYPE_DATA      2U
-#define MTP_CONT_TYPE_RESPONSE  3U
-#define MTP_CONT_TYPE_EVENT     4U
-
-#ifndef MTP_STORAGE_ID
-#define MTP_STORAGE_ID 0x00010001U /* SD card is inserted*/
-#endif                             /* MTP_STORAGE_ID */
-
-#define MTP_NBR_STORAGE_ID         1U
-#define FREE_SPACE_IN_OBJ_NOT_USED 0xFFFFFFFFU
-
 /* MTP storage type */
 #define MTP_STORAGE_UNDEFINED     0U
 #define MTP_STORAGE_FIXED_ROM     0x0001U
@@ -346,4 +403,101 @@
 #define MTP_PROP_GET     0x00U
 #define MTP_PROP_GET_SET 0x01U
 
+#define MTP_SESSION_CLOSED 0x00
+#define MTP_SESSION_OPENED 0x01
+
+struct mtp_container_command {
+    uint32_t conlen;
+    uint16_t contype;
+    uint16_t code;
+    uint32_t trans_id;
+    uint32_t param1;
+    uint32_t param2;
+    uint32_t param3;
+    uint32_t param4;
+    uint32_t param5;
+} __PACKED;
+
+struct mtp_container_data {
+    uint32_t conlen;
+    uint16_t contype;
+    uint16_t code;
+    uint32_t trans_id;
+    uint8_t data[512];
+} __PACKED;
+
+struct mtp_container_response {
+    uint32_t conlen;
+    uint16_t contype;
+    uint16_t code;
+    uint32_t trans_id;
+} __PACKED;
+
+/*Length of template descriptor: 23 bytes*/
+#define MTP_DESCRIPTOR_LEN (9 + 7 + 7 + 7)
+
+// clang-format off
+#ifndef CONFIG_USB_HS
+#define MTP_DESCRIPTOR_INIT(bFirstInterface, out_ep, in_ep, int_ep, str_idx) \
+    /* Interface */                                                          \
+    0x09,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_INTERFACE, /* bDescriptorType */                 \
+    bFirstInterface,               /* bInterfaceNumber */                \
+    0x00,                          /* bAlternateSetting */               \
+    0x03,                          /* bNumEndpoints */                   \
+    USB_DEVICE_CLASS_MASS_STORAGE, /* bInterfaceClass */                 \
+    USB_MTP_SUB_CLASS,             /* bInterfaceSubClass */              \
+    USB_MTP_PROTOCOL,              /* bInterfaceProtocol */              \
+    str_idx,                       /* iInterface */                      \
+    0x07,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_ENDPOINT,  /* bDescriptorType */                 \
+    out_ep,                        /* bEndpointAddress */                \
+    0x02,                          /* bmAttributes */                    \
+    0x40, 0x00,                    /* wMaxPacketSize */                  \
+    0x00,                          /* bInterval */                       \
+    0x07,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_ENDPOINT,  /* bDescriptorType */                 \
+    in_ep,                         /* bEndpointAddress */                \
+    0x02,                          /* bmAttributes */                    \
+    0x40, 0x00,                    /* wMaxPacketSize */                  \
+    0x00,                          /* bInterval */                       \
+    0x07,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_ENDPOINT,  /* bDescriptorType */                 \
+    int_ep,                        /* bEndpointAddress */                \
+    0x03,                          /* bmAttributes */                    \
+    0x1c, 0x00,                    /* wMaxPacketSize */                  \
+    0x06                           /* bInterval */
+#else
+#define MTP_DESCRIPTOR_INIT(bFirstInterface, out_ep, in_ep, int_ep, str_idx) \
+    /* Interface */                                                          \
+    0x09,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_INTERFACE, /* bDescriptorType */                 \
+    bFirstInterface,               /* bInterfaceNumber */                \
+    0x00,                          /* bAlternateSetting */               \
+    0x03,                          /* bNumEndpoints */                   \
+    USB_DEVICE_CLASS_MASS_STORAGE, /* bInterfaceClass */                 \
+    USB_MTP_SUB_CLASS,             /* bInterfaceSubClass */              \
+    USB_MTP_PROTOCOL,              /* bInterfaceProtocol */              \
+    str_idx,                       /* iInterface */                      \
+    0x07,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_ENDPOINT,  /* bDescriptorType */                 \
+    out_ep,                        /* bEndpointAddress */                \
+    0x02,                          /* bmAttributes */                    \
+    0x00, 0x02,                    /* wMaxPacketSize */                  \
+    0x00,                          /* bInterval */                       \
+    0x07,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_ENDPOINT,  /* bDescriptorType */                 \
+    in_ep,                         /* bEndpointAddress */                \
+    0x02,                          /* bmAttributes */                    \
+    0x00, 0x02,                    /* wMaxPacketSize */                  \
+    0x00,                          /* bInterval */                       \
+    0x07,                          /* bLength */                         \
+    USB_DESCRIPTOR_TYPE_ENDPOINT,  /* bDescriptorType */                 \
+    int_ep,                        /* bEndpointAddress */                \
+    0x03,                          /* bmAttributes */                    \
+    0x1c, 0x00,                    /* wMaxPacketSize */                  \
+    0x06                           /* bInterval */
+#endif
+// clang-format on
+
 #endif /* USB_MTP_H */
diff --git a/class/mtp/usbd_mtp.c b/class/mtp/usbd_mtp.c
index 38661e91..adc3e526 100644
--- a/class/mtp/usbd_mtp.c
+++ b/class/mtp/usbd_mtp.c
@@ -5,23 +5,39 @@
  */
 #include "usbd_core.h"
 #include "usbd_mtp.h"
+#include "usbd_mtp_config.h"
 
-struct mtp_cfg_priv {
-    uint8_t device_status;
-} usbd_mtp_cfg;
+/* MTP Stage */
+enum Stage {
+    MTP_READ_COMMAND = 0,
+    MTP_DATA_OUT = 1,
+    MTP_DATA_IN = 2,
+    MTP_SEND_RESPONSE = 3,
+    MTP_WAIT_RESPONSE = 4,
+};
 
-/* max USB packet size */
+USB_NOCACHE_RAM_SECTION struct usbd_mtp {
+    USB_MEM_ALIGNX struct mtp_container_command con_command;
+    USB_MEM_ALIGNX struct mtp_container_data con_data;
+    USB_MEM_ALIGNX struct mtp_container_response con_response;
+    enum Stage stage;
+    uint8_t session_state;
+    uint32_t response_code;
+} g_usbd_mtp;
+
+/* Max USB packet size */
 #ifndef CONFIG_USB_HS
 #define MTP_BULK_EP_MPS 64
 #else
 #define MTP_BULK_EP_MPS 512
 #endif
 
-#define MSD_OUT_EP_IDX 0
-#define MSD_IN_EP_IDX  1
+#define MTP_OUT_EP_IDX 0
+#define MTP_IN_EP_IDX  1
+#define MTP_INT_EP_IDX 2
 
 /* Describe EndPoints configuration */
-static struct usbd_interface mtp_ep_data[2];
+static struct usbd_endpoint mtp_ep_data[3];
 
 static int mtp_class_interface_request_handler(struct usb_setup_packet *setup, uint8_t **data, uint32_t *len)
 {
@@ -51,12 +67,462 @@ static int mtp_class_interface_request_handler(struct usb_setup_packet *setup, u
     return 0;
 }
 
-static void usbd_mtp_bulk_out(uint8_t ep)
+static void usbd_mtp_send_response(uint32_t code)
+{
+    USB_LOG_DBG("Send response\r\n");
+
+    g_usbd_mtp.stage = MTP_WAIT_RESPONSE;
+
+    g_usbd_mtp.con_response.conlen = 12;
+    g_usbd_mtp.con_response.contype = MTP_CONTAINER_TYPE_RESPONSE;
+    g_usbd_mtp.con_response.code = code;
+    g_usbd_mtp.con_response.trans_id = g_usbd_mtp.con_command.trans_id;
+
+    usbd_ep_start_write(mtp_ep_data[MTP_IN_EP_IDX].ep_addr, (uint8_t *)&g_usbd_mtp.con_response, 12);
+}
+
+static void usbd_mtp_send_info(uint8_t *data, uint32_t len)
+{
+    USB_LOG_DBG("Send info\r\n");
+
+    g_usbd_mtp.stage = MTP_SEND_RESPONSE;
+
+    g_usbd_mtp.con_data.conlen = 12 + len;
+    g_usbd_mtp.con_data.contype = MTP_CONTAINER_TYPE_DATA;
+    g_usbd_mtp.con_data.code = MTP_RESPONSE_OK;
+    g_usbd_mtp.con_data.trans_id = g_usbd_mtp.con_command.trans_id;
+
+    memcpy(g_usbd_mtp.con_data.data, data, len);
+    usbd_ep_start_write(mtp_ep_data[MTP_IN_EP_IDX].ep_addr, (uint8_t *)&g_usbd_mtp.con_data, 12 + len);
+}
+
+static void usbd_mtp_get_device_info(void)
+{
+    struct mtp_device_info device_info;
+    uint16_t i;
+
+    device_info.StandardVersion = 100;
+    device_info.VendorExtensionID = 0x06;
+    device_info.VendorExtensionVersion = 100;
+    device_info.VendorExtensionDesc_len = (uint8_t)CONFIG_MTP_VEND_EXT_DESC_LEN;
+
+    for (i = 0; i < CONFIG_MTP_VEND_EXT_DESC_LEN; i++) {
+        device_info.VendorExtensionDesc[i] = VendExtDesc[i];
+    }
+
+    /* device supports one mode , standard mode */
+    device_info.FunctionalMode = 0x0000;
+
+    /* All supported operation */
+    device_info.OperationsSupported_len = CONFIG_MTP_SUPP_OP_LEN;
+    for (i = 0U; i < CONFIG_MTP_SUPP_OP_LEN; i++) {
+        device_info.OperationsSupported[i] = SuppOP[i];
+    }
+
+    /* event that are currently generated by the device*/
+    device_info.EventsSupported_len = CONFIG_MTP_SUPP_EVENTS_LEN;
+
+    for (i = 0U; i < CONFIG_MTP_SUPP_EVENTS_LEN; i++) {
+        device_info.EventsSupported[i] = SuppEvents[i];
+    }
+
+    device_info.DevicePropertiesSupported_len = CONFIG_MTP_SUPP_DEVICE_PROP_LEN;
+
+    for (i = 0U; i < CONFIG_MTP_SUPP_DEVICE_PROP_LEN; i++) {
+        device_info.DevicePropertiesSupported[i] = DevicePropSupp[i];
+    }
+
+    device_info.CaptureFormats_len = CONFIG_MTP_SUPP_CAPT_FORMAT_LEN;
+
+    for (i = 0U; i < CONFIG_MTP_SUPP_CAPT_FORMAT_LEN; i++) {
+        device_info.CaptureFormats[i] = SuppCaptFormat[i];
+    }
+
+    device_info.ImageFormats_len = CONFIG_MTP_SUPP_IMG_FORMAT_LEN; /* number of image formats that are supported by the device*/
+    for (i = 0U; i < CONFIG_MTP_SUPP_IMG_FORMAT_LEN; i++) {
+        device_info.ImageFormats[i] = SuppImgFormat[i];
+    }
+
+    device_info.Manufacturer_len = (uint8_t)CONFIG_MTP_MANUF_LEN;
+    for (i = 0U; i < CONFIG_MTP_MANUF_LEN; i++) {
+        device_info.Manufacturer[i] = Manuf[i];
+    }
+
+    device_info.Model_len = (uint8_t)CONFIG_MTP_MODEL_LEN;
+    for (i = 0U; i < CONFIG_MTP_MODEL_LEN; i++) {
+        device_info.Model[i] = Model[i];
+    }
+
+    device_info.DeviceVersion_len = (uint8_t)CONFIG_MTP_DEVICE_VERSION_LEN;
+    for (i = 0U; i < CONFIG_MTP_DEVICE_VERSION_LEN; i++) {
+        device_info.DeviceVersion[i] = DeviceVers[i];
+    }
+
+    device_info.SerialNumber_len = (uint8_t)CONFIG_MTP_SERIAL_NBR_LEN;
+    for (i = 0U; i < CONFIG_MTP_SERIAL_NBR_LEN; i++) {
+        device_info.SerialNumber[i] = SerialNbr[i];
+    }
+
+    usbd_mtp_send_info((uint8_t *)&device_info, sizeof(struct mtp_device_info));
+}
+
+static void usbd_mtp_open_session(void)
+{
+    usbd_mtp_send_response(MTP_RESPONSE_OK);
+}
+
+static void usbd_mtp_get_storage_ids(void)
+{
+    struct mtp_storage_id storage_id;
+
+    storage_id.StorageIDS_len = CONFIG_MTP_STORAGE_ID_LEN;
+    storage_id.StorageIDS[0] = MTP_STORAGE_ID;
+
+    usbd_mtp_send_info((uint8_t *)&storage_id, sizeof(struct mtp_storage_id));
+}
+
+static void usbd_mtp_get_storage_info(void)
+{
+    struct mtp_storage_info storage_info;
+
+    storage_info.StorageType = MTP_STORAGE_REMOVABLE_RAM;
+    storage_info.FilesystemType = MTP_FILESYSTEM_GENERIC_FLAT;
+    storage_info.AccessCapability = MTP_ACCESS_CAP_RW;
+    storage_info.MaxCapability = 0x0080DFA81A000000;    // todo
+    storage_info.FreeSpaceInBytes = 0x00007EEB0D000000; // todo
+    storage_info.FreeSpaceInObjects = 0xFFFFFFFFU;      /* not used */
+    storage_info.StorageDescription = 0U;
+    storage_info.VolumeLabel = 0U;
+
+    usbd_mtp_send_info((uint8_t *)&storage_info, sizeof(struct mtp_storage_info));
+}
+
+static void usbd_mtp_get_object_handles(void)
+{
+    struct mtp_object_handle object_handle;
+
+    // todo
+
+    usbd_mtp_send_info((uint8_t *)&object_handle, sizeof(struct mtp_object_handle));
+}
+
+static void usbd_mtp_get_object_info(void)
+{
+    struct mtp_object_info object_info;
+
+    object_info.Storage_id = MTP_STORAGE_ID;
+    object_info.ObjectFormat = 0;         // todo
+    object_info.ObjectCompressedSize = 0; //todo
+    object_info.ProtectionStatus = 0U;
+    object_info.ThumbFormat = MTP_OBJ_FORMAT_UNDEFINED;
+    object_info.ThumbCompressedSize = 0U;
+    object_info.ThumbPixWidth = 0U; /* not supported or not an image */
+    object_info.ThumbPixHeight = 0U;
+    object_info.ImagePixWidth = 0U;
+    object_info.ImagePixHeight = 0U;
+    object_info.ImageBitDepth = 0U;
+    object_info.ParentObject = 0; // todo
+    object_info.AssociationType = 0U;
+    object_info.AssociationDesc = 0U;
+    object_info.SequenceNumber = 0U;
+
+    /* we have to get this value before object_info.Filename */
+    object_info.Filename_len = sizeof(DefaultFileName);
+    memcpy(object_info.Filename, DefaultFileName, (uint32_t)object_info.Filename_len + 1U);
+
+    object_info.CaptureDate = 0U;
+    object_info.ModificationDate = 0U;
+    object_info.Keywords = 0U;
+
+    usbd_mtp_send_info((uint8_t *)&object_info, sizeof(struct mtp_object_info));
+}
+
+static void usbd_mtp_get_object_prop_desc(void)
+{
+    struct mtp_object_prop_desc object_prop_desc;
+
+    uint16_t undef_format = MTP_OBJ_FORMAT_UNDEFINED;
+    uint32_t storageid = MTP_STORAGE_ID;
+
+    switch (g_usbd_mtp.con_command.param1) /* switch obj prop code */
+    {
+        case MTP_OB_PROP_OBJECT_FORMAT:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_UINT16;
+            object_prop_desc.GetSet = MTP_PROP_GET;
+            object_prop_desc.DefValue = (uint8_t *)&undef_format;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        case MTP_OB_PROP_STORAGE_ID:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_UINT32;
+            object_prop_desc.GetSet = MTP_PROP_GET;
+            object_prop_desc.DefValue = (uint8_t *)&storageid;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        case MTP_OB_PROP_OBJ_FILE_NAME:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_STR;
+            object_prop_desc.GetSet = MTP_PROP_GET;
+            object_prop_desc.DefValue = 0U;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        case MTP_OB_PROP_PARENT_OBJECT:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_STR;
+            object_prop_desc.GetSet = MTP_PROP_GET;
+            object_prop_desc.DefValue = 0U;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        case MTP_OB_PROP_OBJECT_SIZE:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_UINT64;
+            object_prop_desc.GetSet = MTP_PROP_GET;
+            object_prop_desc.DefValue = 0U;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        case MTP_OB_PROP_NAME:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_STR;
+            object_prop_desc.GetSet = MTP_PROP_GET;
+            object_prop_desc.DefValue = NULL;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        case MTP_OB_PROP_PERS_UNIQ_OBJ_IDEN:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_UINT128;
+            object_prop_desc.GetSet = MTP_PROP_GET;
+            object_prop_desc.DefValue = 0U;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        case MTP_OB_PROP_PROTECTION_STATUS:
+            object_prop_desc.ObjectPropertyCode = (uint16_t)(g_usbd_mtp.con_command.param1);
+            object_prop_desc.DataType = MTP_DATATYPE_UINT16;
+            object_prop_desc.GetSet = MTP_PROP_GET_SET;
+            object_prop_desc.DefValue = 0U;
+            object_prop_desc.GroupCode = 0U;
+            object_prop_desc.FormFlag = 0U;
+            break;
+
+        default:
+            break;
+    }
+    // todo
+    usbd_mtp_send_info((uint8_t *)&object_prop_desc, sizeof(struct mtp_object_prop_desc));
+}
+
+static void usbd_mtp_get_object_props_supported(void)
+{
+    struct mtp_object_props_support object_props_support;
+    uint32_t i;
+
+    object_props_support.ObjectPropCode_len = CONFIG_MTP_SUPP_OBJ_PROP_LEN;
+
+    for (i = 0U; i < CONFIG_MTP_SUPP_OBJ_PROP_LEN; i++) {
+        object_props_support.ObjectPropCode[i] = ObjectPropCode[i];
+    }
+    usbd_mtp_send_info((uint8_t *)&object_props_support, sizeof(struct mtp_object_props_support));
+}
+
+static void usbd_mtp_get_object_prop_list(void)
+{
+    struct mtp_object_prop_list object_prop_list;
+
+    uint16_t filename[255];
+    uint32_t storageid = MTP_STORAGE_ID;
+    uint32_t default_val = 0U;
+    uint32_t i;
+    uint16_t format;
+    uint64_t objsize;
+    uint32_t parent_proval;
+
+    object_prop_list.Properties_len = CONFIG_MTP_SUPP_OBJ_PROP_LEN;
+
+    for (i = 0U; i < CONFIG_MTP_SUPP_OBJ_PROP_LEN; i++) {
+        object_prop_list.Properties[i].ObjectHandle = g_usbd_mtp.con_command.param1;
+
+        switch (ObjectPropCode[i]) {
+            case MTP_OB_PROP_STORAGE_ID:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_STORAGE_ID;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_UINT32;
+                object_prop_list.Properties[i].propval = (uint8_t *)&storageid;
+                break;
+
+            case MTP_OB_PROP_OBJECT_FORMAT:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_OBJECT_FORMAT;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_UINT16;
+                object_prop_list.Properties[i].propval = (uint8_t *)&format;
+                break;
+
+            case MTP_OB_PROP_OBJ_FILE_NAME:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_OBJ_FILE_NAME;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_STR;
+                object_prop_list.Properties[i].propval = NULL;
+                break;
+
+            case MTP_OB_PROP_PARENT_OBJECT:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_PARENT_OBJECT;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_UINT32;
+                object_prop_list.Properties[i].propval = (uint8_t *)&parent_proval;
+                break;
+
+            case MTP_OB_PROP_OBJECT_SIZE:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_OBJECT_SIZE;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_UINT64;
+                object_prop_list.Properties[i].propval = (uint8_t *)&objsize;
+                break;
+
+            case MTP_OB_PROP_NAME:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_NAME;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_STR;
+                object_prop_list.Properties[i].propval = NULL;
+                break;
+
+            case MTP_OB_PROP_PERS_UNIQ_OBJ_IDEN:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_PERS_UNIQ_OBJ_IDEN;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_UINT128;
+                object_prop_list.Properties[i].propval = (uint8_t *)&g_usbd_mtp.con_command.param1;
+                break;
+
+            case MTP_OB_PROP_PROTECTION_STATUS:
+                object_prop_list.Properties[i].PropertyCode = MTP_OB_PROP_PROTECTION_STATUS;
+                object_prop_list.Properties[i].Datatype = MTP_DATATYPE_UINT16;
+                object_prop_list.Properties[i].propval = (uint8_t *)&default_val;
+                break;
+
+            default:
+                break;
+        }
+    }
+    // todo
+    usbd_mtp_send_info((uint8_t *)&object_prop_list, sizeof(struct mtp_object_prop_list));
+}
+
+static void usbd_mtp_get_device_prop_desc(void)
+{
+    struct mtp_device_prop_desc device_prop_desc;
+    uint32_t i;
+
+    device_prop_desc.DevicePropertyCode = MTP_DEV_PROP_DEVICE_FRIENDLY_NAME;
+    device_prop_desc.DataType = MTP_DATATYPE_STR;
+    device_prop_desc.GetSet = MTP_PROP_GET_SET;
+    device_prop_desc.DefaultValue_len = CONFIG_MTP_DEVICE_PROP_DESC_DEF_LEN;
+
+    for (i = 0U; i < (sizeof(DevicePropDefVal) / 2U); i++) {
+        device_prop_desc.DefaultValue[i] = DevicePropDefVal[i];
+    }
+
+    device_prop_desc.CurrentValue_len = CONFIG_MTP_DEVICE_PROP_DESC_CUR_LEN;
+
+    for (i = 0U; i < (sizeof(DevicePropCurDefVal) / 2U); i++) {
+        device_prop_desc.CurrentValue[i] = DevicePropCurDefVal[i];
+    }
+
+    device_prop_desc.FormFlag = 0U;
+
+    usbd_mtp_send_info((uint8_t *)&device_prop_desc, sizeof(struct mtp_device_prop_desc));
+}
+
+static int usbd_mtp_decode_command(struct mtp_container_command *command)
+{
+    printf("code:%04x\r\n", command->code);
+    switch (command->code) {
+        case MTP_OP_GET_DEVICE_INFO:
+            usbd_mtp_get_device_info();
+            break;
+        case MTP_OP_OPEN_SESSION:
+            usbd_mtp_open_session();
+            break;
+        case MTP_OP_CLOSE_SESSION:
+            break;
+        case MTP_OP_GET_STORAGE_IDS:
+            usbd_mtp_get_storage_ids();
+            break;
+        case MTP_OP_GET_STORAGE_INFO:
+            usbd_mtp_get_storage_info();
+            break;
+        case MTP_OP_GET_OBJECT_HANDLES:
+            usbd_mtp_get_object_handles();
+            break;
+        case MTP_OP_GET_OBJECT_INFO:
+            usbd_mtp_get_object_info();
+            break;
+        case MTP_OP_GET_OBJECT_PROP_REFERENCES:
+            break;
+        case MTP_OP_GET_OBJECT_PROPS_SUPPORTED:
+            usbd_mtp_get_object_props_supported();
+            break;
+        case MTP_OP_GET_OBJECT_PROP_DESC:
+            usbd_mtp_get_object_prop_desc();
+            break;
+        case MTP_OP_GET_OBJECT_PROPLIST:
+            usbd_mtp_get_object_prop_list();
+            break;
+        case MTP_OP_GET_OBJECT_PROP_VALUE:
+            break;
+        case MTP_OP_GET_DEVICE_PROP_DESC:
+            usbd_mtp_get_device_prop_desc();
+            break;
+        case MTP_OP_GET_OBJECT:
+            break;
+        case MTP_OP_SEND_OBJECT_INFO:
+            break;
+        case MTP_OP_SEND_OBJECT:
+            break;
+        case MTP_OP_DELETE_OBJECT:
+            break;
+
+        default:
+            break;
+    }
+    return 0;
+}
+
+static void usbd_mtp_bulk_out(uint8_t ep, uint32_t nbytes)
 {
+    switch (g_usbd_mtp.stage) {
+        case MTP_READ_COMMAND:
+            usbd_mtp_decode_command(&g_usbd_mtp.con_command);
+            break;
+        case MTP_DATA_OUT:
+            break;
+        default:
+            break;
+    }
 }
 
-static void usbd_mtp_bulk_in(uint8_t ep)
+static void usbd_mtp_bulk_in(uint8_t ep, uint32_t nbytes)
 {
+    printf("send:%d\r\n", nbytes);
+    switch (g_usbd_mtp.stage) {
+        case MTP_DATA_IN:
+            break;
+        case MTP_SEND_RESPONSE:
+            usbd_mtp_send_response(MTP_RESPONSE_OK);
+            break;
+        case MTP_WAIT_RESPONSE:
+            USB_LOG_DBG("Start reading command\r\n");
+            g_usbd_mtp.stage = MTP_READ_COMMAND;
+            usbd_ep_start_read(mtp_ep_data[MTP_OUT_EP_IDX].ep_addr, (uint8_t *)&g_usbd_mtp.con_command, MTP_BULK_EP_MPS);
+            break;
+
+        default:
+            break;
+    }
 }
 
 static void mtp_notify_handler(uint8_t event, void *arg)
@@ -64,8 +530,37 @@ static void mtp_notify_handler(uint8_t event, void *arg)
     switch (event) {
         case USBD_EVENT_RESET:
             break;
+        case USBD_EVENT_CONFIGURED:
+            USB_LOG_DBG("Start reading command\r\n");
+            g_usbd_mtp.stage = MTP_READ_COMMAND;
+            usbd_ep_start_read(mtp_ep_data[MTP_OUT_EP_IDX].ep_addr, (uint8_t *)&g_usbd_mtp.con_command, MTP_BULK_EP_MPS);
+            break;
 
         default:
             break;
     }
+}
+
+struct usbd_interface *usbd_mtp_init_intf(struct usbd_interface *intf,
+                                          const uint8_t out_ep,
+                                          const uint8_t in_ep,
+                                          const uint8_t int_ep)
+{
+    intf->class_interface_handler = mtp_class_interface_request_handler;
+    intf->class_endpoint_handler = NULL;
+    intf->vendor_handler = NULL;
+    intf->notify_handler = mtp_notify_handler;
+
+    mtp_ep_data[MTP_OUT_EP_IDX].ep_addr = out_ep;
+    mtp_ep_data[MTP_OUT_EP_IDX].ep_cb = usbd_mtp_bulk_out;
+    mtp_ep_data[MTP_IN_EP_IDX].ep_addr = in_ep;
+    mtp_ep_data[MTP_IN_EP_IDX].ep_cb = usbd_mtp_bulk_in;
+    mtp_ep_data[MTP_INT_EP_IDX].ep_addr = int_ep;
+    mtp_ep_data[MTP_INT_EP_IDX].ep_cb = NULL;
+
+    usbd_add_endpoint(&mtp_ep_data[MTP_OUT_EP_IDX]);
+    usbd_add_endpoint(&mtp_ep_data[MTP_IN_EP_IDX]);
+    usbd_add_endpoint(&mtp_ep_data[MTP_INT_EP_IDX]);
+
+    return intf;
 }
\ No newline at end of file
diff --git a/class/mtp/usbd_mtp.h b/class/mtp/usbd_mtp.h
index 7162141c..2e1854d2 100644
--- a/class/mtp/usbd_mtp.h
+++ b/class/mtp/usbd_mtp.h
@@ -12,6 +12,11 @@
 extern "C" {
 #endif
 
+struct usbd_interface *usbd_mtp_init_intf(struct usbd_interface *intf,
+                                          const uint8_t out_ep,
+                                          const uint8_t in_ep,
+                                          const uint8_t int_ep);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/class/mtp/usbd_mtp_config.h b/class/mtp/usbd_mtp_config.h
new file mode 100644
index 00000000..6c5e6eaf
--- /dev/null
+++ b/class/mtp/usbd_mtp_config.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2022, sakumisu
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef USB_MTP_CONFIG_H
+#define USB_MTP_CONFIG_H
+
+#include "usb_mtp.h"
+
+static const uint16_t VendExtDesc[] = { 'm', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '.', 'c', 'o', 'm', ':', ' ', '1', '.', '0', ';', ' ', 0 }; /* last 2 bytes must be 0*/
+
+static const uint16_t SuppOP[] = { MTP_OP_GET_DEVICE_INFO, MTP_OP_OPEN_SESSION, MTP_OP_CLOSE_SESSION,
+                                   MTP_OP_GET_STORAGE_IDS, MTP_OP_GET_STORAGE_INFO, MTP_OP_GET_NUM_OBJECTS,
+                                   MTP_OP_GET_OBJECT_HANDLES, MTP_OP_GET_OBJECT_INFO, MTP_OP_GET_OBJECT,
+                                   MTP_OP_DELETE_OBJECT, MTP_OP_SEND_OBJECT_INFO, MTP_OP_SEND_OBJECT,
+                                   MTP_OP_GET_DEVICE_PROP_DESC, MTP_OP_GET_DEVICE_PROP_VALUE,
+                                   MTP_OP_SET_OBJECT_PROP_VALUE, MTP_OP_GET_OBJECT_PROP_VALUE,
+                                   MTP_OP_GET_OBJECT_PROPS_SUPPORTED, MTP_OP_GET_OBJECT_PROPLIST,
+                                   MTP_OP_GET_OBJECT_PROP_DESC, MTP_OP_GET_OBJECT_PROP_REFERENCES };
+
+static const uint16_t SuppEvents[] = { MTP_EVENT_OBJECTADDED };
+
+static const uint16_t DevicePropSupp[] = { MTP_DEV_PROP_DEVICE_FRIENDLY_NAME, MTP_DEV_PROP_BATTERY_LEVEL };
+
+static const uint16_t SuppCaptFormat[] = { MTP_OBJ_FORMAT_UNDEFINED, MTP_OBJ_FORMAT_ASSOCIATION, MTP_OBJ_FORMAT_TEXT };
+
+static const uint16_t SuppImgFormat[] = { MTP_OBJ_FORMAT_UNDEFINED, MTP_OBJ_FORMAT_TEXT, MTP_OBJ_FORMAT_ASSOCIATION,
+                                          MTP_OBJ_FORMAT_EXECUTABLE, MTP_OBJ_FORMAT_WAV, MTP_OBJ_FORMAT_MP3,
+                                          MTP_OBJ_FORMAT_EXIF_JPEG, MTP_OBJ_FORMAT_MPEG, MTP_OBJ_FORMAT_MP4_CONTAINER,
+                                          MTP_OBJ_FORMAT_WINDOWS_IMAGE_FORMAT, MTP_OBJ_FORMAT_PNG, MTP_OBJ_FORMAT_WMA,
+                                          MTP_OBJ_FORMAT_WMV };
+
+static const uint16_t Manuf[] = { 'C', 'h', 'e', 'r', 'r', 'y', 'U', 'S', 'B', 0 }; /* last 2 bytes must be 0*/
+static const uint16_t Model[] = { 'C', 'h', 'e', 'r', 'r', 'y', 'U', 'S', 'B', 0 }; /* last 2 bytes must be 0*/
+static const uint16_t DeviceVers[] = { 'V', '1', '.', '0', '0', 0 };                /* last 2 bytes must be 0*/
+/*SerialNbr shall be 32 character hexadecimal string for legacy compatibility reasons */
+static const uint16_t SerialNbr[] = { '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0',
+                                      '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0',
+                                      '0', '1', '0', '0', 0 }; /* last 2 bytes must be 0*/
+
+static const uint16_t DefaultFileName[] = { 'N', 'e', 'w', ' ', 'F', 'o', 'l', 'd', 'e', 'r', 0 };
+
+static const uint16_t DevicePropDefVal[] = { 'C', 'h', 'e', 'r', 'r', 'y', 'U', 'S', 'B', 0 }; /* last 2 bytes must be 0*/
+static const uint16_t DevicePropCurDefVal[] = { 'C', 'h', 'e', 'r', 'r', 'y', 'U', 'S', 'B', 0 };
+
+/* required for all object format : storageID, objectFormat, ObjectCompressedSize,
+persistent unique object identifier, name*/
+static const uint16_t ObjectPropCode[] = { MTP_OB_PROP_STORAGE_ID, MTP_OB_PROP_OBJECT_FORMAT, MTP_OB_PROP_OBJECT_SIZE,
+                                           MTP_OB_PROP_OBJ_FILE_NAME, MTP_OB_PROP_PARENT_OBJECT, MTP_OB_PROP_NAME,
+                                           MTP_OB_PROP_PERS_UNIQ_OBJ_IDEN, MTP_OB_PROP_PROTECTION_STATUS };
+
+#define MTP_STORAGE_ID 0x00010001U /* SD card is inserted*/
+
+#define CONFIG_MTP_VEND_EXT_DESC_LEN        (sizeof(VendExtDesc) / 2U)
+#define CONFIG_MTP_SUPP_OP_LEN              (sizeof(SuppOP) / 2U)
+#define CONFIG_MTP_SUPP_EVENTS_LEN          (sizeof(SuppEvents) / 2U)
+#define CONFIG_MTP_SUPP_DEVICE_PROP_LEN     (sizeof(DevicePropSupp) / 2U)
+#define CONFIG_MTP_SUPP_CAPT_FORMAT_LEN     (sizeof(SuppCaptFormat) / 2U)
+#define CONFIG_MTP_SUPP_IMG_FORMAT_LEN      (sizeof(SuppImgFormat) / 2U)
+#define CONFIG_MTP_MANUF_LEN                (sizeof(Manuf) / 2U)
+#define CONFIG_MTP_MODEL_LEN                (sizeof(Model) / 2U)
+#define CONFIG_MTP_DEVICE_VERSION_LEN       (sizeof(DeviceVers) / 2U)
+#define CONFIG_MTP_SERIAL_NBR_LEN           (sizeof(SerialNbr) / 2U)
+#define CONFIG_MTP_SUPP_OBJ_PROP_LEN        (sizeof(ObjectPropCode) / 2U)
+#define CONFIG_MTP_DEVICE_PROP_DESC_DEF_LEN (sizeof(DevicePropDefVal) / 2U)
+#define CONFIG_MTP_DEVICE_PROP_DESC_CUR_LEN (sizeof(DevicePropCurDefVal) / 2U)
+#define CONFIG_MTP_STORAGE_ID_LEN           1
+#define CONFIG_MTP_OBJECT_HANDLE_LEN        100
+
+struct mtp_device_info {
+    uint16_t StandardVersion;
+    uint32_t VendorExtensionID;
+    uint16_t VendorExtensionVersion;
+    uint8_t VendorExtensionDesc_len;
+    uint16_t VendorExtensionDesc[CONFIG_MTP_VEND_EXT_DESC_LEN];
+    uint16_t FunctionalMode;
+    uint32_t OperationsSupported_len;
+    uint16_t OperationsSupported[CONFIG_MTP_SUPP_OP_LEN];
+    uint32_t EventsSupported_len;
+    uint16_t EventsSupported[CONFIG_MTP_SUPP_EVENTS_LEN];
+    uint32_t DevicePropertiesSupported_len;
+    uint16_t DevicePropertiesSupported[CONFIG_MTP_SUPP_DEVICE_PROP_LEN];
+    uint32_t CaptureFormats_len;
+    uint16_t CaptureFormats[CONFIG_MTP_SUPP_CAPT_FORMAT_LEN];
+    uint32_t ImageFormats_len;
+    uint16_t ImageFormats[CONFIG_MTP_SUPP_IMG_FORMAT_LEN];
+    uint8_t Manufacturer_len;
+    uint16_t Manufacturer[CONFIG_MTP_MANUF_LEN];
+    uint8_t Model_len;
+    uint16_t Model[CONFIG_MTP_MODEL_LEN];
+    uint8_t DeviceVersion_len;
+    uint16_t DeviceVersion[CONFIG_MTP_DEVICE_VERSION_LEN];
+    uint8_t SerialNumber_len;
+    uint16_t SerialNumber[CONFIG_MTP_SERIAL_NBR_LEN];
+} __PACKED;
+
+struct mtp_object_props_support {
+    uint32_t ObjectPropCode_len;
+    uint16_t ObjectPropCode[CONFIG_MTP_SUPP_OBJ_PROP_LEN];
+} __PACKED;
+
+struct mtp_device_prop_desc {
+    uint16_t DevicePropertyCode;
+    uint16_t DataType;
+    uint8_t GetSet;
+    uint8_t DefaultValue_len;
+    uint16_t DefaultValue[CONFIG_MTP_DEVICE_PROP_DESC_DEF_LEN];
+    uint8_t CurrentValue_len;
+    uint16_t CurrentValue[CONFIG_MTP_DEVICE_PROP_DESC_CUR_LEN];
+    uint8_t FormFlag;
+} __PACKED;
+
+struct mtp_storage_id {
+    uint32_t StorageIDS_len;
+    uint32_t StorageIDS[CONFIG_MTP_STORAGE_ID_LEN];
+} __PACKED;
+
+struct mtp_storage_info {
+    uint16_t StorageType;
+    uint16_t FilesystemType;
+    uint16_t AccessCapability;
+    uint64_t MaxCapability;
+    uint64_t FreeSpaceInBytes;
+    uint32_t FreeSpaceInObjects;
+    uint8_t StorageDescription;
+    uint8_t VolumeLabel;
+} __PACKED;
+
+struct mtp_object_handle {
+    uint32_t ObjectHandle_len;
+    uint32_t ObjectHandle[CONFIG_MTP_OBJECT_HANDLE_LEN];
+} __PACKED;
+
+struct mtp_object_info {
+    uint32_t Storage_id;
+    uint16_t ObjectFormat;
+    uint16_t ProtectionStatus;
+    uint32_t ObjectCompressedSize;
+    uint16_t ThumbFormat;
+    uint32_t ThumbCompressedSize;
+    uint32_t ThumbPixWidth;
+    uint32_t ThumbPixHeight;
+    uint32_t ImagePixWidth;
+    uint32_t ImagePixHeight;
+    uint32_t ImageBitDepth;
+    uint32_t ParentObject;
+    uint16_t AssociationType;
+    uint32_t AssociationDesc;
+    uint32_t SequenceNumber;
+    uint8_t Filename_len;
+    uint16_t Filename[255];
+    uint32_t CaptureDate;
+    uint32_t ModificationDate;
+    uint8_t Keywords;
+} __PACKED;
+
+struct mtp_object_prop_desc {
+    uint16_t ObjectPropertyCode;
+    uint16_t DataType;
+    uint8_t GetSet;
+    uint8_t *DefValue;
+    uint32_t GroupCode;
+    uint8_t FormFlag;
+} __PACKED;
+
+struct mtp_object_prop_element {
+    uint32_t ObjectHandle;
+    uint16_t PropertyCode;
+    uint16_t Datatype;
+    uint8_t *propval;
+} __PACKED;
+
+struct mtp_object_prop_list {
+    uint32_t Properties_len;
+    struct mtp_object_prop_element Properties[CONFIG_MTP_SUPP_OBJ_PROP_LEN];
+} __PACKED;
+
+#endif /* USB_MTP_CONFIG_H */
\ No newline at end of file