Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e397b737 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'nfc-style' 

* changes:
  nfc: update default implementation to match style.
  nfc: reflect style guide.
parents 954515f7 a74426d6

nfc/1.0/Android.mk

+12 −46
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal (nfc_data_t)

# Build types.hal (NfcEvent)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -23,16 +23,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_data_t

        android.hardware.nfc@1.0::types.NfcEvent



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_event_t)

# Build types.hal (NfcStatus)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -40,24 +40,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_event_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_status_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_status_t

        android.hardware.nfc@1.0::types.NfcStatus



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)
@@ -116,26 +99,9 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal (nfc_data_t)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_data_t



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_event_t)

# Build types.hal (NfcEvent)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -143,16 +109,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_event_t

        android.hardware.nfc@1.0::types.NfcEvent



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (nfc_status_t)

# Build types.hal (NfcStatus)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -160,7 +126,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) 
$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.nfc@1.0::types.nfc_status_t

        android.hardware.nfc@1.0::types.NfcStatus



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

nfc/1.0/INfc.hal

+15 −15
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ interface INfc { 
     * NCI initialization - ie accept CORE_RESET and subsequent commands through

     * the write() call.

     *

     * If open() returns 0, the NCI stack will wait for a HAL_NFC_OPEN_CPLT_EVT

     * If open() returns 0, the NCI stack will wait for a NfcEvent.OPEN_CPLT

     * before continuing.

     *

     * If open() returns any other value, the NCI stack will stop.
@@ -41,32 +41,32 @@ interface INfc { 
     * This method may queue writes and return immediately. The only

     * requirement is that the writes are executed in order.

     */

    write(nfc_data_t data) generates (int32_t retval);

    write(NfcData data) generates (int32_t retval);



    /*

     * core_initialized() is called after the CORE_INIT_RSP is received from the NFCC.

     * coreInitialized() is called after the CORE_INIT_RSP is received from the NFCC.

     * At this time, the HAL can do any chip-specific configuration.

     *

     * If core_initialized() returns 0, the NCI stack will wait for a HAL_NFC_POST_INIT_CPLT_EVT

     * If coreInitialized() returns 0, the NCI stack will wait for a NfcEvent.POST_INIT_CPLT

     * before continuing.

     *

     * If core_initialized() returns any other value, the NCI stack will continue

     * If coreInitialized() returns any other value, the NCI stack will continue

     * immediately.

     */

    core_initialized(vec<uint8_t> data) generates (int32_t retval);

    coreInitialized(NfcData data) generates (int32_t retval);



    /*

     * pre_discover is called every time before starting RF discovery.

     * prediscover is called every time before starting RF discovery.

     * It is a good place to do vendor-specific configuration that must be

     * performed every time RF discovery is about to be started.

     *

     * If pre_discover() returns 0, the NCI stack will wait for a HAL_NFC_PRE_DISCOVER_CPLT_EVT

     * If prediscover() returns 0, the NCI stack will wait for a NfcEvent.PREDISCOVER_CPLT

     * before continuing.

     *

     * If pre_discover() returns any other value, the NCI stack will start

     * If prediscover() returns any other value, the NCI stack will start

     * RF discovery immediately.

     */

    pre_discover() generates (int32_t retval);

    prediscover() generates (int32_t retval);



    /*

     * Close the NFC controller. Should free all resources.
@@ -75,15 +75,15 @@ interface INfc { 


    /*

     * Grant HAL the exclusive control to send NCI commands.

     * Called in response to HAL_REQUEST_CONTROL_EVT.

     * Called in response to NfcEvent.REQUEST_CONTROL.

     * Must only be called when there are no NCI commands pending.

     * HAL_RELEASE_CONTROL_EVT will notify when HAL no longer needs exclusive control.

     * NfcEvent.RELEASE_CONTROL will notify when HAL no longer needs exclusive control.

     */

    control_granted() generates (int32_t retval);

    controlGranted() generates (int32_t retval);



     /*

     * Restart controller by power cyle;

     * HAL_OPEN_CPLT_EVT will notify when operation is complete.

     * NfcEvent.OPEN_CPLT will notify when operation is complete.

     */

    power_cycle() generates (int32_t retval);

    powerCycle() generates (int32_t retval);

};

nfc/1.0/INfcClientCallback.hal

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ interface INfcClientCallback { 
     * The callback passed in from the NFC stack that the HAL

     * can use to pass events back to the stack.

     */

    sendEvent(nfc_event_t event, nfc_status_t event_status);

    sendEvent(NfcEvent event, NfcStatus status);



    /*

     * The callback passed in from the NFC stack that the HAL

     * can use to pass incomming data to the stack.

     */

    sendData(nfc_data_t data);

    sendData(NfcData data);

};

nfc/1.0/default/Nfc.cpp

+7 −7
Original line number Diff line number Diff line
@@ -19,19 +19,19 @@ Nfc::Nfc(nfc_nci_device_t* device) : mDevice(device) { 
// 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, event_callback, data_callback);

    return mDevice->open(mDevice, eventCallback, dataCallback);

}



::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::write(const hidl_vec<uint8_t>& data)  {

    return mDevice->write(mDevice, data.size(), &data[0]);

}



::android::hardware::Return<int32_t> Nfc::core_initialized(const hidl_vec<uint8_t>& data)  {

::android::hardware::Return<int32_t> Nfc::coreInitialized(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::pre_discover()  {

::android::hardware::Return<int32_t> Nfc::prediscover()  {

    return mDevice->pre_discover(mDevice);

}
@@ -39,11 +39,11 @@ Nfc::Nfc(nfc_nci_device_t* device) : mDevice(device) { 
    return mDevice->close(mDevice);

}



::android::hardware::Return<int32_t> Nfc::control_granted()  {

::android::hardware::Return<int32_t> Nfc::controlGranted()  {

    return mDevice->control_granted(mDevice);

}



::android::hardware::Return<int32_t> Nfc::power_cycle()  {

::android::hardware::Return<int32_t> Nfc::powerCycle()  {

    return mDevice->power_cycle(mDevice);

}

nfc/1.0/default/Nfc.h

+11 −12
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ namespace implementation { 


using ::android::hardware::nfc::V1_0::INfc;

using ::android::hardware::nfc::V1_0::INfcClientCallback;

using ::android::hardware::nfc::V1_0::nfc_data_t;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::hardware::hidl_vec;
@@ -23,23 +22,23 @@ using ::android::sp; 
struct Nfc : public INfc {

  Nfc(nfc_nci_device_t* device);

  ::android::hardware::Return<int32_t> open(const sp<INfcClientCallback>& clientCallback)  override;

  ::android::hardware::Return<int32_t> write(const nfc_data_t& data)  override;

  ::android::hardware::Return<int32_t> core_initialized(const hidl_vec<uint8_t>& data)  override;

  ::android::hardware::Return<int32_t> pre_discover()  override;

  ::android::hardware::Return<int32_t> write(const hidl_vec<uint8_t>& data)  override;

  ::android::hardware::Return<int32_t> coreInitialized(const hidl_vec<uint8_t>& data)  override;

  ::android::hardware::Return<int32_t> prediscover()  override;

  ::android::hardware::Return<int32_t> close()  override;

  ::android::hardware::Return<int32_t> control_granted()  override;

  ::android::hardware::Return<int32_t> power_cycle()  override;

  ::android::hardware::Return<int32_t> controlGranted()  override;

  ::android::hardware::Return<int32_t> powerCycle()  override;



  static void event_callback(uint8_t event, uint8_t status) {

  static void eventCallback(uint8_t event, uint8_t status) {

      if (mCallback != nullptr) {

          mCallback->sendEvent(

                  (::android::hardware::nfc::V1_0::nfc_event_t) event,

                  (::android::hardware::nfc::V1_0::nfc_status_t) status);

                  (::android::hardware::nfc::V1_0::NfcEvent) event,

                  (::android::hardware::nfc::V1_0::NfcStatus) status);

      }

  }

  static void data_callback(uint16_t data_len, uint8_t* p_data) {

      nfc_data_t data;

      data.data.setToExternal(p_data, data_len);

  static void dataCallback(uint16_t data_len, uint8_t* p_data) {

      hidl_vec<uint8_t> data;

      data.setToExternal(p_data, data_len);

      if (mCallback != nullptr) {

          mCallback->sendData(data);

      }