diff options
Diffstat (limited to 'nci/jni/NativeNfcAla.cpp')
| -rw-r--r-- | nci/jni/NativeNfcAla.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/nci/jni/NativeNfcAla.cpp b/nci/jni/NativeNfcAla.cpp index b6145283..99f14722 100644 --- a/nci/jni/NativeNfcAla.cpp +++ b/nci/jni/NativeNfcAla.cpp @@ -24,10 +24,9 @@ #include "DwpChannel.h" #include "SecureElement.h" #include "TransactionController.h" +#include "JcopManager.h" extern "C" { - #include "AlaLib.h" - #include "IChannel.h" #include "phNxpConfig.h" } #define LS_DEFAULT_VERSION 0x20 @@ -85,7 +84,7 @@ int nfcManager_GetAppletsList(JNIEnv* e, jobject o, jobjectArray list) startRfDiscovery (false); } ALOGV("%s: list_len=0x%x", __func__, list_len); - ALA_GetlistofApplets(name, &num); + pJcopMgr->AlaGetlistofApplets(name, &num); if((num != 0) && (list_len >= num)) @@ -158,7 +157,7 @@ int nfcManager_doAppletLoadApplet(JNIEnv* e, jobject o, jstring name, jbyteArray startRfDiscovery (false); } DWPChannel_init(&Dwp); - wStatus = ALA_Init(&Dwp); + wStatus = pJcopMgr->AlaInitialize(&Dwp); if(wStatus != NFA_STATUS_OK) { ALOGE("%s: ALA initialization failed", __func__); @@ -171,9 +170,9 @@ int nfcManager_doAppletLoadApplet(JNIEnv* e, jobject o, jstring name, jbyteArray ScopedByteArrayRO bytes(e, data); uint8_t* buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0])); size_t bufLen = bytes.size(); - wStatus = ALA_Start(choice, buf, bufLen); + wStatus = pJcopMgr->AlaStart(choice, buf, bufLen); } - stat = ALA_DeInit(); + stat = pJcopMgr->AlaDeInitialize(); if(choice != NULL) e->ReleaseStringUTFChars(name, choice); @@ -240,7 +239,7 @@ jbyteArray nfcManager_lsExecuteScript(JNIEnv* e, jobject o, jstring name, jstrin startRfDiscovery (false); } DWPChannel_init(&Dwp); - wStatus = ALA_Init(&Dwp); + wStatus = pJcopMgr->AlaInitialize(&Dwp); if(wStatus != NFA_STATUS_OK) { ALOGE("%s: ALA initialization failed", __func__); @@ -267,7 +266,7 @@ jbyteArray nfcManager_lsExecuteScript(JNIEnv* e, jobject o, jstring name, jstrin ScopedByteArrayRO bytes(e, data); uint8_t* buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0])); size_t bufLen = bytes.size(); - wStatus = ALA_Start(choice,destpath, buf, bufLen,resSW); + wStatus = pJcopMgr->AlaStart(choice,destpath, buf, bufLen,resSW); //copy results back to java result = e->NewByteArray(lsExecuteResponseSize); @@ -286,7 +285,7 @@ jbyteArray nfcManager_lsExecuteScript(JNIEnv* e, jobject o, jstring name, jstrin sNfaVSCResponseEvent.wait(); //wait for NFA VS command to finish }*/ - stat = ALA_DeInit(); + stat = pJcopMgr->AlaDeInitialize(); if(choice != NULL) e->ReleaseStringUTFChars(name, choice); @@ -341,7 +340,7 @@ jbyteArray nfcManager_GetCertificateKey(JNIEnv* e, jobject) startRfDiscovery (false); } DWPChannel_init(&Dwp); - wStatus = ALA_Init(&Dwp); + wStatus = pJcopMgr->AlaInitialize(&Dwp); if(wStatus != NFA_STATUS_OK) { ALOGE("%s: ALA initialization failed", __func__); @@ -349,7 +348,7 @@ jbyteArray nfcManager_GetCertificateKey(JNIEnv* e, jobject) else { ALOGE("%s: start Get reference Certificate Key", __func__); - wStatus = ALA_GetCertificateKey(recvBuffer, &recvBufferActualSize); + wStatus = pJcopMgr->AlaGetCertificateKey(recvBuffer, &recvBufferActualSize); } //copy results back to java @@ -359,7 +358,7 @@ jbyteArray nfcManager_GetCertificateKey(JNIEnv* e, jobject) e->SetByteArrayRegion(result, 0, recvBufferActualSize, (jbyte *) recvBuffer); } - stat = ALA_DeInit(); + stat = pJcopMgr->AlaDeInitialize(); startRfDiscovery (true); ALOGV("%s: exit: recv len=%ld", __func__, recvBufferActualSize); @@ -407,7 +406,7 @@ jbyteArray nfcManager_lsGetVersion(JNIEnv* e, jobject) startRfDiscovery (false); } DWPChannel_init(&Dwp); - wStatus = ALA_Init(&Dwp); + wStatus = pJcopMgr->AlaInitialize(&Dwp); if(wStatus != NFA_STATUS_OK) { ALOGE("%s: ALA initialization failed", __func__); @@ -415,7 +414,7 @@ jbyteArray nfcManager_lsGetVersion(JNIEnv* e, jobject) else { ALOGE("%s: start Get reference Certificate Key", __func__); - wStatus = ALA_lsGetVersion(recvBuffer); + wStatus = pJcopMgr->AlaLsGetVersion(recvBuffer); } //copy results back to java @@ -425,7 +424,7 @@ jbyteArray nfcManager_lsGetVersion(JNIEnv* e, jobject) e->SetByteArrayRegion(result, 0, recvBufferMaxSize, (jbyte *) recvBuffer); } - stat = ALA_DeInit(); + stat = pJcopMgr->AlaDeInitialize(); if(dwpChannelForceClose == false) startRfDiscovery (true); @@ -472,7 +471,7 @@ jbyteArray nfcManager_lsGetAppletStatus(JNIEnv* e, jobject) startRfDiscovery (false); } DWPChannel_init(&Dwp); - wStatus = ALA_Init(&Dwp); + wStatus = pJcopMgr->AlaInitialize(&Dwp); if(wStatus != NFA_STATUS_OK) { ALOGE("%s: ALA initialization failed", __func__); @@ -480,7 +479,7 @@ jbyteArray nfcManager_lsGetAppletStatus(JNIEnv* e, jobject) else { ALOGE("%s: start Get reference Certificate Key", __func__); - wStatus = ALA_lsGetAppletStatus(recvBuffer); + wStatus = pJcopMgr->AlaLsGetAppletStatus(recvBuffer); } ALOGV("%s: lsGetAppletStatus values %x %x", __func__, recvBuffer[0], recvBuffer[1]); @@ -490,7 +489,7 @@ jbyteArray nfcManager_lsGetAppletStatus(JNIEnv* e, jobject) { e->SetByteArrayRegion(result, 0, recvBufferMaxSize, (jbyte *) recvBuffer); } - stat = ALA_DeInit(); + stat = pJcopMgr->AlaDeInitialize(); if(dwpChannelForceClose == false) startRfDiscovery (true); @@ -526,7 +525,7 @@ jbyteArray nfcManager_lsGetStatus(JNIEnv* e, jobject) const int32_t recvBufferMaxSize = 2; uint8_t recvBuffer [recvBufferMaxSize] = {0x63,0x40}; - wStatus = ALA_lsGetStatus(recvBuffer); + wStatus = pJcopMgr->AlaLsGetStatus(recvBuffer); ALOGV("%s: lsGetStatus values %x %x", __func__, recvBuffer[0], recvBuffer[1]); //copy results back to java |