diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index ab0697a..1e8c349 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -148,22 +148,10 @@ BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor # Verified Boot BOARD_AVB_ENABLE := true - -ifneq (,$(AVB_CUSTOM_KEY_PATH)) -BOARD_AVB_ALGORITHM := $(AVB_CUSTOM_ALGORITHM) -BOARD_AVB_KEY_PATH := $(AVB_CUSTOM_KEY_PATH) -else -AVB_CUSTOM_ALGORITHM := SHA256_RSA2048 -AVB_CUSTOM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem -endif - -ifneq ($(WITH_AVB),true) BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 -endif - BOARD_AVB_VBMETA_SYSTEM := system system_ext product -BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := $(AVB_CUSTOM_ALGORITHM) -BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(AVB_CUSTOM_KEY_PATH) +BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2 # WiFi diff --git a/common.mk b/common.mk index 2528ca4..0429620 100644 --- a/common.mk +++ b/common.mk @@ -31,7 +31,6 @@ PRODUCT_PACKAGES += \ FrameworksResCommon \ FrameworksResProduct \ FrameworksResTarget \ - LineageApertureAppCommon \ NcmTetheringOverlay \ SettingsProviderResCommon \ SystemUIResCommon \ @@ -138,6 +137,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fastbootd +# Framework detect +PRODUCT_PACKAGES += \ + libvndfwk_detect_jni.qti.vendor # Needed by CNE app + # GPS PRODUCT_PACKAGES += \ android.hardware.gnss@2.1-impl-qti \ @@ -153,7 +156,10 @@ PRODUCT_PACKAGES += \ flp.conf \ gnss_antenna_info.conf \ gps.conf \ - izat.conf + izat.conf \ + lowi.conf \ + sap.conf \ + xtwifi.conf # Health PRODUCT_PACKAGES += \ diff --git a/extract-files.py b/extract-files.py index 37ba57b..88fce2e 100755 --- a/extract-files.py +++ b/extract-files.py @@ -40,6 +40,7 @@ lib_fixups: lib_fixups_user_type = { 'vendor.qti.hardware.fm@1.0', 'vendor.qti.hardware.wifidisplaysession@1.0', 'vendor.qti.imsrtpservice@3.0', + 'vendor.qti.qspmhal@1.0', ): lib_fixup_vendor_suffix, } @@ -50,11 +51,6 @@ blob_fixups: blob_fixups_user_type = { .add_needed('libinput_shim.so'), 'system_ext/priv-app/ims/ims.apk': blob_fixup() .apktool_patch('ims-patches'), - ( - 'vendor/lib64/libdpps.so', - 'vendor/lib64/libsnapdragoncolor-manager.so', - ): blob_fixup() - .replace_needed('libtinyxml2.so', 'libtinyxml2-v34.so'), 'vendor/lib64/libwvhidl.so': blob_fixup() .add_needed('libcrypto_shim.so'), ('vendor/bin/init.kernel.post_boot-blair.sh', 'vendor/bin/init.kernel.post_boot-holi.sh'): blob_fixup() diff --git a/gps/etc/Android.bp b/gps/etc/Android.bp index 2f7c436..ac6df40 100644 --- a/gps/etc/Android.bp +++ b/gps/etc/Android.bp @@ -18,6 +18,24 @@ prebuilt_etc { src: "izat.conf", } +prebuilt_etc { + name: "lowi.conf", + vendor: true, + src: "lowi.conf", +} + +prebuilt_etc { + name: "sap.conf", + vendor: true, + src: "sap.conf", +} + +prebuilt_etc { + name: "xtwifi.conf", + vendor: true, + src: "xtwifi.conf", +} + prebuilt_etc { name: "gnss_antenna_info.conf", diff --git a/gps/etc/lowi.conf b/gps/etc/lowi.conf new file mode 100644 index 0000000..ddf38d3 --- /dev/null +++ b/gps/etc/lowi.conf @@ -0,0 +1,29 @@ +#*====*====*====*====*====*====*====*====*====*====*====*====*====*====*====* +# +# LOWI Config file - lahaina +# +# GENERAL DESCRIPTION +# This file contains the config params for LOWI +# +# Copyright (c) 2019 Qualcomm Technologies, Inc. +# All Rights Reserved. +# Confidential and Proprietary - Qualcomm Technologies, Inc. +# +# 2012-2013 Qualcomm Atheros, Inc. +# All Rights Reserved. +# Qualcomm Atheros Confidential and Proprietary. +# +# Export of this technology or software is regulated by the U.S. Government. +# Diversion contrary to U.S. law prohibited. +#=============================================================================*/ + +# X86 ONLY - UBUNTU: +# Copy this file in the same directory where the executable is + +# Log level +# EL_LOG_OFF = 0, EL_ERROR = 1, EL_WARNING = 2, EL_INFO = 3, EL_DEBUG = 4, EL_VERBOSE = 5, EL_LOG_ALL = 100 +LOWI_LOG_LEVEL = 4 +LOWI_USE_LOWI_LP = 0 +LOWI_HE_RTT_SUPPORT = 1 +LOWI_USE_NLMSG_FOR_CAPS = 1 +LOWI_RTT_WEIGHTED_MEAN = 1 diff --git a/gps/etc/sap.conf b/gps/etc/sap.conf new file mode 100644 index 0000000..e8d27b7 --- /dev/null +++ b/gps/etc/sap.conf @@ -0,0 +1,179 @@ +################################ +# Sensor Settings +################################ +#The following parameters are optional. +#Internal defaults support MEMS sensors +#native to most handset devices. +#Device specific sensor characterization +#for improved performance is possible as +#described in SAP application notes. +#GYRO_BIAS_RANDOM_WALK= +#ACCEL_RANDOM_WALK_SPECTRAL_DENSITY= +#ANGLE_RANDOM_WALK_SPECTRAL_DENSITY= +#RATE_RANDOM_WALK_SPECTRAL_DENSITY= +#VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY= + +# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info +# 4 - Debug, 5 - Verbose +# If DEBUG_LEVEL is commented, Android's logging levels will be used +DEBUG_LEVEL = 0 +# Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0) +# used in loc_eng_reinit +SENSOR_ACCEL_BATCHES_PER_SEC=2 +SENSOR_ACCEL_SAMPLES_PER_BATCH=5 +SENSOR_GYRO_BATCHES_PER_SEC=2 +SENSOR_GYRO_SAMPLES_PER_BATCH=5 +# Sensor Sampling Rate Parameters for High-Data Rate Filter (should be greater than 0) +SENSOR_ACCEL_BATCHES_PER_SEC_HIGH=4 +SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH=25 +SENSOR_GYRO_BATCHES_PER_SEC_HIGH=4 +SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25 + +# Sensor Control Mode (0=AUTO, 1=FORCE_ON, 2=MODEM_DEFAULT) +# used in loc_eng_reinit +SENSOR_CONTROL_MODE=2 + +# Bit mask used to define which sensor algorithms are used. +# Setting each bit has the following definition: +# 0x1 - DISABLE_INS_POSITIONING_FILTER +# 0x0 - ENABLE_INS_POSITIONING_FILTER +SENSOR_ALGORITHM_CONFIG_MASK=0x0 + +#Vehicle Network Provider configuration + +#Service configuration strings +#The number before colon in VN_X items defines version of the format of the rest of the string +#VN_ACCEL_CFG=0:5 +#VN_GYRO_CFG=0:5.5 +#VN_ODOMETRY_CFG=0:2,4.5 + +################################################ +# QDR3 configurations # +################################################ +#VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2 +#VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8 +VN_SPEED_CFG=1:777,0,0,1,3,1,0.002778,0,40,8,32,8 +VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8 + +################################################ +# QDR2-Gyro configurations # +################################################ +#VN_GYRO_CFG=1:555,0,1,0,0,0,0,-6.5,6.6066,-6.5,-1.00,2,6.607,6.6068,0,0,16,0.0002,0,16,0.0002,0,16,0.0002 +#VN_SPEED_CFG=1:555,0,0,1,2,1,0.01,0,56,8,48,8 +#VN_GEAR_CFG=1:555,16,4,0,1,1,9,0,1,2,3,4,5,6,7,8 + +################################################ +# QDR2-DWT configurations # +################################################ +#VN_SPEED_CFG=1:555,22,1,2,1,1,1,0,8,8,23,1,2,0,1,0,8,8,23,1 +#VN_GEAR_CFG=1:555,12,4,16,14,16,8,1,2,3,4,5,6,7,8 +#VN_DWS_CFG=1:555,0,0,1,3,1,1,0,0,8,0,0,8,8,0,0,16,8,0,0,24,8,0,0 +#VN_GYRO_CFG=1:555,40,16,1.0,40,16,1.0,40,16,1.0 + +##################################################################################### +# VNW service batching configuration strings # +# VNW provider will initialize default type as Time based batching # +# Each service batch value is configured to be 100 # +# VN_ACCEL_CFG_BATCH_VALUE will be treated as time in Ms if VN_CFG_BATCH_TYPE # +# is set to time based batching # +# VN_ACCEL_CFG_BATCH_VALUE will be treated as sample count if VN_CFG_BATCH_TYPE # +# is set to count based batching # +# Uncomment and update batch time /sample count as per selected batching type # +##################################################################################### +# Batching type +# 1 - Time based (default) +# 2 - Count based +VN_CFG_BATCH_TYPE=1 + +#Vehicle Accel batching value, it can either accept time in milli seconds or sample count +#VN_ACCEL_CFG_BATCH_VALUE=100 + +#Vehicle Gyro batching value, it can either accept time in milli seconds or sample count +VN_GYRO_CFG_BATCH_VALUE=50 + +#Vehicle Odo batching value, it can either accept time in milli seconds or sample count +#VN_ODOMETRY_CFG_BATCH_VALUE=100 + +#Vehicle Speed batching value, it can either accept time in milli seconds or sample count +VN_SPEED_CFG_BATCH_VALUE=50 + +#Vehicle Gear batching value, it can either accept time in milli seconds or sample count +VN_GEAR_CFG_BATCH_VALUE=50 + +#Vehicle DWS batching value, it can either accept time in milli seconds or sample count +#VN_DWS_CFG_BATCH_VALUE=100 +#################################################################################### + +#Procesors clock ratio: AP and CAN bus microcontroller +################################################ +# QDR3 configurations # +################################################ +VN_PROC_CLOCK_RATIO=1.0 + +################################################ +# QDR2-DWT OR QDR2-Gyro configurations # +################################################ +#VN_PROC_CLOCK_RATIO = 1.0 + +# Time source used by Sensor HAL +# Setting this value controls accuracy of location sensor services. +# 0 - Unknown +# 1 - CLOCK_BOOTTIME +# 2 - CLOCK_MONOTONIC +# 3 - CLOCK_REALTIME +# 4 - CLOCK_BOOTTIME using Alarm timer interface +NDK_PROVIDER_TIME_SOURCE=1 + +# Sensor Batching Configuration +# 0 - Time based +# 1 - Fixed count based +# 2 - Variable count based +COUNT_BASED_BATCHING=1 +SYNC_ONCE=0 + +# Vehicle Network Data optimization +# Default value: 0 +# Value 0x40000 - Speed(bit 18 eSLIM_SERVICE_VEHICLE_SPEED) +# Value 0x80000 - Speed(bit 19 eSLIM_SERVICE_VEHICLE_DWS) +# Value 0x100000 - Speed(bit 20 eSLIM_SERVICE_VEHICLE_GEAR) +VN_ENABLE_DATA_OPTIMIZATION=0x100000 + +# Vehicle Network Data Routing time interval +# This is applicable only if VN_ENABLE_DATA_OPTIMIZATION value is set +# Default value: 5000 msec +VN_DATA_ROUTING_TIME_INTERVAL_MSEC=3000 + +#Sensor HAL Provider Configuration HAL Library name including path +################################################ +# # +# Configuration for BMI 160 Sensor # +# # +################################################ +#SENSOR_TYPE=2 +#SENSOR_HAL_LIB_PATH=/usr/lib/libbmi160sensors.so.1 + +################################################ +# # +# Configuration for ASM330 Sensor # +# # +################################################ +SENSOR_TYPE=1 +SENSOR_HAL_LIB_PATH=/usr/lib/libasm330sensors.so.1 + + +################################################ +# # +# Configuration for IAM20680 Sensor # +# # +################################################ +#SENSOR_TYPE=3 +#SENSOR_HAL_LIB_PATH=/usr/lib/libiam20680sensors.so.1 + + +################################################ +# # +# Configuration for SMI130 Sensor # +# # +################################################ +#SENSOR_TYPE=4 +#SENSOR_HAL_LIB_PATH=/usr/lib/libsmi130sensors.so.1 diff --git a/gps/etc/xtwifi.conf b/gps/etc/xtwifi.conf new file mode 100644 index 0000000..5d7df9e --- /dev/null +++ b/gps/etc/xtwifi.conf @@ -0,0 +1,78 @@ +#GTP AP Project client core config file +# +#GENERAL DESCRIPTION +#This is used by client core +# +#Copyright (c) 2012-2014 Qualcomm Atheros, Inc. +#All Rights Reserved. +#Qualcomm Atheros Confidential and Proprietary. +# +#Copyright (c) 2017 Qualcomm Technologies, Inc. +#All Rights Reserved. +#Confidential and Proprietary - Qualcomm Technologies, Inc. + +############################################################################## +# non-IOT devices configuration items # +# For non-IOT devices, configure below configuration items # +# according to the app note: 80-NK218-1 and remove the configuration items # +# in section of "IOT devices configuration items". # +############################################################################## + +# ASN URI v2 to be used by some GTP AP modules that +# need to run with ASN URI v2 protocol. +XT_SERVER_ROOT_URL = https://gtp1.izatcloud.net:443/uds/v2 + +# ASN URI v3 to be used by GTP AP modules that +# can support ASN URI v3 protocol. +XT_SERVER_ROOT_URL_V3 = https://gtp1.izatcloud.net:443/uds/v3 + +# size, in bytes, of the cache on device +SIZE_BYTE_TOTAL_CACHE = 5000000 + +############################################################################## +# IOT devices configuration items # +# For IOT devices, configure below configuration items # +# according to the app note and remove the configuration items in section of # +# "non-IOT devices configuration items". # +############################################################################## + +# ASN URI v3 to be used by GTP AP modules that +# can support ASN URI v3 protocol. +# XT_SERVER_ROOT_URL_V3 = https://gtpma1.izatcloud.net:443/uds/v3 + +# 3: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed +# for any GTP requests, instead notification is sent to Izat SDK. +# WiFi crowdsourcing module is disabled. +# 4: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed +# for any GTP requests, instead notification is sent to Izat SDK. +# WiFi crowdsourcing module is active, also accessed via Izat SDK. +# GTP_AP_MODE = 4 + +# 1: MP cell features relies on GTP AP for either download or upload +# 0: MP cell features does not rely on GTP AP +# GTP_AP_NEEDED_BY_MP_CELL = 1 + +############################################################################## +# Configuration items applicable to all devices # +############################################################################## + +# Log verbosity control for most of the GTP WiFi system, including native and +# Java componenets +# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5, ALL = 100 +DEBUG_GLOBAL_LOG_LEVEL = 2 + +# this is used at the server side to distinguish uploads from different maker/model +# default "Qualcomm" +OEM_ID_IN_REQUEST_TO_SERVER = "Qualcomm" + +# this is used at the server side to distinguish uploads from different maker/model +# default "UNKNOWN" +MODEL_ID_IN_REQUEST_TO_SERVER = "UNKNOWN" + +############################################################################## +# Qualcomm Network Location Provider config # +############################################################################## + +# Accuracy Threshold for NLP position. Position exceeds thsi threshold will be filtered out. +# Default is 25000 meters. +LARGE_ACCURACY_THRESHOLD_TO_FILTER_NLP_POSITION = 25000 diff --git a/manifest.xml b/manifest.xml index 513d66c..4f8c729 100644 --- a/manifest.xml +++ b/manifest.xml @@ -3,7 +3,7 @@ SPDX-FileCopyrightText: The LineageOS Project SPDX-License-Identifier: Apache-2.0 --> - + android.hardware.audio hwbinder @@ -178,6 +178,11 @@ hwbinder @1.0::IFmHci/default + + vendor.qti.hardware.iop + hwbinder + @2.0::IIop/default + vendor.qti.hardware.perf hwbinder diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml deleted file mode 100644 index e6d0f14..0000000 --- a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 1 - diff --git a/resource-overlay/common/LineageApertureApp/res/values/config.xml b/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml similarity index 100% rename from resource-overlay/common/LineageApertureApp/res/values/config.xml rename to overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml diff --git a/proprietary-files.txt b/proprietary-files.txt index 2467953..17f0631 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,4 +1,4 @@ -# All unpinned blobs are extracted from fogos_g V1UGS35H.75-14-3-9 +# All unpinned blobs are extracted from fogos_g V1UGS35H.75-14-3-5 # ADSP vendor/bin/adsprpcd @@ -285,11 +285,6 @@ vendor/lib64/vendor.qti.gnss@3.0.so vendor/lib64/vendor.qti.gnss@4.0-service.so vendor/lib64/vendor.qti.gnss@4.0.so -# GNSS configs -vendor/etc/lowi.conf -vendor/etc/sap.conf -vendor/etc/xtwifi.conf - # Graphics - Adreno vendor/lib/egl/eglSubDriverAndroid.so vendor/lib/egl/libEGL_adreno.so;SYMLINK=vendor/lib/libEGL_adreno.so @@ -342,6 +337,11 @@ vendor/gpu/kbc/unified_ksqs.bin vendor/lib/hw/vulkan.adreno.so vendor/lib64/hw/vulkan.adreno.so +# IO prefetcher +vendor/lib64/libqti-iopd-client.so +vendor/lib64/libqti-iopd.so +vendor/lib64/vendor.qti.hardware.iop@2.0.so + # IPA firmware vendor/etc/init/ipa_fws.rc @@ -491,12 +491,23 @@ vendor/lib64/libqmi_encdec.so vendor/lib64/libqmiservices.so # QSPM +system_ext/bin/qspmsvc +system_ext/etc/init/qspmsvc.rc +system_ext/lib64/libqspmsvc.so +system_ext/lib64/vendor.qti.qspmhal-V1-ndk.so +system_ext/lib64/vendor.qti.qspmhal@1.0.so vendor/bin/vendor.qti.qspmhal@1.0-service vendor/etc/init/vendor.qti.qspmhal@1.0-service.rc vendor/etc/seccomp_policy/qspm.policy -vendor/lib/vendor.qti.qspmhal@1.0.so +vendor/lib/vendor.qti.qspmhal@1.0.so;MODULE_SUFFIX=_vendor vendor/lib64/vendor.qti.qspmhal@1.0-impl.so -vendor/lib64/vendor.qti.qspmhal@1.0.so +vendor/lib64/vendor.qti.qspmhal@1.0.so;MODULE_SUFFIX=_vendor + +# QTI service tracker +vendor/bin/hw/vendor.qti.hardware.servicetracker@1.2-service +vendor/etc/init/vendor.qti.hardware.servicetracker@1.2-service.rc +vendor/etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml +vendor/lib64/hw/vendor.qti.hardware.servicetracker@1.2-impl.so # RIL product/app/uimgbaservice/uimgbaservice.apk diff --git a/resource-overlay/common/Frameworks/res/values/config.xml b/resource-overlay/common/Frameworks/res/values/config.xml index 9696720..9fbab21 100644 --- a/resource-overlay/common/Frameworks/res/values/config.xml +++ b/resource-overlay/common/Frameworks/res/values/config.xml @@ -43,7 +43,7 @@ - 0.06667 + 17 true diff --git a/resource-overlay/common/LineageApertureApp/Android.bp b/resource-overlay/common/LineageApertureApp/Android.bp deleted file mode 100644 index 2917e57..0000000 --- a/resource-overlay/common/LineageApertureApp/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -// -// SPDX-FileCopyrightText: The LineageOS Project -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "LineageApertureAppCommon", - vendor: true, -} diff --git a/resource-overlay/common/LineageApertureApp/AndroidManifest.xml b/resource-overlay/common/LineageApertureApp/AndroidManifest.xml deleted file mode 100644 index a798a65..0000000 --- a/resource-overlay/common/LineageApertureApp/AndroidManifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/rootdir/etc/init/hw/init.mmi.rc b/rootdir/etc/init/hw/init.mmi.rc index 4b41de3..63066d8 100644 --- a/rootdir/etc/init/hw/init.mmi.rc +++ b/rootdir/etc/init/hw/init.mmi.rc @@ -58,6 +58,7 @@ on early-init on fs insmod /vendor/lib/modules/cci_intf.ko mkdir /mnt/vendor/persist/fps 0770 system system + exec_start vendor.ident-fps-sh on fs && property:ro.vendor.hw.modem_version=* # Super modem detection @@ -337,6 +338,20 @@ service vendor.hal-fps-sh /vendor/bin/init.oem.fingerprint2.sh group system oneshot +service fpc_ident /vendor/bin/hw/fpc_ident + class late_start + user system + group system + oneshot + disabled + +service egis_ident /vendor/bin/hw/egis_ident + class late_start + user system + group system + oneshot + disabled + service vendor.touch-dead-sh /vendor/bin/init.oem.hw.sh -f class main user root diff --git a/vendor.prop b/vendor.prop index 67d9cb5..c3e571d 100644 --- a/vendor.prop +++ b/vendor.prop @@ -315,7 +315,6 @@ ro.surface_flinger.max_frame_buffer_acquired_buffers=4 ro.surface_flinger.max_virtual_display_dimension=4096 ro.surface_flinger.protected_contents=true ro.surface_flinger.set_touch_timer_ms=200 -ro.surface_flinger.supports_background_blur=1 ro.surface_flinger.use_color_management=true ro.surface_flinger.use_content_detection_for_refresh_rate=true ro.surface_flinger.use_smart_90_for_video=true @@ -323,8 +322,6 @@ ro.surface_flinger.wcg_composition_dataspace=143261696 # USB sys.usb.mtp.batchcancel=1 -vendor.usb.controller=4e00000.dwc3 -vendor.usb.device=4e00000.ssusb vendor.usb.diag.func.name=ffs vendor.usb.dpl.inst.name=dpl vendor.usb.qdss.inst.name=qdss