diff options
| -rwxr-xr-x | nci/jni/NativeNfcManager.cpp | 3 | ||||
| -rw-r--r-- | nci/jni/PeerToPeer.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 0850f8a..330e38d 100755 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -671,8 +671,9 @@ static jboolean nfcManager_doInitialize (JNIEnv* e, jobject o) { unsigned long num = 0; - tBRCM_DEV_INIT_CONFIG devInitConfig = {0}; + tBRCM_DEV_INIT_CONFIG devInitConfig; + memset (&devInitConfig, 0, sizeof(devInitConfig)); NfcAdaptation& theInstance = NfcAdaptation::GetInstance(); theInstance.Initialize(); //start GKI, NCI task, NFC task diff --git a/nci/jni/PeerToPeer.cpp b/nci/jni/PeerToPeer.cpp index 1272bf9..0622ac0 100644 --- a/nci/jni/PeerToPeer.cpp +++ b/nci/jni/PeerToPeer.cpp @@ -745,7 +745,7 @@ bool PeerToPeer::connectConnOriented (tBRCM_JNI_HANDLE jniHandle, const char* se // Save JNI Handle and try to connect to SNEP mJniHandleSendingNppViaSnep = jniHandle; - if (NFA_SnepConnect (mSnepRegHandle, "urn:nfc:sn:snep") == NFA_STATUS_OK) + if (NFA_SnepConnect (mSnepRegHandle, const_cast<char*>("urn:nfc:sn:snep")) == NFA_STATUS_OK) { SyncEventGuard guard (pClient->mSnepEvent); pClient->mSnepEvent.wait(); |