commit 6d4d41261731f4e286054aa6a245d34bdeb00b7c
author Steven Moreland <smoreland@google.com> Thu Oct 06 02:49:36 2016 +0000
committer Steven Moreland <smoreland@google.com> Thu Oct 06 02:50:58 2016 +0000
tree c73215f60a9f38687752c5d6874cb01fb01173b9
parent e57188f95e2f308200a63062b931a37c3b3a461c

Revert "Revert "Revert "nfc: update default implementation to match style."""

This reverts commit 22be21e8647a587ee8f2effb57f38c793d90c2c5.

Change-Id: I0534b0eb87623091685fa0e2d94d744d2aeaa4ca

nfc/1.0/default/Nfc.cpp

diff --git a/nfc/1.0/default/Nfc.cpp b/nfc/1.0/default/Nfc.cpp
index d3868c1..b836ada 100644
--- a/nfc/1.0/default/Nfc.cpp
+++ b/nfc/1.0/default/Nfc.cpp
@@ -19,19 +19,19 @@
 // Methods from ::android::hardware::nfc::V1_0::INfc follow.
 ::android::hardware::Return<int32_t> Nfc::open(const sp<INfcClientCallback>& clientCallback)  {
     mCallback = clientCallback;
-    return mDevice->open(mDevice, eventCallback, dataCallback);
+    return mDevice->open(mDevice, event_callback, data_callback);
 }
 
-::android::hardware::Return<int32_t> Nfc::write(const hidl_vec<uint8_t>& data)  {
-    return mDevice->write(mDevice, data.size(), &data[0]);
+::android::hardware::Return<int32_t> Nfc::write(const nfc_data_t& data)  {
+    return mDevice->write(mDevice, data.data.size(), &data.data[0]);
 }
 
-::android::hardware::Return<int32_t> Nfc::coreInitialized(const hidl_vec<uint8_t>& data)  {
+::android::hardware::Return<int32_t> Nfc::core_initialized(const hidl_vec<uint8_t>& data)  {
     hidl_vec<uint8_t> copy = data;
     return mDevice->core_initialized(mDevice, &copy[0]);
 }
 
-::android::hardware::Return<int32_t> Nfc::prediscover()  {
+::android::hardware::Return<int32_t> Nfc::pre_discover()  {
     return mDevice->pre_discover(mDevice);
 }
 
@@ -39,11 +39,11 @@
     return mDevice->close(mDevice);
 }
 
-::android::hardware::Return<int32_t> Nfc::controlGranted()  {
+::android::hardware::Return<int32_t> Nfc::control_granted()  {
     return mDevice->control_granted(mDevice);
 }
 
-::android::hardware::Return<int32_t> Nfc::powerCycle()  {
+::android::hardware::Return<int32_t> Nfc::power_cycle()  {
     return mDevice->power_cycle(mDevice);
 }