diff options
author | Steven Moreland <smoreland@google.com> | 2016-10-06 02:51:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-06 02:51:18 +0000 |
commit | ddfb00589c9cc3f153c3782d7406af0f7042bcef (patch) | |
tree | 22cdf7717ee09ac1520b73d9ef11b923f4fb2973 | |
parent | 24d833be70f1b137c514684f5df7df5d0e01034a (diff) | |
parent | 4c0666e744934471cb0ff15013bf553af11ff2df (diff) | |
download | libnfc-nci-ddfb00589c9cc3f153c3782d7406af0f7042bcef.tar.gz |
Merge "Revert "Revert "Revert "update NfcAdaptation to match style.""""android-n-mr1-preview-2android-n-mr1-preview-1
-rw-r--r-- | src/adaptation/NfcAdaptation.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp index 7c7337f..5cceb8a 100644 --- a/src/adaptation/NfcAdaptation.cpp +++ b/src/adaptation/NfcAdaptation.cpp @@ -84,14 +84,14 @@ class NfcClientCallback : public INfcClientCallback { }; virtual ~NfcClientCallback() = default; Return<void> sendEvent( - ::android::hardware::nfc::V1_0::NfcEvent event, - ::android::hardware::nfc::V1_0::NfcStatus event_status) override { + ::android::hardware::nfc::V1_0::nfc_event_t event, + ::android::hardware::nfc::V1_0::nfc_status_t event_status) override { mEventCallback ((UINT8)event, (tHAL_NFC_STATUS) event_status); return Void(); }; - Return<void> sendData(const ::android::hardware::nfc::V1_0::NfcData &data ) override { - ::android::hardware::nfc::V1_0::NfcData copy = data; - mDataCallback(copy.size(), ©[0]); + Return<void> sendData(const ::android::hardware::nfc::V1_0::nfc_data_t &data ) override { + ::android::hardware::nfc::V1_0::nfc_data_t copy = data; + mDataCallback(copy.data.size(), ©.data[0]); return Void(); }; private: @@ -492,8 +492,8 @@ void NfcAdaptation::HalWrite (UINT16 data_len, UINT8* p_data) { const char* func = "NfcAdaptation::HalWrite"; ALOGD ("%s", func); - ::android::hardware::nfc::V1_0::NfcData data; - data.setToExternal(p_data, data_len); + ::android::hardware::nfc::V1_0::nfc_data_t data; + data.data.setToExternal(p_data, data_len); mHal->write(data); } @@ -513,7 +513,7 @@ void NfcAdaptation::HalCoreInitialized (UINT16 data_len, UINT8* p_core_init_rsp_ hidl_vec<uint8_t> data; data.setToExternal(p_core_init_rsp_params, data_len); - mHal->coreInitialized(data); + mHal->core_initialized(data); } /******************************************************************************* @@ -534,7 +534,7 @@ BOOLEAN NfcAdaptation::HalPrediscover () const char* func = "NfcAdaptation::HalPrediscover"; ALOGD ("%s", func); BOOLEAN retval = FALSE; - mHal->prediscover(); + mHal->pre_discover(); return retval; } @@ -555,7 +555,7 @@ void NfcAdaptation::HalControlGranted () { const char* func = "NfcAdaptation::HalControlGranted"; ALOGD ("%s", func); - mHal->controlGranted(); + mHal->control_granted(); } /******************************************************************************* @@ -571,7 +571,7 @@ void NfcAdaptation::HalPowerCycle () { const char* func = "NfcAdaptation::HalPowerCycle"; ALOGD ("%s", func); - mHal->powerCycle(); + mHal->power_cycle(); } /******************************************************************************* |