Revert "ginkgo: Move to AOSP NXP NFC HAL"

This reverts commit 8755257.
xdroid-devices · Oct 8, 2022 · f92d1ad · f92d1ad
1 parent ceed6bf
commit f92d1ad
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 53 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -123,6 +123,9 @@ TARGET_KERNEL_CLANG_VERSION := xRageTC
 TARGET_KERNEL_ADDITIONAL_FLAGS := LD=ld.lld AR=llvm-ar NM=llvm-nm OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump STRIP=llvm-strip
 TARGET_KERNEL_ADDITIONAL_FLAGS += HOSTCFLAGS="-fuse-ld=lld -Wno-unused-command-line-argument"
 
+# NFC
+TARGET_USES_NQ_NFC := true
+
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
 BOARD_CACHEIMAGE_PARTITION_SIZE := 402653184

diff --git a/configs/hidl/compatibility_matrix.xml b/configs/hidl/compatibility_matrix.xml
@@ -109,23 +109,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>qccsyshal</instance>
         </interface>
    </hal>
-
-   <hal format="hidl" optional="true">
-        <name>vendor.nxp.nxpese</name>
-        <version>1.0</version>
-        <interface>
-            <name>INxpEse</name>
-            <instance>default</instance>
-        </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-        <name>vendor.nxp.nxpnfc</name>
-        <version>2.0</version>
-        <interface>
-            <name>INxpNfc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifi.supplicant</name>
         <version>2.0-3</version>

diff --git a/configs/hidl/manifest_willow.xml b/configs/hidl/manifest_willow.xml
@@ -9,13 +9,12 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>vendor.nxp.nxpese</name>
+        <name>vendor.nxp.hardware.nfc</name>
         <transport>hwbinder</transport>
-        <fqname>@1.0::INxpEse/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.nxpnfc</name>
-        <transport>hwbinder</transport>
-        <fqname>@2.0::INxpNfc/default</fqname>
+        <version>2.0</version>
+        <interface>
+            <name>INqNfc</name>
+            <instance>default</instance>
+        </interface>
     </hal>
 </manifest>
diff --git a/device.mk b/device.mk
@@ -289,14 +289,15 @@ PRODUCT_PACKAGES += \
     [email protected]
 
 # NFC
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/nxp/opensource/sn100x
+
 PRODUCT_PACKAGES += \
-    [email protected] \
-    [email protected] \
     com.android.nfc_extras \
-    libchrome.vendor \
-    NfcNci  \
-    SecureElement \
-    Tag
+    com.nxp.nfc.nq \
+    NQNfcNci \
+    Tag \
+    [email protected]
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \

diff --git a/proprietary-files.txt b/proprietary-files.txt
@@ -1853,8 +1853,9 @@ vendor/lib64/unnhal-acc-adreno.so|fcc7574b2d6f686e28dae4e42c04ceef5e790c10
 vendor/lib64/unnhal-acc-common.so|e37d2113f99506f1de85902a0fdee0b443342942
 vendor/lib64/unnhal-acc-hvx.so|00eb79608cb6e3f19eaf9389632fdbfa03b2df62
 
-# NFC
-vendor/lib/libsn100u_fw.so
+# NFC - from LA.UM.9.11.r1-04500-NICOBAR.0
+vendor/bin/nqnfcinfo|be17822d9e7e8445db8d100e8e61f8e397a48313
+vendor/lib/libsn100u_fw.so|2bc1887b71b4557b75e26465f6917525bfd43e4a
 
 # Peripheral manager - from LA.UM.9.11.r1-04500-NICOBAR.0
 vendor/bin/pm-proxy|6cfaaf498d9360af9d7c9e4675a1dc209454fe24

diff --git a/rootdir/etc/init.ginkgo.rc b/rootdir/etc/init.ginkgo.rc
@@ -52,23 +52,24 @@ on boot
     # Thermal Profile
     write /sys/class/thermal/thermal_message/sconfig 0
 
-service vendor.nfc_hal_service /vendor/bin/hw/[email protected]
+service nqnfcinfo /vendor/bin/nqnfcinfo
+    class late_start
+    group nfc
+    user system
+    oneshot
     override
+    disabled
+
+service nqnfc_2_0_hal_service /vendor/bin/hw/[email protected]
     class hal
     user nfc
     group nfc
-    disabled
-
-service vendor.secure_element_hal_service /vendor/bin/hw/[email protected]
     override
-    class hal
-    user secure_element
-    group secure_element
     disabled
 
 on property:ro.product.device=willow
-    enable vendor.nfc_hal_service
-    enable vendor.secure_element_hal_service
+    enable nqnfcinfo
+    enable nqnfc_2_0_hal_service
 
 on property:ro.boot.hwversion=*
     setprop vendor.boot.hwversion ${ro.boot.hwversion}

diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
@@ -21,9 +21,6 @@
 /(vendor|system/vendor)/bin/hw/vendor\.xiaomi\.hardware\.misys@2\.0-service          u:object_r:hal_misys_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.xiaomi\.hardware\.misys@3\.0-service          u:object_r:hal_misys_default_exec:s0
 
-# NFC
-/vendor/bin/hw/android\.hardware\.nfc_snxxx@1\.2-service                u:object_r:hal_nfc_default_exec:s0
-
 # Camera
 /mnt/vendor/persist/camera(/.*)?                                                     u:object_r:camera_persist_file:s0
 
@@ -48,6 +45,3 @@
 
 # Data files
 /data/per_boot(/.*)?                                                 u:object_r:per_boot_file:s0
-
-# Secure element
-/vendor/bin/hw/android\.hardware\.secure_element_snxxx@1\.2-service     u:object_r:hal_secure_element_default_exec:s0
diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
@@ -1,12 +1,6 @@
 # Misys
 vendor.xiaomi.hardware.misys::IMiSys          u:object_r:hal_misys_hwservice:s0
 
-# NFC
-vendor.nxp.nxpnfc::INxpNfc                                          u:object_r:hal_nfc_hwservice:s0
-
-# Secure element
-vendor.nxp.nxpese::INxpEse                                          u:object_r:hal_secure_element_hwservice:s0
-
 # Fingerprint
 vendor.goodix.hardware.interfaces.biometrics.fingerprint::IGoodixFingerprintDaemon    u:object_r:hal_fingerprint_hwservice:s0
 vendor.goodix.hardware.interfaces.biometrics.fingerprint::IGoodixFingerprintDaemonExt u:object_r:hal_fingerprint_hwservice:s0