commit dc32f29961924ec56136d2089401481dcd591c95
author Steven Moreland <smoreland@google.com> Thu Sep 29 11:18:21 2016 -0700
committer Rohit Rangwani <rrangwan@codeaurora.org> Fri Apr 07 19:42:17 2017 +0530
tree a474dd7e5c8d9907d32db8d4c536263884d7ef27
parent 634b0e92547bde2b036f2276973d7b7bce03044c

update NfcAdaptation to match style.

Test: make libnfc-nci
Change-Id: Ifc087e16025ebd734f0b472600e0d8fe921d7f38
(cherry picked from commit 09ea22663312135b9a542ac8c20274de75799cc5)

src/adaptation/NfcAdaptation.cpp

diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index e796713..082fecc 100644
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -103,14 +103,14 @@
     };
     virtual ~NfcClientCallback() = default;
     Return<void> sendEvent(
-            ::android::hardware::nfc::V1_0::nfc_event_t event,
-            ::android::hardware::nfc::V1_0::nfc_status_t event_status) override {
+            ::android::hardware::nfc::V1_0::NfcEvent event,
+            ::android::hardware::nfc::V1_0::NfcStatus event_status) override {
       mEventCallback ((UINT8)event, (tHAL_NFC_STATUS) event_status);
       return Void();
     };
-    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(), &copy.data[0]);
+    Return<void> sendData(const ::android::hardware::nfc::V1_0::NfcData &data ) override {
+      ::android::hardware::nfc::V1_0::NfcData copy = data;
+      mDataCallback(copy.size(), &copy[0]);
       return Void();
     };
   private:
@@ -554,8 +554,8 @@
 {
     const char* func = "NfcAdaptation::HalWrite";
     ALOGD ("%s", func);
-    ::android::hardware::nfc::V1_0::nfc_data_t data;
-    data.data.setToExternal(p_data, data_len);
+    ::android::hardware::nfc::V1_0::NfcData data;
+    data.setToExternal(p_data, data_len);
     mHal->write(data);
 }
 
@@ -634,7 +634,7 @@
     hidl_vec<uint8_t> data;
     data.setToExternal(p_core_init_rsp_params, data_len);
 
-    mHal->core_initialized(data);
+    mHal->coreInitialized(data);
 }
 
 /*******************************************************************************
@@ -655,7 +655,7 @@
     const char* func = "NfcAdaptation::HalPrediscover";
     ALOGD ("%s", func);
     BOOLEAN retval = FALSE;
-    mHal->pre_discover();
+    mHal->prediscover();
     return retval;
 }
 
@@ -676,7 +676,7 @@
 {
     const char* func = "NfcAdaptation::HalControlGranted";
     ALOGD ("%s", func);
-    mHal->control_granted();
+    mHal->controlGranted();
 }
 
 /*******************************************************************************
@@ -692,7 +692,7 @@
 {
     const char* func = "NfcAdaptation::HalPowerCycle";
     ALOGD ("%s", func);
-    mHal->power_cycle();
+    mHal->powerCycle();
 }
 
 /*******************************************************************************