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

Commit 397d2949 authored by Alessandro Astone's avatar Alessandro Astone
Browse files

fastbootd: hacks for legacy 

 * Use different endpoint addresses for sinks and sources
 * Consider locked only explicitely `green` devices

Change-Id: If093556e8e839cadf29f9e8f995f09ed3f188ed1
parent 8b3311d7

fastboot/device/usb_client.cpp

+43 −3
Original line number Diff line number Diff line
@@ -156,6 +156,46 @@ static struct SsFuncDesc ss_descriptors = { 
                },

};



static struct FuncDesc fs_descriptors_v1 = {

        .intf = fastboot_interface,

        .source =

                {

                        .bLength = sizeof(fs_descriptors_v1.source),

                        .bDescriptorType = USB_DT_ENDPOINT,

                        .bEndpointAddress = 1 | USB_DIR_OUT,

                        .bmAttributes = USB_ENDPOINT_XFER_BULK,

                        .wMaxPacketSize = kMaxPacketSizeFs,

                },

        .sink =

                {

                        .bLength = sizeof(fs_descriptors_v1.sink),

                        .bDescriptorType = USB_DT_ENDPOINT,

                        .bEndpointAddress = 2 | USB_DIR_IN,

                        .bmAttributes = USB_ENDPOINT_XFER_BULK,

                        .wMaxPacketSize = kMaxPacketSizeFs,

                },

};



static struct FuncDesc hs_descriptors_v1 = {

        .intf = fastboot_interface,

        .source =

                {

                        .bLength = sizeof(hs_descriptors_v1.source),

                        .bDescriptorType = USB_DT_ENDPOINT,

                        .bEndpointAddress = 1 | USB_DIR_OUT,

                        .bmAttributes = USB_ENDPOINT_XFER_BULK,

                        .wMaxPacketSize = kMaxPacketSizeHs,

                },

        .sink =

                {

                        .bLength = sizeof(hs_descriptors_v1.sink),

                        .bDescriptorType = USB_DT_ENDPOINT,

                        .bEndpointAddress = 2 | USB_DIR_IN,

                        .bmAttributes = USB_ENDPOINT_XFER_BULK,

                        .wMaxPacketSize = kMaxPacketSizeHs,

                },

};



#define STR_INTERFACE_ "fastboot"



static const struct {
@@ -186,8 +226,8 @@ static struct DescV1 v1_descriptor = { 
            .fs_count = 3,

            .hs_count = 3,

        },

        .fs_descs = fs_descriptors,

        .hs_descs = hs_descriptors,

        .fs_descs = fs_descriptors_v1,

        .hs_descs = hs_descriptors_v1,

};



static struct DescV2 v2_descriptor = {
@@ -226,7 +266,7 @@ static bool InitFunctionFs(usb_handle* h) { 


        auto ret = write(h->control.get(), &v2_descriptor, sizeof(v2_descriptor));

        if (ret < 0) {

            // fallback to v1 descriptor

            // fallback to v1 descriptor, with different endpoint addresses for source and sink

            ret = write(h->control.get(), &v1_descriptor, sizeof(v1_descriptor));

            if (ret < 0) {

                PLOG(ERROR) << "cannot write descriptors " << kUsbFfsFastbootEp0;

fastboot/device/utility.cpp

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ bool GetDeviceLockStatus() { 
    if (!android::base::ReadFileToString("/proc/cmdline", &cmdline)) {

        return true;

    }

    return cmdline.find("androidboot.verifiedbootstate=orange") == std::string::npos;

    return cmdline.find("androidboot.verifiedbootstate=green") != std::string::npos;

}



bool UpdateAllPartitionMetadata(FastbootDevice* device, const std::string& super_name,