From 4b12a3f56b5a2e066843267ed9d66fbbf5c1b8b9 Mon Sep 17 00:00:00 2001 From: someone5678 Date: Sat, 8 Jun 2024 22:59:05 +0900 Subject: [PATCH] sm8550-common: Use QCOM USB gadget HAL * Newer SoC's like kalama use gadget HAL * Import usb_compositions.conf for later customization Change-Id: Ib3383bc1173db22c539b2073d72419c42fcf92cc --- common.mk | 6 ++- configs/usb/usb_compositions.conf | 73 +++++++++++++++++++++++++++++++ vendor.prop | 2 +- 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 configs/usb/usb_compositions.conf diff --git a/common.mk b/common.mk index 048162d..a3af9fe 100644 --- a/common.mk +++ b/common.mk @@ -443,12 +443,16 @@ PRODUCT_PACKAGES += \ # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.3-service-qti + android.hardware.usb@1.3-service-qti \ + android.hardware.usb.gadget@1.2-service-qti PRODUCT_PACKAGES += \ init.qcom.usb.rc \ init.qcom.usb.sh +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/usb/usb_compositions.conf:$(TARGET_COPY_OUT_VENDOR)/etc/usb_compositions.conf + PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \ frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml diff --git a/configs/usb/usb_compositions.conf b/configs/usb/usb_compositions.conf new file mode 100644 index 0000000..6dbc129 --- /dev/null +++ b/configs/usb/usb_compositions.conf @@ -0,0 +1,73 @@ +# /vendor/etc/usb_compositions.conf: HSUSB VID PID supported compositions +# +# This file lists the vendor supported vid-pid compositions for HSUSB that are +# referenced in UsbGadget.cpp. Use the specified format below for compositions, +# where right-most column is the actual order of properties; these are few +# cases where adb does not appear in the end of the composition +# +# +mass_storage 0x05C6 0xF000 +mass_storage,adb 0x05C6 0x9015 adb,mass_storage +diag,adb 0x05C6 0x901D +diag,adb,serial_cdev 0x05C6 0x901F +diag 0x05C6 0x900E +diag,serial_cdev,rmnet,adb 0x05C6 0x9091 +diag,serial_cdev,rmnet 0x05C6 0x9092 +rndis 0x05C6 0xF00E +rndis,adb 0x05C6 0x9024 +rndis,diag 0x05C6 0x902C +rndis,diag,adb 0x05C6 0x902D +rndis,serial_cdev 0x05C6 0x90B3 +rndis,serial_cdev,adb 0x05C6 0x90B4 +rndis,serial_cdev,diag 0x05C6 0x90B5 +rndis,serial_cdev,diag,adb 0x05C6 0x90B6 +mtp,diag 0x05C6 0x901B +mtp,diag,adb 0x05C6 0x903A +diag,qdss 0x05C6 0x904A diag,qdss_debug +diag,qdss,adb 0x05C6 0x9060 diag,qdss_debug,adb +rndis,diag,qdss 0x05C6 0x9081 rndis,diag,qdss_debug +rndis,diag,qdss,adb 0x05C6 0x9082 rndis,diag,qdss_debug,adb +diag,qdss,rmnet 0x05C6 0x9083 diag,qdss_debug,rmnet +diag,qdss,rmnet,adb 0x05C6 0x9084 diag,qdss_debug,adb,rmnet +ncm 0x05C6 0xA4A1 +ncm,adb 0x05C6 0x908C +diag,serial_cdev 0x05C6 0x9004 +diag,serial_cdev,rmnet,dpl 0x05C6 0x90B7 +diag,serial_cdev,rmnet,dpl,adb 0x05C6 0x90B8 +rndis,diag,dpl 0x05C6 0x90BF +rndis,diag,dpl,adb 0x05C6 0x90C0 +ccid 0x05C6 0x90CE +ccid,adb 0x05C6 0x90CF +ccid,diag 0x05C6 0x90D0 +ccid,diag,adb 0x05C6 0x90D1 +diag,serial_cdev,rmnet,ccid 0x05C6 0x90D2 +diag,serial_cdev,rmnet,ccid,adb 0x05C6 0x90D3 +diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_mdm,rmnet 0x05C6 0x90D7 +diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_mdm,rmnet,adb 0x05C6 0x90D8 +diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_mdm,dpl,rmnet 0x05C6 0x90DD +diag,diag_mdm,qdss,qdss_mdm,serial_cdev,serial_cdev_mdm,dpl,rmnet,adb 0x05C6 0x90DE +diag,serial_cdev,rmnet,dpl,qdss 0x05C6 0x90DC +diag,serial_cdev,rmnet,dpl,qdss,adb 0x05C6 0x90DB +diag,uac2,adb 0x05C6 0x90CA diag,adb,uac2 +diag,uac2 0x05C6 0x901C +diag,uvc,adb 0x05C6 0x90CB diag,adb,uvc +diag,uvc 0x05C6 0x90DF +diag,uac2,uvc,adb 0x05C6 0x90CC diag,adb,uac2,uvc +diag,uac2,uvc 0x05C6 0x90E0 +diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,rmnet 0x05C6 0x90E4 +diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,rmnet,adb 0x05C6 0x90E5 +rndis,diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl 0x05C6 0x90E6 +rndis,diag,diag_mdm,qdss,qdss_mdm,serial_cdev,dpl,adb 0x05C6 0x90E7 +rndis,diag,qdss,serial_cdev,dpl 0x05C6 0x90E8 +rndis,diag,qdss,serial_cdev,dpl,adb 0x05C6 0x90E9 +diag,diag_mdm,adb 0x05C6 0x90D9 +diag,diag_mdm,diag_mdm2,qdss,qdss_mdm,serial_cdev,dpl,rmnet 0x05C6 0x90F6 +diag,diag_mdm,diag_mdm2,qdss,qdss_mdm,serial_cdev,dpl,rmnet,adb 0x05C6 0x90F7 +rndis,diag,diag_mdm,diag_mdm2,qdss,qdss_mdm,serial_cdev,dpl 0x05C6 0x90F8 +rndis,diag,diag_mdm,diag_mdm2,qdss,qdss_mdm,serial_cdev,dpl,adb 0x05C6 0x90F9 +diag,diag_mdm,adb,ccid 0x05C6 0x9044 diag,diag_mdm,adb,ccid +diag,diag_mdm,qdss_mdm,dpl,adb 0x05C6 0x90FF +diag,qdss,dpl,adb 0x05C6 0x9104 +diag,dpl 0x05C6 0x9105 +diag,diag_cnss,serial_cdev,rmnet,dpl,qdss,adb 0x05C6 0x9110 +diag,diag_cnss,serial_cdev,rmnet,dpl,qdss 0x05C6 0x9111 diff --git a/vendor.prop b/vendor.prop index bf19f38..6b0e795 100644 --- a/vendor.prop +++ b/vendor.prop @@ -216,7 +216,7 @@ vendor.usb.rmnet.func.name=gsi vendor.usb.rmnet.inst.name=rmnet vendor.usb.rndis.func.name=gsi vendor.usb.use_ffs_mtp=1 -vendor.usb.use_gadget_hal=0 +vendor.usb.use_gadget_hal=1 # UWB ro.vendor.uwb.feature.chipname=sr200