Merge "NFC: Integrate constants, hal modifications and feature list"
diff --git a/halimpl/pn54x/hal/phNxpNciHal.h b/halimpl/pn54x/hal/phNxpNciHal.h
index 8870dcc..eed0e11 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.h
+++ b/halimpl/pn54x/hal/phNxpNciHal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
* Not a Contribution.
*
* Copyright (C) 2015 NXP Semiconductors
@@ -59,6 +59,7 @@
HAL_NFC_IOCTL_SET_JCP_DWNLD_ENABLE,
HAL_NFC_IOCTL_SET_JCP_DWNLD_DISABLE,
HAL_NFC_IOCTL_SET_NFC_SERVICE_PID,
+ HAL_NFC_IOCTL_REL_DWP_WAIT,
HAL_NFC_IOCTL_GET_FEATURE_LIST
};
diff --git a/halimpl/pn54x/inc/Nxp_Features.h b/halimpl/pn54x/inc/Nxp_Features.h
index 84ab3dc..e759ea0 100644
--- a/halimpl/pn54x/inc/Nxp_Features.h
+++ b/halimpl/pn54x/inc/Nxp_Features.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
* Not a Contribution.
*
* Copyright (C) 2012-2016 NXP Semiconductors
@@ -253,6 +253,7 @@
nfcFL.eseFL._LEGACY_APDU_GATE = true; \
nfcFL.eseFL._NFCC_ESE_UICC_CONCURRENT_ACCESS_PROTECTION = true; \
nfcFL.eseFL._ESE_DWP_SPI_SYNC_ENABLE = true; \
+ nfcFL.eseFL._NXP_ESE_VER = JCOP_VER_3_3; \
} \
else if (chipType == pn66T) \
{ \
@@ -269,6 +270,7 @@
nfcFL.eseFL._LEGACY_APDU_GATE = true; \
nfcFL.eseFL._NFCC_ESE_UICC_CONCURRENT_ACCESS_PROTECTION = true; \
nfcFL.eseFL._ESE_DWP_SPI_SYNC_ENABLE = true; \
+ nfcFL.eseFL._NXP_ESE_VER = JCOP_VER_3_3; \
} \
else if (chipType == pn65T) \
{ \
@@ -350,6 +352,10 @@
nfcFL.platformFL._NFCC_RESET_RSP_LEN = 0x10U; \
\
\
+ nfcFL.nfcMwFL._NCI_INTERFACE_UICC_DIRECT = 0x82; \
+ nfcFL.nfcMwFL._NCI_INTERFACE_ESE_DIRECT = 0x83; \
+ \
+ \
} \
else if (chipType == pn553) \
{ \
@@ -458,6 +464,7 @@
\
nfcFL.eseFL._ESE_FORCE_ENABLE = true; \
nfcFL.eseFL._ESE_ETSI12_PROP_INIT = true; \
+ nfcFL.platformFL._NFCC_RESET_RSP_LEN = 0x11U; \
\
\
nfcFL.nfcMwFL._NCI_INTERFACE_UICC_DIRECT = 0x82; \
@@ -496,6 +503,7 @@
\
nfcFL.nfcMwFL._NCI_INTERFACE_UICC_DIRECT = 0x81; \
nfcFL.nfcMwFL._NCI_INTERFACE_ESE_DIRECT = 0x82; \
+ nfcFL.platformFL._NFCC_RESET_RSP_LEN = 0x11U; \
\
\
SRTCPY_FW("libpn547_fw", "libpn547_fw_platform", \
diff --git a/src/hal/include/Nxp_Features.h b/src/hal/include/Nxp_Features.h
index 84ab3dc..e759ea0 100644
--- a/src/hal/include/Nxp_Features.h
+++ b/src/hal/include/Nxp_Features.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
* Not a Contribution.
*
* Copyright (C) 2012-2016 NXP Semiconductors
@@ -253,6 +253,7 @@
nfcFL.eseFL._LEGACY_APDU_GATE = true; \
nfcFL.eseFL._NFCC_ESE_UICC_CONCURRENT_ACCESS_PROTECTION = true; \
nfcFL.eseFL._ESE_DWP_SPI_SYNC_ENABLE = true; \
+ nfcFL.eseFL._NXP_ESE_VER = JCOP_VER_3_3; \
} \
else if (chipType == pn66T) \
{ \
@@ -269,6 +270,7 @@
nfcFL.eseFL._LEGACY_APDU_GATE = true; \
nfcFL.eseFL._NFCC_ESE_UICC_CONCURRENT_ACCESS_PROTECTION = true; \
nfcFL.eseFL._ESE_DWP_SPI_SYNC_ENABLE = true; \
+ nfcFL.eseFL._NXP_ESE_VER = JCOP_VER_3_3; \
} \
else if (chipType == pn65T) \
{ \
@@ -350,6 +352,10 @@
nfcFL.platformFL._NFCC_RESET_RSP_LEN = 0x10U; \
\
\
+ nfcFL.nfcMwFL._NCI_INTERFACE_UICC_DIRECT = 0x82; \
+ nfcFL.nfcMwFL._NCI_INTERFACE_ESE_DIRECT = 0x83; \
+ \
+ \
} \
else if (chipType == pn553) \
{ \
@@ -458,6 +464,7 @@
\
nfcFL.eseFL._ESE_FORCE_ENABLE = true; \
nfcFL.eseFL._ESE_ETSI12_PROP_INIT = true; \
+ nfcFL.platformFL._NFCC_RESET_RSP_LEN = 0x11U; \
\
\
nfcFL.nfcMwFL._NCI_INTERFACE_UICC_DIRECT = 0x82; \
@@ -496,6 +503,7 @@
\
nfcFL.nfcMwFL._NCI_INTERFACE_UICC_DIRECT = 0x81; \
nfcFL.nfcMwFL._NCI_INTERFACE_ESE_DIRECT = 0x82; \
+ nfcFL.platformFL._NFCC_RESET_RSP_LEN = 0x11U; \
\
\
SRTCPY_FW("libpn547_fw", "libpn547_fw_platform", \
diff --git a/src/hal/include/nfc_hal_api.h b/src/hal/include/nfc_hal_api.h
index ac873c8..ae2afc6 100644
--- a/src/hal/include/nfc_hal_api.h
+++ b/src/hal/include/nfc_hal_api.h
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016,2018, The Linux Foundation. All rights reserved.
* Not a Contribution.
*
* Copyright (C) 2015 NXP Semiconductors
@@ -191,6 +191,7 @@
HAL_NFC_IOCTL_SET_JCP_DWNLD_ENABLE,
HAL_NFC_IOCTL_SET_JCP_DWNLD_DISABLE,
HAL_NFC_IOCTL_SET_NFC_SERVICE_PID,
+ HAL_NFC_IOCTL_REL_DWP_WAIT,
HAL_NFC_IOCTL_GET_FEATURE_LIST
};