diff options
-rw-r--r-- | kernel | bin | 3849756 -> 3872968 bytes | |||
-rw-r--r-- | nfc/Android.mk | 1 | ||||
-rw-r--r-- | nfc/nfc_hw.c | 16 | ||||
-rw-r--r-- | overlay/packages/apps/Settings/res/values-vi/arrays.xml | 2 |
4 files changed, 17 insertions, 2 deletions
Binary files differ diff --git a/nfc/Android.mk b/nfc/Android.mk index 000b5ae..c89e404 100644 --- a/nfc/Android.mk +++ b/nfc/Android.mk @@ -21,5 +21,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SRC_FILES := nfc_hw.c LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -D$(TARGET_DEVICE) include $(BUILD_SHARED_LIBRARY) diff --git a/nfc/nfc_hw.c b/nfc/nfc_hw.c index 4b4dda5..99adc29 100644 --- a/nfc/nfc_hw.c +++ b/nfc/nfc_hw.c @@ -33,7 +33,21 @@ static uint8_t pn544_eedata_settings[][4] = { ,{0x00,0x9B,0x84,0x13} // ANACM2 setting ,{0x00,0x99,0x81,0x7F} // ANAVMID setting PCD ,{0x00,0x99,0x31,0x70} // ANAVMID setting PICC - ,{0x00,0x99,0x29,0xF6} // Load modulation amplitude fine tuning (???) +#ifdef maguro + // Maguro load modulation settings + ,{0x00,0x99,0x29,0xF4} // Type A load modulation amplitude fine tuning + ,{0x00,0x99,0x2A,0xF4} // Type B load modulation amplitude fine tuning + ,{0x00,0x99,0x2B,0xF4} // Type B' load modulation amplitude fine tuning + ,{0x00,0x99,0x85,0xF1} // Type Felica load modulation amplitude fine tuning +#endif +#ifdef toro + // Toro load modulation settings + ,{0x00,0x99,0x29,0xF3} // Type A load modulation amplitude fine tuning + ,{0x00,0x99,0x2A,0xF3} // Type B load modulation amplitude fine tuning + ,{0x00,0x99,0x2B,0xF3} // Type B' load modulation amplitude fine tuning + ,{0x00,0x99,0x85,0xF1} // Type Felica load modulation amplitude fine tuning +#endif + // For tuna we don't override load modulation settings. // Enable PBTF ,{0x00,0x98,0x00,0x3F} // SECURE_ELEMENT_CONFIGURATION - No Secure Element diff --git a/overlay/packages/apps/Settings/res/values-vi/arrays.xml b/overlay/packages/apps/Settings/res/values-vi/arrays.xml index c6de6bd..9b4bfad 100644 --- a/overlay/packages/apps/Settings/res/values-vi/arrays.xml +++ b/overlay/packages/apps/Settings/res/values-vi/arrays.xml @@ -26,6 +26,6 @@ <item msgid="465923292941002466">"1 phút"</item> <item msgid="7955177189296850016">"2 phút"</item> <item msgid="1244255986255344525">"5 phút"</item> - <item msgid="294890536998091748">"10 phút"</item> + <item msgid="294890536998091748">"10 phút"</item> </string-array> </resources> |