Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 159158c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add MTP and PTP OS descriptors."

parents 69d60c13 51bf9853

media/mtp/MtpFfsHandle.cpp

+32 −1
Original line number Diff line number Diff line
@@ -94,8 +94,11 @@ struct desc_v2 { 
    __le32 fs_count;

    __le32 hs_count;

    __le32 ss_count;

    __le32 os_count;

    struct func_desc fs_descs, hs_descs;

    struct ss_func_desc ss_descs;

    struct usb_os_desc_header os_header;

    struct usb_ext_compat_desc os_desc;

} __attribute__((packed));



const struct usb_interface_descriptor mtp_interface_desc = {
@@ -261,6 +264,31 @@ const struct { 
    },

};



struct usb_os_desc_header mtp_os_desc_header = {

    .interface = htole32(1),

    .dwLength = htole32(sizeof(usb_os_desc_header) + sizeof(usb_ext_compat_desc)),

    .bcdVersion = htole16(1),

    .wIndex = htole16(4),

    .bCount = htole16(1),

    .Reserved = htole16(0),

};



struct usb_ext_compat_desc mtp_os_desc_compat = {

    .bFirstInterfaceNumber = 0,

    .Reserved1 = htole32(1),

    .CompatibleID = { 'M', 'T', 'P' },

    .SubCompatibleID = {0},

    .Reserved2 = {0},

};



struct usb_ext_compat_desc ptp_os_desc_compat = {

    .bFirstInterfaceNumber = 0,

    .Reserved1 = htole32(1),

    .CompatibleID = { 'P', 'T', 'P' },

    .SubCompatibleID = {0},

    .Reserved2 = {0},

};



struct mtp_device_status {

    uint16_t  wLength;

    uint16_t  wCode;
@@ -336,13 +364,16 @@ bool MtpFfsHandle::initFunctionfs() { 
    v2_descriptor.header.magic = htole32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2);

    v2_descriptor.header.length = htole32(sizeof(v2_descriptor));

    v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC |

                                 FUNCTIONFS_HAS_SS_DESC;

                                 FUNCTIONFS_HAS_SS_DESC | FUNCTIONFS_HAS_MS_OS_DESC;

    v2_descriptor.fs_count = 4;

    v2_descriptor.hs_count = 4;

    v2_descriptor.ss_count = 7;

    v2_descriptor.os_count = 1;

    v2_descriptor.fs_descs = mPtp ? ptp_fs_descriptors : mtp_fs_descriptors;

    v2_descriptor.hs_descs = mPtp ? ptp_hs_descriptors : mtp_hs_descriptors;

    v2_descriptor.ss_descs = mPtp ? ptp_ss_descriptors : mtp_ss_descriptors;

    v2_descriptor.os_header = mtp_os_desc_header;

    v2_descriptor.os_desc = mPtp ? ptp_os_desc_compat : mtp_os_desc_compat;



    if (mControl < 0) { // might have already done this before

        mControl.reset(TEMP_FAILURE_RETRY(open(FFS_MTP_EP0, O_RDWR)));