diff --git a/Android.bp b/Android.bp index b0f2611..67094fd 100644 --- a/Android.bp +++ b/Android.bp @@ -2141,7 +2141,7 @@ cc_prebuilt_library_shared { "libcutils", "libtinyalsa", "libtinycompress", - "libaudioroute", + "libaudioroute-v34", "libaudioutils", "libexpat", "libhidlbase", @@ -5620,33 +5620,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "consumerir.sm6150", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/consumerir.sm6150.so", - ], - shared_libs: [ - "liblog", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "fingerprint.fpc.sm6150", owner: "xiaomi", diff --git a/proprietary/vendor/lib/hw/audio.primary.sm6150.so b/proprietary/vendor/lib/hw/audio.primary.sm6150.so index 49efe9b..6f1fab4 100644 Binary files a/proprietary/vendor/lib/hw/audio.primary.sm6150.so and b/proprietary/vendor/lib/hw/audio.primary.sm6150.so differ diff --git a/proprietary/vendor/lib64/hw/consumerir.sm6150.so b/proprietary/vendor/lib64/hw/consumerir.sm6150.so deleted file mode 100644 index b37dd07..0000000 Binary files a/proprietary/vendor/lib64/hw/consumerir.sm6150.so and /dev/null differ diff --git a/proprietary/vendor/libnfc-nxp_RF.conf b/proprietary/vendor/libnfc-nxp_RF.conf new file mode 100644 index 0000000..4a85f1b --- /dev/null +++ b/proprietary/vendor/libnfc-nxp_RF.conf @@ -0,0 +1,129 @@ +############################################################################### +## PN553 RF config add phone off EMvco test 20,Dec 2019### +# NXP RF configuration ALM/PLM settings +# This section needs to be updated with the correct values based on the platform + NXP_RF_CONF_BLK_1={ + 20, 02, E7, 1B, + A0, 0D, 06, 06, 37, 08, 76, 00, 00, + A0, 0D, 03, 24, 03, 7E, + A0, 0D, 06, 02, 35, 00, 3E, 00, 00, + A0, 0D, 06, 04, 35, F4, 05, 70, 02, + A0, 0D, 06, C2, 35, 00, 3E, 00, 03, + A0, 0D, 06, 04, 42, F8, 40, FF, FF, + A0, 0D, 04, 32, 42, F8, 40, + A0, 0D, 04, 46, 42, 68, 40, + A0, 0D, 04, 56, 42, 78, 40, + A0, 0D, 04, 5C, 42, 80, 40, + A0, 0D, 04, CA, 42, 68, 40, + A0, 0D, 06, 06, 42, 00, 02, F6, F6, + A0, 0D, 06, 32, 4A, 53, 07, 00, 1B, + A0, 0D, 06, 46, 4A, 33, 07, 00, 07, + A0, 0D, 06, 56, 4A, 43, 07, 00, 07, + A0, 0D, 06, 5C, 4A, 11, 07, 01, 07, + A0, 0D, 06, 34, 44, 66, 08, 00, 00, + A0, 0D, 06, 48, 44, 65, 0A, 00, 00, + A0, 0D, 06, 58, 44, 55, 08, 00, 00, + A0, 0D, 06, 5E, 44, 55, 08, 00, 00, + A0, 0D, 06, CA, 44, 65, 0A, 00, 00, + A0, 0D, 06, 06, 44, 04, 04, C4, 00, + A0, 0D, 06, 34, 2D, DC, 20, 04, 00, + A0, 0D, 06, 48, 2D, 15, 34, 1F, 01, + A0, 0D, 06, 58, 2D, 0D, 48, 0C, 01, + A0, 0D, 06, 5E, 2D, 0D, 5A, 0C, 01, + A0, 0D, 06, CA, 2D, 15, 34, 1F, 01 +} +############################################################################### +# NXP RF configuration ALM/PLM settings +# This section needs to be updated with the correct values based on the platform +NXP_RF_CONF_BLK_2={ + 20, 02, D6, 01, A0, 34, D2, 23, 04, 18, 47, 40, 00, 00, 40, 00, 96, 00, 40, 00, D2, 00, 40, 00, 2C, 01, 40, 00, D0, 01, 40, 00, D7, 02, 00, 00, 33, 04, 48, 00, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 48, 01, 00, 00, 08, 03, 00, 00, 08, 01, 00, 00, C8, 02, 00, 00, C8, 00, 00, 00, 88, 02, 00, 00, 48, 02, 00, 00, B8, 00, 00, 00, 68, 00, 00, 00, 18, 00, 00, 00, 08, 02, 00, 00, 00, 00, 00, 00, 00, 00, 47, 00, 00, 40, 00, 96, 00, 40, 00, D2, 00, 40, 00, 2C, 01, 40, 00, D0, 01, 40, 00, D7, 02, 00, 00, 33, 04, 48, 00, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 08, 02, 00, 00, 48, 01, 00, 00, 08, 03, 00, 00, 08, 01, 00, 00, C8, 02, 00, 00, C8, 00, 00, 00, 88, 02, 00, 00, 48, 02, 00, 00, B8, 00, 00, 00, 68, 00, 00, 00, 18, 00, 00, 00, 08, 02, 00, 00, 00, 00 + } + +############################################################################### +# NXP RF configuration ALM/PLM settings +# This section needs to be updated with the correct values based on the platform +NXP_RF_CONF_BLK_3={ + 20, 02, 5B, 01, A0, 0B, 57, 11, 11, 90, 78, 0F, 4E, 00, 3D, 95, 00, 00, 3D, 9F, 00, 00, 50, 9F, 00, 00, 59, 9F, 00, 00, 5A, 9F, 00, 00, 64, 9F, 00, 00, 65, 9F, 00, 00, 6E, 9F, 00, 00, 72, 9F, 00, 00, 79, 9F, 00, 00, 7B, 9F, 00, 00, 84, 9F, 00, 00, 86, 9F, 00, 00, 8F, 9F, 00, 00, 91, 9F, 00, 00, 9A, 9F, 00, 00, A1, 9F, 00, 00, A7, 9F, 00, 00, B0, 1F, 00, 00, B9, 1F, 00, 00 +} + +############################################################################### +# NXP RF configuration ALM/PLM settings +# This section needs to be updated with the correct values based on the platform +NXP_RF_CONF_BLK_4={ + 20, 02, 21, 04, + A0, 38, 04, 14, 0B, 0B, 00, + A0, 3A, 08, E1, 00, E1, 00, E1, 00, E1, 00, + A0, 0D, 06, 06, 16, 0E, 00, 1F, 00, + A0, B1, 02, BB, 08 +} + +############################################################################### +# NXP RF configuration ALM/PLM settings +# This section needs to be updated with the correct values based on the platform +#NXP_RF_CONF_BLK_5={ +#} + +############################################################################### +# NXP RF configuration ALM/PLM settings +# This section needs to be updated with the correct values based on the platform +#NXP_RF_CONF_BLK_6={ +#} + +############################################################################### +# Core configuration extensions +# It includes +# Wired mode settings A0ED, A0EE +# Tag Detector A040, A041, A043 +# Low Power mode A007 +# Clock settings A002, A003 +# PbF settings A008 +# Clock timeout settings A004 +# eSE (SVDD) PWR REQ settings A0F2 +# How eSE connected to PN553 A012 +# UICC bit rate A0D1 +# SWP1A interface A0D4 +# DWP intf behavior config, SVDD Load activated by default if set to 0x31 - A037 +NXP_CORE_CONF_EXTN={20, 02, 47, 0C, + A0, EC, 01, 01, + A0, ED, 01, 00, + A0, 5E, 01, 01, + A0, 12, 01, 02, + A0, 40, 01, 01, + A0, 41, 01, 05, + A0, 43, 01, 04, + A0, DD, 01, 2D, + A0, D1, 01, 06, + A0, D4, 01, 01, + A0, 37, 01, 35, + A0, 29, 17, 19, 07, 00, 1D, 00, 02, 00, 1D, 00, 02, 00, 40, F3, F3, 00, 43, F3, F3, 38, 70, 00, 00, 00 + } +# A0, F2, 01, 01, +# A0, 40, 01, 01, +# A0, 41, 01, 02, +# A0, 43, 01, 04, +# A0, 02, 01, 01, +# A0, 03, 01, 11, +# A0, 07, 01, 03, +# A0, 08, 01, 01 +# } + +############################################################################### +# Core configuration settings +NXP_CORE_CONF={ 20, 02, 2E, 0E, + 28, 01, 00, + 21, 01, 00, + 30, 01, 08, + 31, 01, 03, + 32, 01, 60, + 38, 01, 01, + 33, 04, 01, 02, 03, 04, + 54, 01, 06, + 50, 01, 02, + 5B, 01, 00, + 80, 01, 01, + 81, 01, 01, + 82, 01, 0E, + 18, 01, 01 + } +############################################################################### + diff --git a/surya-vendor.mk b/surya-vendor.mk index ba28da8..0f8c40d 100644 --- a/surya-vendor.mk +++ b/surya-vendor.mk @@ -258,6 +258,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/surya/proprietary/vendor/lib64/camera/fdconfigpreviewlite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigpreviewlite.bin \ vendor/xiaomi/surya/proprietary/vendor/lib64/camera/fdconfigvideo.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideo.bin \ vendor/xiaomi/surya/proprietary/vendor/lib64/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideolite.bin \ + vendor/xiaomi/surya/proprietary/vendor/libnfc-nxp_RF.conf:$(TARGET_COPY_OUT_VENDOR)/libnfc-nxp_RF.conf \ vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db \ vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/0_initial.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/0_initial.sql \ vendor/xiaomi/surya/proprietary/vendor/radio/qcril_database/upgrade/10_version_update_ecc_table.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/10_version_update_ecc_table.sql \ @@ -434,7 +435,6 @@ PRODUCT_PACKAGES += \ camera.qcom \ com.dsi.ant@1.0-impl \ com.qti.chi.override \ - consumerir.sm6150 \ fingerprint.fpc.sm6150 \ fingerprint.goodix.sm6150 \ vendor.qti.gnss@4.0-impl \