From 0bf337eb0f41d8b89c06aa99eafe2aad713d8387 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Tue, 25 Oct 2011 18:35:59 -0700
Subject: Write NFC EEPROM setting for lower-power poll measurements to
default.
Change-Id: I7eb676a75786584f0ed6757d8179cd457f3ef4ee
---
jni/com_android_nfc_NativeNfcManager.cpp | 87 ++++++++++++++++----------------
1 file changed, 44 insertions(+), 43 deletions(-)
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp
index b1da2db..e8ee8b2 100644
--- a/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/jni/com_android_nfc_NativeNfcManager.cpp
@@ -26,7 +26,7 @@
#define ERROR_BUFFER_TOO_SMALL -12
#define ERROR_INSUFFICIENT_RESOURCES -9
-#define EEDATA_SETTINGS_NUMBER 32
+#define EEDATA_SETTINGS_NUMBER 33
extern uint32_t libnfc_llc_error_count;
@@ -67,53 +67,54 @@ uint8_t EEDATA_Settings[EEDATA_SETTINGS_NUMBER][4] = {
// DIFFERENTIAL_ANTENNA
// RF Settings
- {0x00,0x9B,0xD1,0x0D} // Tx consumption higher than 0x0D (average 50mA)
- ,{0x00,0x9B,0xD2,0x24} // GSP setting for this threshold
- ,{0x00,0x9B,0xD3,0x0A} // Tx consumption higher than 0x0A (average 40mA)
- ,{0x00,0x9B,0xD4,0x22} // GSP setting for this threshold
- ,{0x00,0x9B,0xD5,0x08} // Tx consumption higher than 0x08 (average 30mA)
- ,{0x00,0x9B,0xD6,0x1E} // GSP setting for this threshold
- ,{0x00,0x9B,0xDD,0x1C} // GSP setting for this threshold
- ,{0x00,0x9B,0x84,0x13} // ANACM2 setting
- ,{0x00,0x99,0x81,0x7F} // ANAVMID setting PCD
- ,{0x00,0x99,0x31,0x70} // ANAVMID setting PICC
-
- // Enable PBTF
- ,{0x00,0x98,0x00,0x3F} // SECURE_ELEMENT_CONFIGURATION - No Secure Element
- ,{0x00,0x9F,0x09,0x00} // SWP_PBTF_RFU
- ,{0x00,0x9F,0x0A,0x05} // SWP_PBTF_RFLD --> RFLEVEL Detector for PBTF
- ,{0x00,0x9E,0xD1,0xA1} //
-
- // Change RF Level Detector ANARFLDWU
- ,{0x00,0x99,0x23,0x00} // Default Value is 0x01
-
- // Low-power polling
- ,{0x00,0x9E,0x74,0x80} // Default Value is 0x00, bits 0->2: sensitivity (0==maximal, 6==minimal), bits 3->6: RFU, bit 7: (0 -> disabled, 1 -> enabled)
-
- // Polling Loop - Card Emulation Timeout
- ,{0x00,0x9F,0x35,0x14} // Time for which PN544 stays in Card Emulation mode after leaving RF field
- ,{0x00,0x9F,0x36,0x60} // Default value 0x0411 = 50 ms ---> New Value : 0x1460 = 250 ms
-
- //LLC Timer
- ,{0x00,0x9C,0x31,0x00} // Guard host time-out in ms (MSB)
- ,{0x00,0x9C,0x32,0xC8} // Guard host time-out in ms (LSB)
- ,{0x00,0x9C,0x19,0x40} // Max RX retry (PN544=>host?)
- ,{0x00,0x9C,0x1A,0x40} // Max TX retry (PN544=>host?)
-
- ,{0x00,0x9C,0x0C,0x00} //
- ,{0x00,0x9C,0x0D,0x00} //
- ,{0x00,0x9C,0x12,0x00} //
- ,{0x00,0x9C,0x13,0x00} //
+ {0x00,0x9B,0xD1,0x0D} // Tx consumption higher than 0x0D (average 50mA)
+ ,{0x00,0x9B,0xD2,0x24} // GSP setting for this threshold
+ ,{0x00,0x9B,0xD3,0x0A} // Tx consumption higher than 0x0A (average 40mA)
+ ,{0x00,0x9B,0xD4,0x22} // GSP setting for this threshold
+ ,{0x00,0x9B,0xD5,0x08} // Tx consumption higher than 0x08 (average 30mA)
+ ,{0x00,0x9B,0xD6,0x1E} // GSP setting for this threshold
+ ,{0x00,0x9B,0xDD,0x1C} // GSP setting for this threshold
+ ,{0x00,0x9B,0x84,0x13} // ANACM2 setting
+ ,{0x00,0x99,0x81,0x7F} // ANAVMID setting PCD
+ ,{0x00,0x99,0x31,0x70} // ANAVMID setting PICC
+
+ // Enable PBTF
+ ,{0x00,0x98,0x00,0x3F} // SECURE_ELEMENT_CONFIGURATION - No Secure Element
+ ,{0x00,0x9F,0x09,0x00} // SWP_PBTF_RFU
+ ,{0x00,0x9F,0x0A,0x05} // SWP_PBTF_RFLD --> RFLEVEL Detector for PBTF
+ ,{0x00,0x9E,0xD1,0xA1} //
+
+ // Change RF Level Detector ANARFLDWU
+ ,{0x00,0x99,0x23,0x00} // Default Value is 0x01
+
+ // Low-power polling
+ ,{0x00,0x9E,0x74,0x80} // Default Value is 0x00, bits 0->2: sensitivity (0==maximal, 6==minimal), bits 3->6: RFU, bit 7: (0 -> disabled, 1 -> enabled)
+ ,{0x00,0x9F,0x28,0x10} // Number of measurements per low-power poll
+
+ // Polling Loop - Card Emulation Timeout
+ ,{0x00,0x9F,0x35,0x14} // Time for which PN544 stays in Card Emulation mode after leaving RF field
+ ,{0x00,0x9F,0x36,0x60} // Default value 0x0411 = 50 ms ---> New Value : 0x1460 = 250 ms
+
+ //LLC Timer
+ ,{0x00,0x9C,0x31,0x00} // Guard host time-out in ms (MSB)
+ ,{0x00,0x9C,0x32,0xC8} // Guard host time-out in ms (LSB)
+ ,{0x00,0x9C,0x19,0x40} // Max RX retry (PN544=>host?)
+ ,{0x00,0x9C,0x1A,0x40} // Max TX retry (PN544=>host?)
+
+ ,{0x00,0x9C,0x0C,0x00} //
+ ,{0x00,0x9C,0x0D,0x00} //
+ ,{0x00,0x9C,0x12,0x00} //
+ ,{0x00,0x9C,0x13,0x00} //
//WTX for LLCP communication
,{0x00,0x98,0xA2,0x0E} // Max value: 14 (default value: 09)
- //SE GPIO
- ,{0x00, 0x98, 0x93, 0x40}
+ //SE GPIO
+ ,{0x00, 0x98, 0x93, 0x40}
- // Set NFCT ATQA
- ,{0x00, 0x98, 0x7D, 0x02}
- ,{0x00, 0x98, 0x7E, 0x00}
+ // Set NFCT ATQA
+ ,{0x00, 0x98, 0x7D, 0x02}
+ ,{0x00, 0x98, 0x7E, 0x00}
// Enable CEA detection mechanism
,{0x00, 0x9F, 0xC8, 0x01}
--
cgit v1.1