diff options
| author | Rob von Behren <jrvb@google.com> | 2011-09-16 15:05:25 -0700 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-09-20 23:28:26 -0500 |
| commit | 6dd948323de0f31b413c9f19a905f1c145c9c456 (patch) | |
| tree | 2f91ca33fbb6521fe21ad80f79e5e3c9c0d92a2c /src/phHciNfc.h | |
| parent | 71b688d07db1e7fd32a1e02f29b9779f0d0db377 (diff) | |
| download | external_libnfc-nxp-6dd948323de0f31b413c9f19a905f1c145c9c456.zip external_libnfc-nxp-6dd948323de0f31b413c9f19a905f1c145c9c456.tar.gz external_libnfc-nxp-6dd948323de0f31b413c9f19a905f1c145c9c456.tar.bz2 | |
Manual port of 6900b4 from gingerbread:
Patch to add Secure Download Mechanism in the libnfc
This patch permit to support secure download update and
also to avoid locking states in case of download failures
Bug: 5331837
Change-Id: Ia5b6d9baf57231b0193bbbe85c88c7df557017c6
Diffstat (limited to 'src/phHciNfc.h')
| -rw-r--r-- | src/phHciNfc.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/phHciNfc.h b/src/phHciNfc.h index f360413..4f52b4a 100644 --- a/src/phHciNfc.h +++ b/src/phHciNfc.h @@ -78,8 +78,9 @@ typedef enum phHciNfc_Init { HCI_SESSION = 0x00, - HCI_SELF_TEST, - HCI_CUSTOM_INIT + HCI_NFC_DEVICE_TEST, + HCI_CUSTOM_INIT, + HCI_SELF_TEST }phHciNfc_Init_t; /** \ingroup grp_hal_hci @@ -263,7 +264,7 @@ phHciNfc_Config_Discovery ( * of the HCI Layer. * \param[in] pHwRef pHwRef is the Information of * the Device Interface Link . - * \param[in] re_poll If True: Start re-polling of the target + * \param[in] discovery_type If True: Start re-polling of the target * after the Target Device is de-activated * or else - continue discovery with next * technology. @@ -279,7 +280,7 @@ phHciNfc_Config_Discovery ( phHciNfc_Restart_Discovery ( void *psHciHandle, void *pHwRef, - uint8_t repoll + uint8_t discovery_type ); @@ -495,10 +496,11 @@ phHciNfc_Config_Discovery ( * of the HCI Layer. * \param[in] pHwRef pHwRef is the Information of * the Device Interface Link . - * \param[in] re_poll If True: Start re-polling of the target - * after the Target Device is de-activated - * or else - continue discovery with next - * technology. + * \param[in] discovery_type If NFC_RF_DISCOVERY_REPOLL: Start re-polling of + * the target after the Target Device is + * de-activatedor if NFC_RF_DISCOVERY_CONTINUE - + * continue discovery with next technology or + * stop the discovery wheel. * * \retval NFCSTATUS_PENDING To De-select the remote target pending. * \retval NFCSTATUS_INVALID_PARAMETER One or more of the supplied parameters @@ -512,7 +514,7 @@ phHciNfc_Config_Discovery ( phHciNfc_Disconnect ( void *psHciHandle, void *pHwRef, - uint8_t re_poll + uint8_t discovery_type ); |