summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Chu <evanchu@broadcom.com>2012-09-06 08:19:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 08:19:01 -0700
commitcff4b0c30c21af65fb9f3fe2606d1e62bc29af1b (patch)
treedffd3fd83e78cf88186b9e67255c665883c01c79
parent15890a0c6fcce207e25a9f9357f194b3297fca41 (diff)
parent3463d49a81556279bb0c4c74d9f4c9fd49ee61af (diff)
downloadpackages_apps_nfc-cff4b0c30c21af65fb9f3fe2606d1e62bc29af1b.zip
packages_apps_nfc-cff4b0c30c21af65fb9f3fe2606d1e62bc29af1b.tar.gz
packages_apps_nfc-cff4b0c30c21af65fb9f3fe2606d1e62bc29af1b.tar.bz2
am 3463d49a: Correct spelling.
* commit '3463d49a81556279bb0c4c74d9f4c9fd49ee61af': Correct spelling.
-rwxr-xr-xnci/jni/NativeNfcManager.cpp4
-rwxr-xr-xnci/jni/NativeNfcTag.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index da9b242..14e9cb9 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -47,7 +47,7 @@ namespace android
{
extern bool gIsTagDeactivating;
extern bool gIsSelectingRfInterface;
- extern void nativeNfcTag_doTranseiveStatus (uint8_t * buf, uint32_t buflen);
+ extern void nativeNfcTag_doTransceiveStatus (uint8_t * buf, uint32_t buflen);
extern void nativeNfcTag_doConnectStatus (jboolean is_connect_ok);
extern void nativeNfcTag_doDeactivateStatus (int status);
extern void nativeNfcTag_doWriteStatus (jboolean is_write_ok);
@@ -344,7 +344,7 @@ static void nfaConnectionCallback (UINT8 connEvent, tNFA_CONN_EVT_DATA* eventDat
case NFA_DATA_EVT: // Data message received (for non-NDEF reads)
ALOGD("%s: NFA_DATA_EVT: len = %d", __FUNCTION__, eventData->data.len);
- nativeNfcTag_doTranseiveStatus(eventData->data.p_data,eventData->data.len);
+ nativeNfcTag_doTransceiveStatus(eventData->data.p_data,eventData->data.len);
break;
case NFA_SELECT_CPLT_EVT: // Select completed
diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index f4b345d..b4b517b 100755
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -726,7 +726,7 @@ TheEnd:
/*******************************************************************************
**
-** Function: nativeNfcTag_doTranseiveStatus
+** Function: nativeNfcTag_doTransceiveStatus
**
** Description: Receive the completion status of transceive operation.
** buf: Contains tag's response.
@@ -735,7 +735,7 @@ TheEnd:
** Returns: None
**
*******************************************************************************/
-void nativeNfcTag_doTranseiveStatus (uint8_t* buf, uint32_t bufLen)
+void nativeNfcTag_doTransceiveStatus (uint8_t* buf, uint32_t bufLen)
{
ALOGD ("%s: data len=%d, waiting for transceive: %d", __FUNCTION__, bufLen, sWaitingForTransceive);
if (!sWaitingForTransceive)