commit 0976d37081fae8bcd4fc4dcf7996e1ce194fb4b1
author Evan Chu <evanchu@broadcom.com> Tue Apr 30 14:49:29 2013 -0400
committer Martijn Coenen <maco@google.com> Mon Aug 05 08:56:44 2013 -0700
tree 8293f50fbe54cc35bde4689eea5eae6dcbab9c04
parent 86fd6a04f7f057d7e0b9f456e567a6e2385af153

Output software version strings.

Change-Id: I4be1b5f970300bdf23400be678d802beba65a5d7

Android.mk

diff --git a/Android.mk b/Android.mk
index 70d7109..0e687be 100755
--- a/Android.mk
+++ b/Android.mk
@@ -56,7 +56,8 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_SRC_FILES := $(call all-c-files-under, $(HALIMPL)) \
     $(call all-cpp-files-under, $(HALIMPL)) \
-    src/adaptation/CrcChecksum.cpp
+    src/adaptation/CrcChecksum.cpp \
+    src//nfca_version.c
 LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware_legacy libstlport
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := external/stlport/stlport bionic/ bionic/libstdc++/include \

halimpl/bcm2079x/adaptation/HalAdaptation.cpp

diff --git a/halimpl/bcm2079x/adaptation/HalAdaptation.cpp b/halimpl/bcm2079x/adaptation/HalAdaptation.cpp
index 8e28e13..ab2301f 100644
--- a/halimpl/bcm2079x/adaptation/HalAdaptation.cpp
+++ b/halimpl/bcm2079x/adaptation/HalAdaptation.cpp
@@ -57,6 +57,8 @@
 static void BroadcomHalDataCallback (UINT16 data_len, UINT8* p_data);
 
 extern tNFC_HAL_CFG *p_nfc_hal_cfg;
+extern const UINT8  nfca_version_string [];
+extern const UINT8  nfa_version_string [];
 
 ///////////////////////////////////////
 
@@ -64,6 +66,7 @@
 int HaiInitializeLibrary (const bcm2079x_dev_t* device)
 {
     ALOGD ("%s: enter", __FUNCTION__);
+    ALOGE ("%s: ver=%s nfa=%s", __FUNCTION__, nfca_version_string, nfa_version_string);
     int retval = EACCES;
     unsigned long freq = 0;
     unsigned long num = 0;

src/adaptation/NfcAdaptation.cpp

diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index 51d9a92..945de1e 100755
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -47,6 +47,8 @@
 static UINT8 nfa_dm_cfg[sizeof ( tNFA_DM_CFG ) ];
 extern tNFA_DM_CFG *p_nfa_dm_cfg;
 extern UINT8 nfa_ee_max_ee_cfg;
+extern const UINT8  nfca_version_string [];
+extern const UINT8  nfa_version_string [];
 
 /*******************************************************************************
 **
@@ -105,7 +107,8 @@
 void NfcAdaptation::Initialize ()
 {
     const char* func = "NfcAdaptation::Initialize";
-    ALOGD("%s: enter\n", func);
+    ALOGD("%s: enter", func);
+    ALOGE("%s: ver=%s nfa=%s", func, nfca_version_string, nfa_version_string);
     unsigned long num;
 
     if ( !GetStrValue ( NAME_NFA_STORAGE, bcm_nfc_location, sizeof ( bcm_nfc_location ) ) )