commit 4c05a3e53650b82ad87dfd0abcbdeac370dd8d7d
author michaellin <michaellin@arimacomm.com.tw> Mon Nov 16 16:16:36 2020 +0800
committer Bharath <bharath@fairphone.com> Sat Mar 05 14:22:37 2022 +0530
tree 060f61337aa53d31c39cc38d2dd48ce5c74aa1f6
parent dc05d34c1b4e29d9de5ef3a62d561e8ade4505a6

Modify chip ID for PN553 A0

Issue: FP3-A11#233
Change-Id: I092999332fc6cbafa608ede108b6dca0d03f0e08
(cherry picked from commit 32d6f848f7c46d2adc005469e4547e33191766ca)
(cherry picked from commit 7f231a404cd81a88deb4e408174ca4f2c533c6f2)

1.1/default/NfcApiGet.cpp

diff --git a/1.1/default/NfcApiGet.cpp b/1.1/default/NfcApiGet.cpp
index 15a111d..7e17926 100644
--- a/1.1/default/NfcApiGet.cpp
+++ b/1.1/default/NfcApiGet.cpp
@@ -105,7 +105,8 @@
 
         switch(nqx_info.info.chip_type) {
 
-            case NQ310_ID:
+            case PN553_ID_A0:
+            case NQ310_ID: // ALSO PN553 B0
             case NQ210_ID:
             case NQ440_ID: // ALSO NQ330
             case NQ220_ID:

1.1/default/NfcApiGet.h

diff --git a/1.1/default/NfcApiGet.h b/1.1/default/NfcApiGet.h
index 19a7487..528b75e 100644
--- a/1.1/default/NfcApiGet.h
+++ b/1.1/default/NfcApiGet.h
@@ -29,7 +29,8 @@
 
 #define NQX_FILE_NAME "nfc_nci.nqx.default.hw.so"
 #define SN100X_FILE_NAME "nfc_nci.sn100.default.hw.so"
-#define NQ310_ID 0x41
+#define PN553_ID_A0 0x40
+#define NQ310_ID 0x41 // Also PN553 B0
 #define NQ210_ID 0x48
 #define NQ440_ID 0x51 // Also NQ330
 #define NQ220_ID 0x58

1.2/default/NfcApiGet.cpp

diff --git a/1.2/default/NfcApiGet.cpp b/1.2/default/NfcApiGet.cpp
index 15a111d..7e17926 100644
--- a/1.2/default/NfcApiGet.cpp
+++ b/1.2/default/NfcApiGet.cpp
@@ -105,7 +105,8 @@
 
         switch(nqx_info.info.chip_type) {
 
-            case NQ310_ID:
+            case PN553_ID_A0:
+            case NQ310_ID: // ALSO PN553 B0
             case NQ210_ID:
             case NQ440_ID: // ALSO NQ330
             case NQ220_ID:

1.2/default/NfcApiGet.h

diff --git a/1.2/default/NfcApiGet.h b/1.2/default/NfcApiGet.h
index 73eebe9..528b75e 100644
--- a/1.2/default/NfcApiGet.h
+++ b/1.2/default/NfcApiGet.h
@@ -29,7 +29,8 @@
 
 #define NQX_FILE_NAME "nfc_nci.nqx.default.hw.so"
 #define SN100X_FILE_NAME "nfc_nci.sn100.default.hw.so"
-#define NQ310_ID 0x40
+#define PN553_ID_A0 0x40
+#define NQ310_ID 0x41 // Also PN553 B0
 #define NQ210_ID 0x48
 #define NQ440_ID 0x51 // Also NQ330
 #define NQ220_ID 0x58