diff --git a/configs/libnfc-brcm.conf b/configs/libnfc-brcm.conf
index 7c7f4a7..b762f39 100644
--- a/configs/libnfc-brcm.conf
+++ b/configs/libnfc-brcm.conf
@@ -1,4 +1,4 @@
-###################### Start of libnfc-common.conf #######################
+###################### Start of libnfc-brcm.conf #######################
 
 ###############################################################################
 # Application options
@@ -145,12 +145,11 @@ NFA_HCI_STATIC_PIPE_ID_C0=0x19
 # Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
 UICC_LISTEN_TECH_MASK=0x07
 
-# Forcing HOST to listen for a selected technology
-# 0x00 : Disable Host Listen
-# 0x01 : Enable Host Listen for Tech A
-# 0x02 : Enable Host Listen for Tech B
-# 0x03 : Enable Host Listen for Tech AB
-HOST_LISTEN_TECH_MASK=0x03
+###############################################################################
+# Force HOST listen feature enable or disable.
+# 0: Disable
+# 1: Enable
+HOST_LISTEN_ENABLE=0x01
 
 ###############################################################################
 # Enabling/Disabling Forward functionality
@@ -306,7 +305,6 @@ MAX_RF_DATA_CREDITS=1
 # array[1] = 0xC8 is PREINIT_DSP_CFG
 #PREINIT_DSP_CFG={20:C8:1E:06:1F:00:0F:03:3C:00:04:24:00:1C:00:75:00:77:00:76:00:1C:00:03:00:0A:00:48:01:00:00:40:04}
 
-
 ###############################################################################
 # Choose the presence-check algorithm for type-4 tag.  If not defined, the default value is 1.
 # 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
@@ -328,8 +326,8 @@ PRESENCE_CHECK_ALGORITHM=1
 # NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
 # NFA_TECHNOLOGY_MASK_B             0x02    /* NFC Technology B             */
 # NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
-# NFA_TECHNOLOGY_MASK_ISO15693	    0x08    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_KOVIO	    0x20    /* Proprietary Technology       */
+# NFA_TECHNOLOGY_MASK_ISO15693      0x08    /* Proprietary Technology       */
+# NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
 POLLING_TECH_MASK=0xEF
@@ -341,8 +339,8 @@ POLLING_TECH_MASK=0xEF
 #            NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE
 #
 # Notable bits:
-# NFA_TECHNOLOGY_MASK_A	            0x01    /* NFC Technology A             */
-# NFA_TECHNOLOGY_MASK_F	            0x04    /* NFC Technology F             */
+# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
+# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
 # NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
 # NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
 P2P_LISTEN_TECH_MASK=0xC5
@@ -364,12 +362,12 @@ NFA_MAX_EE_SUPPORTED=0x02
 
 ###############################################################################
 # NCI Hal Module name
-NCI_HAL_MODULE="nfc_nci.pn54x"
+NCI_HAL_MODULE="nfc_nci"
 
 ##############################################################################
 # Deactivate notification wait time out in seconds used in ETSI Reader mode
 # 0 - Infinite wait
-NFA_DM_DISC_NTF_TIMEOUT=100
+#NFA_DM_DISC_NTF_TIMEOUT=0
 
 ###############################################################################
 # AID_MATCHING constants
@@ -396,8 +394,8 @@ DEFAULT_OFFHOST_ROUTE=0x02
 #  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
 NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:70:FF:FF}
 
-#################################################################################
+###############################################################################
 # Bail out mode
 #  If set to 1, NFCC is using bail out mode for either Type A or Type B poll.
 NFA_POLL_BAIL_OUT_MODE=0x01
-#################################################################################
+
diff --git a/configs/libnfc-nxp.conf b/configs/libnfc-nxp.conf
index 1045d19..e9d140c 100644
--- a/configs/libnfc-nxp.conf
+++ b/configs/libnfc-nxp.conf
@@ -14,12 +14,12 @@
 # ANDROID_LOG_ERROR          0x01
 # ANDROID_LOG_SILENT         0x00
 #
-NXPLOG_EXTNS_LOGLEVEL=0x03
-NXPLOG_NCIHAL_LOGLEVEL=0x03
-NXPLOG_NCIX_LOGLEVEL=0x03
-NXPLOG_NCIR_LOGLEVEL=0x03
-NXPLOG_FWDNLD_LOGLEVEL=0x03
-NXPLOG_TML_LOGLEVEL=0x03
+NXPLOG_EXTNS_LOGLEVEL=0x01
+NXPLOG_NCIHAL_LOGLEVEL=0x01
+NXPLOG_NCIX_LOGLEVEL=0x01
+NXPLOG_NCIR_LOGLEVEL=0x01
+NXPLOG_FWDNLD_LOGLEVEL=0x01
+NXPLOG_TML_LOGLEVEL=0x01
 
 ###############################################################################
 # Nfc Device Node name