NFC: Integrate constants
Integrate constants from nfc.h, fix compile-time warning,
changed chip type, and modified device node in example
configuration files.
(Constants from nfc.h manually integrated from
file: hardware/libhardware/include/hardware/nfc.h
project: vendor/nxp/opensource/reference
branch: github-nxpnfc/br_android_ncihalx_m
commit: 907d4a5d0e6c784f22724068e77d2b4ff57c08c4)
Change-Id: I52e1c531ae63cce29fd9f6a22d6556241890f3da
diff --git a/Android.mk b/Android.mk
index 2d5d7e6..3837bd5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,7 +56,7 @@
endif
#### Select the CHIP ####
-NXP_CHIP_TYPE := $(PN551)
+NXP_CHIP_TYPE := $(PN548C2)
ifeq ($(NXP_CHIP_TYPE),$(PN547C2))
D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN547C2
diff --git a/halimpl/pn54x/Android.mk b/halimpl/pn54x/Android.mk
index c1665f8..e106215 100644
--- a/halimpl/pn54x/Android.mk
+++ b/halimpl/pn54x/Android.mk
@@ -45,7 +45,7 @@
endif
#### Select the CHIP ####
-NXP_CHIP_TYPE := $(PN551)
+NXP_CHIP_TYPE := $(PN548C2)
ifeq ($(NXP_CHIP_TYPE),$(PN547C2))
D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN547C2
diff --git a/halimpl/pn54x/hal/phNxpNciHal.h b/halimpl/pn54x/hal/phNxpNciHal.h
index 59954fa..787b207 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.h
+++ b/halimpl/pn54x/hal/phNxpNciHal.h
@@ -53,7 +53,9 @@
HAL_NFC_IOCTL_FW_DWNLD,
HAL_NFC_IOCTL_FW_MW_VER_CHECK,
HAL_NFC_IOCTL_DISABLE_HAL_LOG,
- HAL_NFC_IOCTL_NCI_TRANSCEIVE
+ HAL_NFC_IOCTL_NCI_TRANSCEIVE,
+ HAL_NFC_IOCTL_P61_GET_ACCESS,
+ HAL_NFC_IOCTL_P61_REL_ACCESS
};
typedef void (phNxpNciHal_control_granted_callback_t)();
diff --git a/halimpl/pn54x/libnfc-nxp-PN551_example.conf b/halimpl/pn54x/libnfc-nxp-PN551_example.conf
index 25be0df..8c978fd 100644
--- a/halimpl/pn54x/libnfc-nxp-PN551_example.conf
+++ b/halimpl/pn54x/libnfc-nxp-PN551_example.conf
@@ -19,7 +19,7 @@
###############################################################################
# Nfc Device Node name
-NXP_NFC_DEV_NODE="/dev/pn544"
+NXP_NFC_DEV_NODE="/dev/nq-nci"
###############################################################################
# Extension for Mifare reader enable
diff --git a/halimpl/pn54x/libnfc-nxp-PN67T_example.conf b/halimpl/pn54x/libnfc-nxp-PN67T_example.conf
index 5c5aabe..fe8dfd1 100644
--- a/halimpl/pn54x/libnfc-nxp-PN67T_example.conf
+++ b/halimpl/pn54x/libnfc-nxp-PN67T_example.conf
@@ -19,7 +19,7 @@
###############################################################################
# Nfc Device Node name
-NXP_NFC_DEV_NODE="/dev/pn544"
+NXP_NFC_DEV_NODE="/dev/nq-nci"
###############################################################################
# Extension for Mifare reader enable
@@ -394,4 +394,4 @@
#Enable/Disable block number checks for china transit use case
#Enable 0x01
#Disable 0x00
-NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE=0x01
\ No newline at end of file
+NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE=0x01
diff --git a/src/hal/include/nfc_hal_api.h b/src/hal/include/nfc_hal_api.h
index 6a3e8ce..d3526ab 100644
--- a/src/hal/include/nfc_hal_api.h
+++ b/src/hal/include/nfc_hal_api.h
@@ -100,7 +100,9 @@
HAL_NFC_IOCTL_FW_DWNLD,
HAL_NFC_IOCTL_FW_MW_VER_CHECK,
HAL_NFC_IOCTL_DISABLE_HAL_LOG,
- HAL_NFC_IOCTL_NCI_TRANSCEIVE
+ HAL_NFC_IOCTL_NCI_TRANSCEIVE,
+ HAL_NFC_IOCTL_P61_GET_ACCESS,
+ HAL_NFC_IOCTL_P61_REL_ACCESS
};
#endif
typedef void (tHAL_NFC_STATUS_CBACK) (tHAL_NFC_STATUS status);
diff --git a/src/nfa/dm/nfa_dm_discover.c b/src/nfa/dm/nfa_dm_discover.c
index 0ded941..aeb2bf1 100644
--- a/src/nfa/dm/nfa_dm_discover.c
+++ b/src/nfa/dm/nfa_dm_discover.c
@@ -3667,7 +3667,7 @@
#if(NXP_EXTNS == TRUE)
void nfa_dm_p2p_prio_logic_disable ()
{
- if(&p2p_prio_logic_data.timer_list.in_use)
+ if(p2p_prio_logic_data.timer_list.in_use)
nfc_stop_quick_timer (&p2p_prio_logic_data.timer_list);
memset (&p2p_prio_logic_data, 0x00, sizeof(nfa_dm_p2p_prio_logic_t));
}