From a0984ee92b49eb7cee8467439296a2b77edf8926 Mon Sep 17 00:00:00 2001 From: Daniel Jarai Date: Thu, 8 Mar 2018 22:22:04 +0100 Subject: [PATCH] nfc: disable NFA_DM_PRE_DISCOVERY_CFG Apparently, the Oreo HAL doesn't like it: E/BrcmNfcNfa(946): nfc_ncif_update_window: Unexpected call E/BrcmNfcNfa(946): nfc_ncif_cmd_timeout E/BrcmNfcJni(946): nfaDeviceManagementCallback: NFA_DM_NFCC_TIMEOUT_EVT; abort E/BrcmNfcJni(946): nfaDeviceManagementCallback: crash NFC service Let's just disable it, which shouldn't hurt things, as hammerhead uses the same chip, with NFA_DM_PRE_DISCOVERY_CFG disabled. Change-Id: I1085d41379c3be85dcffd189d7023fc1e48c4a82 --- configs/nfc/libnfc-nci-20791b05.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/nfc/libnfc-nci-20791b05.conf b/configs/nfc/libnfc-nci-20791b05.conf index 80b0375..5cc39ca 100644 --- a/configs/nfc/libnfc-nci-20791b05.conf +++ b/configs/nfc/libnfc-nci-20791b05.conf @@ -25,16 +25,16 @@ LPTD_CFG={38:B9:36:01:00:FF:FF:03:00:00:00:A0:0F:40:00:00:12:02:10:00:00:00:2D:0 # Startup Configuration (256 bytes maximum) # # This is applied at stack startup. -NFA_DM_START_UP_CFG={42:CB:01:01:A5:01:01:CA:14:00:00:00:00:0E:C0:D4:01:00:0F:00:00:00:00:C0:C6:2D:00:14:0A:B5:03:01:02:FF:80:01:01:C9:03:03:0F:AB:5B:01:00:B2:04:E8:03:00:00:CF:02:02:08:B1:06:00:20:00:00:00:12:C2:02:01:C8} +#NFA_DM_START_UP_CFG={42:CB:01:01:A5:01:01:CA:14:00:00:00:00:0E:C0:D4:01:00:0F:00:00:00:00:C0:C6:2D:00:14:0A:B5:03:01:02:FF:80:01:01:C9:03:03:0F:AB:5B:01:00:B2:04:E8:03:00:00:CF:02:02:08:B1:06:00:20:00:00:00:12:C2:02:01:C8} # If NFA_DM_PRE_DISCOVERY_CFG is not supported by the current software, then this value should be used. -#NFA_DM_START_UP_CFG={48:CB:01:01:A5:01:01:CA:14:00:00:00:00:0E:C0:D4:01:00:0F:00:00:00:00:C0:C6:2D:00:14:0A:B5:03:01:03:FF:80:01:01:C9:03:03:0F:AB:5B:01:02:B2:04:E8:03:00:00:CF:02:02:08:B1:06:00:20:00:00:00:12:C2:08:01:08:00:04:80:C3:C9:01} +NFA_DM_START_UP_CFG={48:CB:01:01:A5:01:01:CA:14:00:00:00:00:0E:C0:D4:01:00:0F:00:00:00:00:C0:C6:2D:00:14:0A:B5:03:01:02:FF:80:01:01:C9:03:03:0F:AB:5B:01:00:B2:04:E8:03:00:00:CF:02:02:08:B1:06:00:20:00:00:00:12:C2:08:01:08:00:04:80:C3:C9:01} ############################################################################### # Pre-Discovery Startup Configuration (256 bytes maximum) # # This is applied before starting Discovery the first time. -NFA_DM_PRE_DISCOVERY_CFG={0A:C2:08:01:C8:00:04:40:4B:4C:00} +#NFA_DM_PRE_DISCOVERY_CFG={0A:C2:08:01:C8:00:04:40:4B:4C:00} ############################################################################### # Antenna Configuration - This data is used when setting 0xC8 config item