From f398577b5c9673c05e6dce30878aa1cac5351b0a Mon Sep 17 00:00:00 2001 From: Hyunki Koo Date: Fri, 21 May 2021 15:59:44 +0900 Subject: [PATCH] change name 11110000.usb to 11210000.usb Bug: 188672439 Signed-off-by: Pat Tjin Signed-off-by: Hyunki Koo Change-Id: I61c874ab37c7a1f9288843dbbba2781dee7ecf1e --- conf/fstab.gs201 | 2 +- conf/init.recovery.device.rc | 2 +- usb/Usb.h | 4 ++-- usb/UsbGadget.h | 4 ++-- usb/android.hardware.usb@1.3-service.gs201.rc | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conf/fstab.gs201 b/conf/fstab.gs201 index 2b0e8af2..ff4cf2bb 100644 --- a/conf/fstab.gs201 +++ b/conf/fstab.gs201 @@ -19,4 +19,4 @@ vendor_dlkm /vendor_dlkm /dev/block/platform/14700000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount /dev/block/platform/14700000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,atgc,checkpoint_merge latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=::inlinecrypt_optimized+wrappedkey_v0,metadata_encryption=:wrappedkey_v0,keydirectory=/metadata/vold/metadata_encryption,fscompress,readahead_size_kb=128 /dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8,zram_backingdev_size=512M -/devices/platform/11110000.usb* auto vfat defaults voldmanaged=usb:auto +/devices/platform/11210000.usb* auto vfat defaults voldmanaged=usb:auto diff --git a/conf/init.recovery.device.rc b/conf/init.recovery.device.rc index 08043f18..29cbff15 100644 --- a/conf/init.recovery.device.rc +++ b/conf/init.recovery.device.rc @@ -1,5 +1,5 @@ on init - setprop sys.usb.controller "11110000.dwc3" + setprop sys.usb.controller "11210000.dwc3" setprop sys.usb.configfs 1 on init && property:ro.debuggable=1 && property:ro.boot.mode=recovery diff --git a/usb/Usb.h b/usb/Usb.h index 69bf1caa..de1f3b82 100644 --- a/usb/Usb.h +++ b/usb/Usb.h @@ -66,8 +66,8 @@ enum class HALVersion{ V1_3 }; -constexpr char kGadgetName[] = "11110000.dwc3"; -#define UDC_PATH "/sys/class/udc/11110000.dwc3/" +constexpr char kGadgetName[] = "11210000.dwc3"; +#define UDC_PATH "/sys/class/udc/11210000.dwc3/" #define ID_PATH UDC_PATH "device/id" #define VBUS_PATH UDC_PATH "device/b_sess" diff --git a/usb/UsbGadget.h b/usb/UsbGadget.h index e3eb3b4e..df09c0f1 100644 --- a/usb/UsbGadget.h +++ b/usb/UsbGadget.h @@ -70,9 +70,9 @@ using ::android::hardware::usb::gadget::V1_2::IUsbGadget; using ::android::hardware::usb::gadget::V1_2::GadgetFunction; using ::std::string; -constexpr char kGadgetName[] = "11110000.dwc3"; +constexpr char kGadgetName[] = "11210000.dwc3"; #ifndef UDC_PATH -#define UDC_PATH "/sys/class/udc/11110000.dwc3/" +#define UDC_PATH "/sys/class/udc/11210000.dwc3/" #endif constexpr char kExtconUsbState[] = "/sys/class/extcon/extcon0/cable.0/state"; static MonitorFfs monitorFfs(kGadgetName, kExtconUsbState); diff --git a/usb/android.hardware.usb@1.3-service.gs201.rc b/usb/android.hardware.usb@1.3-service.gs201.rc index 8a66f584..64934d64 100644 --- a/usb/android.hardware.usb@1.3-service.gs201.rc +++ b/usb/android.hardware.usb@1.3-service.gs201.rc @@ -9,15 +9,15 @@ on post-fs chown root system /sys/class/typec/port0/port_type chown root system /sys/devices/platform/10d50000.hsi2c/i2c-5/i2c-max77759tcpc/contaminant_detection chown root system /sys/devices/platform/10d50000.hsi2c/i2c-6/i2c-max77759tcpc/contaminant_detection - chown root system /sys/class/udc/11110000.usb/device/b_sess - chown root system /sys/class/udc/11110000.usb/device/id - chown root system /sys/class/udc/11110000.usb/device/usb_data_enabled + chown root system /sys/class/udc/11210000.usb/device/b_sess + chown root system /sys/class/udc/11210000.usb/device/id + chown root system /sys/class/udc/11210000.usb/device/usb_data_enabled chmod 664 /sys/class/typec/port0/power_role chmod 664 /sys/class/typec/port0/data_role chmod 664 /sys/class/typec/port0/port_type - chmod 664 /sys/class/udc/11110000.usb/device/b_sess - chmod 664 /sys/class/udc/11110000.usb/device/id - chmod 664 /sys/class/udc/11110000.usb/device/usb_data_enabled + chmod 664 /sys/class/udc/11210000.usb/device/b_sess + chmod 664 /sys/class/udc/11210000.usb/device/id + chmod 664 /sys/class/udc/11210000.usb/device/usb_data_enabled on property:vendor.usb.functions.ready=1 chown system system /config/usb_gadget/