diff options
| author | Martijn Coenen <maco@google.com> | 2016-09-29 07:41:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-29 07:41:34 +0000 |
| commit | f97ec6035305315cbaabaf1382e4cd20057e79c0 (patch) | |
| tree | ff17fa1a427f423075687c91e58f73ebeb6ddec5 /src/include/NfcAdaptation.h | |
| parent | e1da65f1575fc3536b54d985e3350e2b956ee15a (diff) | |
| parent | e9e48e5c716096c2303b9b3f3b9ff44fd37caeec (diff) | |
| download | libnfc-nci-f97ec6035305315cbaabaf1382e4cd20057e79c0.tar.gz | |
Merge "Switch to using the NFC HIDL HAL."
Diffstat (limited to 'src/include/NfcAdaptation.h')
| -rw-r--r-- | src/include/NfcAdaptation.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/include/NfcAdaptation.h b/src/include/NfcAdaptation.h index bd9afcc..b1dd2fc 100644 --- a/src/include/NfcAdaptation.h +++ b/src/include/NfcAdaptation.h @@ -22,8 +22,16 @@ typedef unsigned long UINT32; #endif #include "nfc_target.h" #include "nfc_hal_api.h" -#include <hardware/nfc.h> +#include <utils/RefBase.h> + +namespace android { +namespace hardware { +namespace nfc { +namespace V1_0 { + struct INfc; + struct INfcClientCallback; +} } } } class ThreadMutex { @@ -79,6 +87,8 @@ private: ThreadCondVar mCondVar; tHAL_NFC_ENTRY mHalEntryFuncs; // function pointers for HAL entry points static nfc_nci_device_t* mHalDeviceContext; + static android::sp<android::hardware::nfc::V1_0::INfc> mHal; + static android::hardware::nfc::V1_0::INfcClientCallback* mCallback; static tHAL_NFC_CBACK* mHalCallback; static tHAL_NFC_DATA_CBACK* mHalDataCallback; static ThreadCondVar mHalOpenCompletedEvent; @@ -94,7 +104,7 @@ private: static void HalTerminate (); static void HalOpen (tHAL_NFC_CBACK* p_hal_cback, tHAL_NFC_DATA_CBACK* p_data_cback); static void HalClose (); - static void HalCoreInitialized (UINT8* p_core_init_rsp_params); + static void HalCoreInitialized (UINT16 data_len, UINT8* p_core_init_rsp_params); static void HalWrite (UINT16 data_len, UINT8* p_data); static BOOLEAN HalPrediscover (); static void HalControlGranted (); @@ -103,4 +113,3 @@ private: static void HalDownloadFirmwareCallback (nfc_event_t event, nfc_status_t event_status); static void HalDownloadFirmwareDataCallback (uint16_t data_len, uint8_t* p_data); }; - |