Apply Clang-format from stable version
find * | grep "\.[ch]" | xargs
/platform/prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format
--style=file -i
Test: Nfc enable/disable
Change-Id: I7efa64395ec74269d6e4e36ae88c135300567842
diff --git a/nci/jni/CondVar.cpp b/nci/jni/CondVar.cpp
index 940c0f2..cd752ab 100644
--- a/nci/jni/CondVar.cpp
+++ b/nci/jni/CondVar.cpp
@@ -74,7 +74,7 @@
** Returns: None.
**
*******************************************************************************/
-void CondVar::wait(Mutex &mutex) {
+void CondVar::wait(Mutex& mutex) {
int const res = pthread_cond_wait(&mCondition, mutex.nativeHandle());
if (res) {
LOG(ERROR) << StringPrintf("CondVar::wait: fail wait; error=0x%X", res);
@@ -91,7 +91,7 @@
** Returns: True if wait is successful; false if timeout occurs.
**
*******************************************************************************/
-bool CondVar::wait(Mutex &mutex, long millisec) {
+bool CondVar::wait(Mutex& mutex, long millisec) {
bool retVal = false;
struct timespec absoluteTime;
@@ -113,7 +113,7 @@
if ((waitResult != 0) && (waitResult != ETIMEDOUT))
LOG(ERROR) << StringPrintf("CondVar::wait: fail timed wait; error=0x%X",
waitResult);
- retVal = (waitResult == 0); // waited successfully
+ retVal = (waitResult == 0); // waited successfully
return retVal;
}
diff --git a/nci/jni/CondVar.h b/nci/jni/CondVar.h
index a3d035c..a2be51f 100644
--- a/nci/jni/CondVar.h
+++ b/nci/jni/CondVar.h
@@ -19,11 +19,11 @@
*/
#pragma once
-#include "Mutex.h"
#include <pthread.h>
+#include "Mutex.h"
class CondVar {
-public:
+ public:
/*******************************************************************************
**
** Function: CondVar
@@ -55,7 +55,7 @@
** Returns: None.
**
*******************************************************************************/
- void wait(Mutex &mutex);
+ void wait(Mutex& mutex);
/*******************************************************************************
**
@@ -67,7 +67,7 @@
** Returns: True if wait is successful; false if timeout occurs.
**
*******************************************************************************/
- bool wait(Mutex &mutex, long millisec);
+ bool wait(Mutex& mutex, long millisec);
/*******************************************************************************
**
@@ -80,6 +80,6 @@
*******************************************************************************/
void notifyOne();
-private:
+ private:
pthread_cond_t mCondition;
};
diff --git a/nci/jni/DataQueue.cpp b/nci/jni/DataQueue.cpp
index a172477..58b6765 100644
--- a/nci/jni/DataQueue.cpp
+++ b/nci/jni/DataQueue.cpp
@@ -50,7 +50,7 @@
DataQueue::~DataQueue() {
mMutex.lock();
while (mQueue.empty() == false) {
- tHeader *header = mQueue.front();
+ tHeader* header = mQueue.front();
mQueue.pop_front();
free(header);
}
@@ -75,14 +75,13 @@
** Returns: True if ok.
**
*******************************************************************************/
-bool DataQueue::enqueue(uint8_t *data, uint16_t dataLen) {
- if ((data == NULL) || (dataLen == 0))
- return false;
+bool DataQueue::enqueue(uint8_t* data, uint16_t dataLen) {
+ if ((data == NULL) || (dataLen == 0)) return false;
mMutex.lock();
bool retval = false;
- tHeader *header = (tHeader *)malloc(sizeof(tHeader) + dataLen);
+ tHeader* header = (tHeader*)malloc(sizeof(tHeader) + dataLen);
if (header) {
memset(header, 0, sizeof(tHeader));
@@ -111,18 +110,18 @@
** Returns: True if ok.
**
*******************************************************************************/
-bool DataQueue::dequeue(uint8_t *buffer, uint16_t bufferMaxLen,
- uint16_t &actualLen) {
+bool DataQueue::dequeue(uint8_t* buffer, uint16_t bufferMaxLen,
+ uint16_t& actualLen) {
mMutex.lock();
- tHeader *header = mQueue.front();
+ tHeader* header = mQueue.front();
bool retval = false;
if (header && buffer && (bufferMaxLen > 0)) {
if (header->mDataLen <= bufferMaxLen) {
// caller's buffer is big enough to store all data
actualLen = header->mDataLen;
- char *src = (char *)(header) + sizeof(tHeader) + header->mOffset;
+ char* src = (char*)(header) + sizeof(tHeader) + header->mOffset;
memcpy(buffer, src, actualLen);
mQueue.pop_front();
@@ -130,7 +129,7 @@
} else {
// caller's buffer is too small
actualLen = bufferMaxLen;
- char *src = (char *)(header) + sizeof(tHeader) + header->mOffset;
+ char* src = (char*)(header) + sizeof(tHeader) + header->mOffset;
memcpy(buffer, src, actualLen);
// adjust offset so the next dequeue() will get the remainder
header->mDataLen -= actualLen;
diff --git a/nci/jni/DataQueue.h b/nci/jni/DataQueue.h
index 75d5b78..da1acf6 100644
--- a/nci/jni/DataQueue.h
+++ b/nci/jni/DataQueue.h
@@ -19,13 +19,13 @@
*/
#pragma once
+#include <list>
#include "Mutex.h"
#include "NfcJniUtil.h"
#include "gki.h"
-#include <list>
class DataQueue {
-public:
+ public:
/*******************************************************************************
**
** Function: DataQueue
@@ -59,7 +59,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- bool enqueue(uint8_t *data, uint16_t dataLen);
+ bool enqueue(uint8_t* data, uint16_t dataLen);
/*******************************************************************************
**
@@ -73,7 +73,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- bool dequeue(uint8_t *buffer, uint16_t bufferMaxLen, uint16_t &actualLen);
+ bool dequeue(uint8_t* buffer, uint16_t bufferMaxLen, uint16_t& actualLen);
/*******************************************************************************
**
@@ -86,12 +86,12 @@
*******************************************************************************/
bool isEmpty();
-private:
+ private:
struct tHeader {
- uint16_t mDataLen; // number of octets of data
- uint16_t mOffset; // offset of the first octet of data
+ uint16_t mDataLen; // number of octets of data
+ uint16_t mOffset; // offset of the first octet of data
};
- typedef std::list<tHeader *> Queue;
+ typedef std::list<tHeader*> Queue;
Queue mQueue;
Mutex mMutex;
diff --git a/nci/jni/IntervalTimer.cpp b/nci/jni/IntervalTimer.cpp
index 66d622e..1533dc7 100644
--- a/nci/jni/IntervalTimer.cpp
+++ b/nci/jni/IntervalTimer.cpp
@@ -28,16 +28,13 @@
bool IntervalTimer::set(int ms, TIMER_FUNC cb) {
if (mTimerId == 0) {
- if (cb == NULL)
- return false;
+ if (cb == NULL) return false;
- if (!create(cb))
- return false;
+ if (!create(cb)) return false;
}
if (cb != mCb) {
kill();
- if (!create(cb))
- return false;
+ if (!create(cb)) return false;
}
int stat = 0;
@@ -49,16 +46,14 @@
ts.it_interval.tv_nsec = 0;
stat = timer_settime(mTimerId, 0, &ts, 0);
- if (stat == -1)
- LOG(ERROR) << StringPrintf("fail set timer");
+ if (stat == -1) LOG(ERROR) << StringPrintf("fail set timer");
return stat == 0;
}
IntervalTimer::~IntervalTimer() { kill(); }
void IntervalTimer::kill() {
- if (mTimerId == 0)
- return;
+ if (mTimerId == 0) return;
timer_delete(mTimerId);
mTimerId = 0;
@@ -79,7 +74,6 @@
se.sigev_notify_attributes = NULL;
mCb = cb;
stat = timer_create(CLOCK_MONOTONIC, &se, &mTimerId);
- if (stat == -1)
- LOG(ERROR) << StringPrintf("fail create timer");
+ if (stat == -1) LOG(ERROR) << StringPrintf("fail create timer");
return stat == 0;
}
diff --git a/nci/jni/IntervalTimer.h b/nci/jni/IntervalTimer.h
index 5584f03..de1a1d5 100644
--- a/nci/jni/IntervalTimer.h
+++ b/nci/jni/IntervalTimer.h
@@ -21,7 +21,7 @@
#include <time.h>
class IntervalTimer {
-public:
+ public:
typedef void (*TIMER_FUNC)(union sigval);
IntervalTimer();
@@ -30,7 +30,7 @@
void kill();
bool create(TIMER_FUNC);
-private:
+ private:
timer_t mTimerId;
TIMER_FUNC mCb;
};
diff --git a/nci/jni/JavaClassConstants.h b/nci/jni/JavaClassConstants.h
index c02b537..23f6042 100644
--- a/nci/jni/JavaClassConstants.h
+++ b/nci/jni/JavaClassConstants.h
@@ -30,10 +30,10 @@
extern jmethodID gCachedNfcManagerNotifyHostEmuData;
extern jmethodID gCachedNfcManagerNotifyHostEmuDeactivated;
-extern const char *gNativeP2pDeviceClassName;
-extern const char *gNativeLlcpServiceSocketClassName;
-extern const char *gNativeLlcpConnectionlessSocketClassName;
-extern const char *gNativeLlcpSocketClassName;
-extern const char *gNativeNfcTagClassName;
-extern const char *gNativeNfcManagerClassName;
-} // namespace android
+extern const char* gNativeP2pDeviceClassName;
+extern const char* gNativeLlcpServiceSocketClassName;
+extern const char* gNativeLlcpConnectionlessSocketClassName;
+extern const char* gNativeLlcpSocketClassName;
+extern const char* gNativeNfcTagClassName;
+extern const char* gNativeNfcManagerClassName;
+} // namespace android
diff --git a/nci/jni/Mutex.cpp b/nci/jni/Mutex.cpp
index 0e80f58..a3d955b 100644
--- a/nci/jni/Mutex.cpp
+++ b/nci/jni/Mutex.cpp
@@ -24,8 +24,8 @@
#include <errno.h>
#include <string.h>
-#include "_OverrideLog.h"
#include <base/logging.h>
+#include "_OverrideLog.h"
/*******************************************************************************
**
@@ -118,4 +118,4 @@
** Returns: Handle of the mutex.
**
*******************************************************************************/
-pthread_mutex_t *Mutex::nativeHandle() { return &mMutex; }
+pthread_mutex_t* Mutex::nativeHandle() { return &mMutex; }
diff --git a/nci/jni/Mutex.h b/nci/jni/Mutex.h
index e9f866e..bcabf31 100644
--- a/nci/jni/Mutex.h
+++ b/nci/jni/Mutex.h
@@ -22,7 +22,7 @@
#include <pthread.h>
class Mutex {
-public:
+ public:
/*******************************************************************************
**
** Function: Mutex
@@ -87,19 +87,19 @@
** Returns: Handle of the mutex.
**
*******************************************************************************/
- pthread_mutex_t *nativeHandle();
+ pthread_mutex_t* nativeHandle();
class Autolock {
- public:
- inline Autolock(Mutex &mutex) : mLock(mutex) { mLock.lock(); }
- inline Autolock(Mutex *mutex) : mLock(*mutex) { mLock.lock(); }
+ public:
+ inline Autolock(Mutex& mutex) : mLock(mutex) { mLock.lock(); }
+ inline Autolock(Mutex* mutex) : mLock(*mutex) { mLock.lock(); }
inline ~Autolock() { mLock.unlock(); }
- private:
- Mutex &mLock;
+ private:
+ Mutex& mLock;
};
-private:
+ private:
pthread_mutex_t mMutex;
};
diff --git a/nci/jni/NativeLlcpConnectionlessSocket.cpp b/nci/jni/NativeLlcpConnectionlessSocket.cpp
index 2347057..cb528cc 100644
--- a/nci/jni/NativeLlcpConnectionlessSocket.cpp
+++ b/nci/jni/NativeLlcpConnectionlessSocket.cpp
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-#include "JavaClassConstants.h"
-#include "NfcJniUtil.h"
-#include "_OverrideLog.h"
-#include "nfa_api.h"
-#include "nfa_p2p_api.h"
#include <errno.h>
#include <malloc.h>
#include <nativehelper/ScopedLocalRef.h>
#include <nativehelper/ScopedPrimitiveArray.h>
#include <semaphore.h>
#include <string.h>
+#include "JavaClassConstants.h"
+#include "NfcJniUtil.h"
+#include "_OverrideLog.h"
+#include "nfa_api.h"
+#include "nfa_p2p_api.h"
namespace android {
@@ -35,7 +35,7 @@
*****************************************************************************/
static sem_t sConnlessRecvSem;
static jboolean sConnlessRecvWaitingForData = JNI_FALSE;
-static uint8_t *sConnlessRecvBuf = NULL;
+static uint8_t* sConnlessRecvBuf = NULL;
static uint32_t sConnlessRecvLen = 0;
static uint32_t sConnlessRecvRemoteSap = 0;
@@ -52,7 +52,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeLlcpConnectionlessSocket_doSendTo(JNIEnv *e, jobject o,
+static jboolean nativeLlcpConnectionlessSocket_doSendTo(JNIEnv* e, jobject o,
jint nsap,
jbyteArray data) {
DLOG_IF(INFO, nfc_debug_enabled)
@@ -70,8 +70,8 @@
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("NFA_P2pSendUI: len = %zu", byte_count);
- uint8_t *raw_ptr = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(
- &bytes[0])); // TODO: API bug; NFA_P2pSendUI should take const*!
+ uint8_t* raw_ptr = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(
+ &bytes[0])); // TODO: API bug; NFA_P2pSendUI should take const*!
tNFA_STATUS status =
NFA_P2pSendUI((tNFA_HANDLE)handle, nsap, byte_count, raw_ptr);
@@ -97,7 +97,7 @@
** Returns: None
**
*******************************************************************************/
-void nativeLlcpConnectionlessSocket_receiveData(uint8_t *data, uint32_t len,
+void nativeLlcpConnectionlessSocket_receiveData(uint8_t* data, uint32_t len,
uint32_t remoteSap) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: waiting for data = %d, len = %d", __func__,
@@ -160,7 +160,7 @@
** Returns: LlcpPacket Java object.
**
*******************************************************************************/
-static jobject nativeLlcpConnectionlessSocket_doReceiveFrom(JNIEnv *e, jobject,
+static jobject nativeLlcpConnectionlessSocket_doReceiveFrom(JNIEnv* e, jobject,
jint linkMiu) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: linkMiu = %d", __func__, linkMiu);
@@ -173,7 +173,7 @@
return NULL;
}
- sConnlessRecvBuf = (uint8_t *)malloc(linkMiu);
+ sConnlessRecvBuf = (uint8_t*)malloc(linkMiu);
if (sConnlessRecvBuf == NULL) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: Failed to allocate %d bytes memory buffer", __func__, linkMiu);
@@ -228,12 +228,12 @@
ScopedLocalRef<jbyteArray> receivedData(e,
e->NewByteArray(sConnlessRecvLen));
e->SetByteArrayRegion(receivedData.get(), 0, sConnlessRecvLen,
- (jbyte *)sConnlessRecvBuf);
+ (jbyte*)sConnlessRecvBuf);
e->SetObjectField(llcpPacket, f, receivedData.get());
}
-TheEnd: // TODO: should all the "return connectionlessCleanup()"s in this
- // function jump here instead?
+TheEnd: // TODO: should all the "return connectionlessCleanup()"s in this
+ // function jump here instead?
connectionlessCleanup();
if (sem_destroy(&sConnlessRecvSem)) {
LOG(ERROR) << StringPrintf(
@@ -254,7 +254,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeLlcpConnectionlessSocket_doClose(JNIEnv *e, jobject o) {
+static jboolean nativeLlcpConnectionlessSocket_doClose(JNIEnv* e, jobject o) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
ScopedLocalRef<jclass> c(e, e->GetObjectClass(o));
@@ -276,10 +276,10 @@
**
*****************************************************************************/
static JNINativeMethod gMethods[] = {
- {"doSendTo", "(I[B)Z", (void *)nativeLlcpConnectionlessSocket_doSendTo},
+ {"doSendTo", "(I[B)Z", (void*)nativeLlcpConnectionlessSocket_doSendTo},
{"doReceiveFrom", "(I)Lcom/android/nfc/LlcpPacket;",
- (void *)nativeLlcpConnectionlessSocket_doReceiveFrom},
- {"doClose", "()Z", (void *)nativeLlcpConnectionlessSocket_doClose},
+ (void*)nativeLlcpConnectionlessSocket_doReceiveFrom},
+ {"doClose", "()Z", (void*)nativeLlcpConnectionlessSocket_doClose},
};
/*******************************************************************************
@@ -292,9 +292,9 @@
** Returns: Status of registration.
**
*******************************************************************************/
-int register_com_android_nfc_NativeLlcpConnectionlessSocket(JNIEnv *e) {
+int register_com_android_nfc_NativeLlcpConnectionlessSocket(JNIEnv* e) {
return jniRegisterNativeMethods(e, gNativeLlcpConnectionlessSocketClassName,
gMethods, NELEM(gMethods));
}
-} // namespace android
+} // namespace android
diff --git a/nci/jni/NativeLlcpServiceSocket.cpp b/nci/jni/NativeLlcpServiceSocket.cpp
index 0291694..a4db579 100644
--- a/nci/jni/NativeLlcpServiceSocket.cpp
+++ b/nci/jni/NativeLlcpServiceSocket.cpp
@@ -42,13 +42,13 @@
** Returns: LlcpSocket Java object.
**
*******************************************************************************/
-static jobject nativeLlcpServiceSocket_doAccept(JNIEnv *e, jobject o, jint miu,
+static jobject nativeLlcpServiceSocket_doAccept(JNIEnv* e, jobject o, jint miu,
jint rw,
jint /*linearBufferLength*/) {
jobject clientSocket = NULL;
jclass clsNativeLlcpSocket = NULL;
jfieldID f = 0;
- PeerToPeer::tJNI_HANDLE serverHandle; // handle of the local server
+ PeerToPeer::tJNI_HANDLE serverHandle; // handle of the local server
bool stat = false;
PeerToPeer::tJNI_HANDLE connHandle =
PeerToPeer::getInstance().getNewJniHandle();
@@ -107,7 +107,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeLlcpServiceSocket_doClose(JNIEnv *e, jobject o) {
+static jboolean nativeLlcpServiceSocket_doClose(JNIEnv* e, jobject o) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniServerHandle = 0;
bool stat = false;
@@ -127,8 +127,8 @@
*****************************************************************************/
static JNINativeMethod gMethods[] = {
{"doAccept", "(III)Lcom/android/nfc/dhimpl/NativeLlcpSocket;",
- (void *)nativeLlcpServiceSocket_doAccept},
- {"doClose", "()Z", (void *)nativeLlcpServiceSocket_doClose},
+ (void*)nativeLlcpServiceSocket_doAccept},
+ {"doClose", "()Z", (void*)nativeLlcpServiceSocket_doClose},
};
/*******************************************************************************
@@ -141,9 +141,9 @@
** Returns: Status of registration.
**
*******************************************************************************/
-int register_com_android_nfc_NativeLlcpServiceSocket(JNIEnv *e) {
+int register_com_android_nfc_NativeLlcpServiceSocket(JNIEnv* e) {
return jniRegisterNativeMethods(e, gNativeLlcpServiceSocketClassName,
gMethods, NELEM(gMethods));
}
-} // namespace android
+} // namespace android
diff --git a/nci/jni/NativeLlcpSocket.cpp b/nci/jni/NativeLlcpSocket.cpp
index 316a30e..5451a61 100644
--- a/nci/jni/NativeLlcpSocket.cpp
+++ b/nci/jni/NativeLlcpSocket.cpp
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <nativehelper/ScopedPrimitiveArray.h>
+#include <nativehelper/ScopedUtfChars.h>
#include "JavaClassConstants.h"
#include "PeerToPeer.h"
#include "_OverrideLog.h"
-#include <nativehelper/ScopedPrimitiveArray.h>
-#include <nativehelper/ScopedUtfChars.h>
namespace android {
@@ -33,7 +33,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeLlcpSocket_doConnect(JNIEnv *e, jobject o, jint nSap) {
+static jboolean nativeLlcpSocket_doConnect(JNIEnv* e, jobject o, jint nSap) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; sap=%d", __func__, nSap);
@@ -57,7 +57,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeLlcpSocket_doConnectBy(JNIEnv *e, jobject o, jstring sn) {
+static jboolean nativeLlcpSocket_doConnectBy(JNIEnv* e, jobject o, jstring sn) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle =
@@ -85,7 +85,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeLlcpSocket_doClose(JNIEnv *e, jobject o) {
+static jboolean nativeLlcpSocket_doClose(JNIEnv* e, jobject o) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle =
@@ -108,15 +108,15 @@
** Returns: True if sent ok.
**
*******************************************************************************/
-static jboolean nativeLlcpSocket_doSend(JNIEnv *e, jobject o, jbyteArray data) {
+static jboolean nativeLlcpSocket_doSend(JNIEnv* e, jobject o, jbyteArray data) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
ScopedByteArrayRO bytes(e, data);
PeerToPeer::tJNI_HANDLE jniHandle =
(PeerToPeer::tJNI_HANDLE)nfc_jni_get_nfc_socket_handle(e, o);
- uint8_t *raw_ptr = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(
- &bytes[0])); // TODO: API bug: send should take const*!
+ uint8_t* raw_ptr = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(
+ &bytes[0])); // TODO: API bug: send should take const*!
bool stat = PeerToPeer::getInstance().send(jniHandle, raw_ptr, bytes.size());
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
@@ -135,7 +135,7 @@
** Returns: Number of bytes received.
**
*******************************************************************************/
-static jint nativeLlcpSocket_doReceive(JNIEnv *e, jobject o,
+static jint nativeLlcpSocket_doReceive(JNIEnv* e, jobject o,
jbyteArray origBuffer) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
@@ -145,7 +145,7 @@
(PeerToPeer::tJNI_HANDLE)nfc_jni_get_nfc_socket_handle(e, o);
uint16_t actualLen = 0;
bool stat = PeerToPeer::getInstance().receive(
- jniHandle, reinterpret_cast<uint8_t *>(&bytes[0]), bytes.size(),
+ jniHandle, reinterpret_cast<uint8_t*>(&bytes[0]), bytes.size(),
actualLen);
jint retval = 0;
@@ -170,7 +170,7 @@
** Returns: Peer's maximum information unit.
**
*******************************************************************************/
-static jint nativeLlcpSocket_doGetRemoteSocketMIU(JNIEnv *e, jobject o) {
+static jint nativeLlcpSocket_doGetRemoteSocketMIU(JNIEnv* e, jobject o) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle =
@@ -192,7 +192,7 @@
** Returns: Peer's receive window size.
**
*******************************************************************************/
-static jint nativeLlcpSocket_doGetRemoteSocketRW(JNIEnv *e, jobject o) {
+static jint nativeLlcpSocket_doGetRemoteSocketRW(JNIEnv* e, jobject o) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
PeerToPeer::tJNI_HANDLE jniHandle =
@@ -209,16 +209,15 @@
**
*****************************************************************************/
static JNINativeMethod gMethods[] = {
- {"doConnect", "(I)Z", (void *)nativeLlcpSocket_doConnect},
+ {"doConnect", "(I)Z", (void*)nativeLlcpSocket_doConnect},
{"doConnectBy", "(Ljava/lang/String;)Z",
- (void *)nativeLlcpSocket_doConnectBy},
- {"doClose", "()Z", (void *)nativeLlcpSocket_doClose},
- {"doSend", "([B)Z", (void *)nativeLlcpSocket_doSend},
- {"doReceive", "([B)I", (void *)nativeLlcpSocket_doReceive},
+ (void*)nativeLlcpSocket_doConnectBy},
+ {"doClose", "()Z", (void*)nativeLlcpSocket_doClose},
+ {"doSend", "([B)Z", (void*)nativeLlcpSocket_doSend},
+ {"doReceive", "([B)I", (void*)nativeLlcpSocket_doReceive},
{"doGetRemoteSocketMiu", "()I",
- (void *)nativeLlcpSocket_doGetRemoteSocketMIU},
- {"doGetRemoteSocketRw", "()I",
- (void *)nativeLlcpSocket_doGetRemoteSocketRW},
+ (void*)nativeLlcpSocket_doGetRemoteSocketMIU},
+ {"doGetRemoteSocketRw", "()I", (void*)nativeLlcpSocket_doGetRemoteSocketRW},
};
/*******************************************************************************
@@ -231,9 +230,9 @@
** Returns: Status of registration.
**
*******************************************************************************/
-int register_com_android_nfc_NativeLlcpSocket(JNIEnv *e) {
+int register_com_android_nfc_NativeLlcpSocket(JNIEnv* e) {
return jniRegisterNativeMethods(e, gNativeLlcpSocketClassName, gMethods,
NELEM(gMethods));
}
-} // namespace android
+} // namespace android
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index edfddd3..9ac86b6 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -14,6 +14,13 @@
* limitations under the License.
*/
+#include <android-base/stringprintf.h>
+#include <base/logging.h>
+#include <errno.h>
+#include <nativehelper/ScopedLocalRef.h>
+#include <nativehelper/ScopedPrimitiveArray.h>
+#include <nativehelper/ScopedUtfChars.h>
+#include <semaphore.h>
#include "JavaClassConstants.h"
#include "NfcAdaptation.h"
#include "NfcJniUtil.h"
@@ -25,13 +32,6 @@
#include "SyncEvent.h"
#include "_OverrideLog.h"
#include "config.h"
-#include <android-base/stringprintf.h>
-#include <base/logging.h>
-#include <errno.h>
-#include <nativehelper/ScopedLocalRef.h>
-#include <nativehelper/ScopedPrimitiveArray.h>
-#include <nativehelper/ScopedUtfChars.h>
-#include <semaphore.h>
#include "ce_api.h"
#include "nfa_api.h"
@@ -43,11 +43,11 @@
extern const uint8_t nfca_version_string[];
extern const uint8_t nfa_version_string[];
-extern tNFA_DM_DISC_FREQ_CFG *p_nfa_dm_rf_disc_freq_cfg; // defined in stack
+extern tNFA_DM_DISC_FREQ_CFG* p_nfa_dm_rf_disc_freq_cfg; // defined in stack
namespace android {
extern bool gIsTagDeactivating;
extern bool gIsSelectingRfInterface;
-extern void nativeNfcTag_doTransceiveStatus(tNFA_STATUS status, uint8_t *buf,
+extern void nativeNfcTag_doTransceiveStatus(tNFA_STATUS status, uint8_t* buf,
uint32_t buflen);
extern void nativeNfcTag_notifyRfTimeout();
extern void nativeNfcTag_doConnectStatus(jboolean is_connect_ok);
@@ -68,10 +68,10 @@
extern void nativeNfcTag_registerNdefTypeHandler();
extern void nativeNfcTag_acquireRfInterfaceMutexLock();
extern void nativeNfcTag_releaseRfInterfaceMutexLock();
-extern void nativeLlcpConnectionlessSocket_receiveData(uint8_t *data,
+extern void nativeLlcpConnectionlessSocket_receiveData(uint8_t* data,
uint32_t len,
uint32_t remote_sap);
-} // namespace android
+} // namespace android
/*****************************************************************************
**
@@ -93,22 +93,22 @@
jmethodID gCachedNfcManagerNotifyHostEmuDeactivated;
jmethodID gCachedNfcManagerNotifyRfFieldActivated;
jmethodID gCachedNfcManagerNotifyRfFieldDeactivated;
-const char *gNativeP2pDeviceClassName =
+const char* gNativeP2pDeviceClassName =
"com/android/nfc/dhimpl/NativeP2pDevice";
-const char *gNativeLlcpServiceSocketClassName =
+const char* gNativeLlcpServiceSocketClassName =
"com/android/nfc/dhimpl/NativeLlcpServiceSocket";
-const char *gNativeLlcpConnectionlessSocketClassName =
+const char* gNativeLlcpConnectionlessSocketClassName =
"com/android/nfc/dhimpl/NativeLlcpConnectionlessSocket";
-const char *gNativeLlcpSocketClassName =
+const char* gNativeLlcpSocketClassName =
"com/android/nfc/dhimpl/NativeLlcpSocket";
-const char *gNativeNfcTagClassName = "com/android/nfc/dhimpl/NativeNfcTag";
-const char *gNativeNfcManagerClassName =
+const char* gNativeNfcTagClassName = "com/android/nfc/dhimpl/NativeNfcTag";
+const char* gNativeNfcManagerClassName =
"com/android/nfc/dhimpl/NativeNfcManager";
void doStartupConfig();
void startStopPolling(bool isStartPolling);
void startRfDiscovery(bool isStart);
bool isDiscoveryStarted();
-} // namespace android
+} // namespace android
/*****************************************************************************
**
@@ -117,45 +117,45 @@
*****************************************************************************/
namespace android {
static jint sLastError = ERROR_BUFFER_TOO_SMALL;
-static SyncEvent sNfaEnableEvent; // event for NFA_Enable()
-static SyncEvent sNfaDisableEvent; // event for NFA_Disable()
-static SyncEvent sNfaEnableDisablePollingEvent; // event for
- // NFA_EnablePolling(),
- // NFA_DisablePolling()
-static SyncEvent sNfaSetConfigEvent; // event for Set_Config....
-static SyncEvent sNfaGetConfigEvent; // event for Get_Config....
+static SyncEvent sNfaEnableEvent; // event for NFA_Enable()
+static SyncEvent sNfaDisableEvent; // event for NFA_Disable()
+static SyncEvent sNfaEnableDisablePollingEvent; // event for
+ // NFA_EnablePolling(),
+ // NFA_DisablePolling()
+static SyncEvent sNfaSetConfigEvent; // event for Set_Config....
+static SyncEvent sNfaGetConfigEvent; // event for Get_Config....
static bool sIsNfaEnabled = false;
-static bool sDiscoveryEnabled = false; // is polling or listening
-static bool sPollingEnabled = false; // is polling for tag?
+static bool sDiscoveryEnabled = false; // is polling or listening
+static bool sPollingEnabled = false; // is polling for tag?
static bool sIsDisabling = false;
-static bool sRfEnabled = false; // whether RF discovery is enabled
-static bool sSeRfActive = false; // whether RF with SE is likely active
+static bool sRfEnabled = false; // whether RF discovery is enabled
+static bool sSeRfActive = false; // whether RF with SE is likely active
static bool sReaderModeEnabled =
- false; // whether we're only reading tags, not allowing P2p/card emu
+ false; // whether we're only reading tags, not allowing P2p/card emu
static bool sP2pEnabled = false;
-static bool sP2pActive = false; // whether p2p was last active
+static bool sP2pActive = false; // whether p2p was last active
static bool sAbortConnlessWait = false;
static jint sLfT3tMax = 0;
#define CONFIG_UPDATE_TECH_MASK (1 << 1)
-#define DEFAULT_TECH_MASK \
- (NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F | \
- NFA_TECHNOLOGY_MASK_V | NFA_TECHNOLOGY_MASK_B_PRIME | \
- NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE | \
+#define DEFAULT_TECH_MASK \
+ (NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F | \
+ NFA_TECHNOLOGY_MASK_V | NFA_TECHNOLOGY_MASK_B_PRIME | \
+ NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE | \
NFA_TECHNOLOGY_MASK_KOVIO)
#define DEFAULT_DISCOVERY_DURATION 500
#define READER_MODE_DISCOVERY_DURATION 200
-static void nfaConnectionCallback(uint8_t event, tNFA_CONN_EVT_DATA *eventData);
+static void nfaConnectionCallback(uint8_t event, tNFA_CONN_EVT_DATA* eventData);
static void nfaDeviceManagementCallback(uint8_t event,
- tNFA_DM_CBACK_DATA *eventData);
-static bool isPeerToPeer(tNFA_ACTIVATED &activated);
-static bool isListenMode(tNFA_ACTIVATED &activated);
+ tNFA_DM_CBACK_DATA* eventData);
+static bool isPeerToPeer(tNFA_ACTIVATED& activated);
+static bool isListenMode(tNFA_ACTIVATED& activated);
static void enableDisableLptd(bool enable);
static tNFA_STATUS stopPolling_rfDiscoveryDisabled();
-static tNFA_STATUS
-startPolling_rfDiscoveryDisabled(tNFA_TECHNOLOGY_MASK tech_mask);
-static void nfcManager_doSetScreenState(JNIEnv *e, jobject o,
+static tNFA_STATUS startPolling_rfDiscoveryDisabled(
+ tNFA_TECHNOLOGY_MASK tech_mask);
+static void nfcManager_doSetScreenState(JNIEnv* e, jobject o,
jint screen_state_mask);
static uint16_t sCurrentConfigLen;
@@ -175,8 +175,8 @@
** Returns: Native data structure.
**
*******************************************************************************/
-nfc_jni_native_data *getNative(JNIEnv *e, jobject o) {
- static struct nfc_jni_native_data *sCachedNat = NULL;
+nfc_jni_native_data* getNative(JNIEnv* e, jobject o) {
+ static struct nfc_jni_native_data* sCachedNat = NULL;
if (e) {
sCachedNat = nfc_jni_get_nat(e, o);
}
@@ -193,7 +193,7 @@
** Returns: None
**
*******************************************************************************/
-static void handleRfDiscoveryEvent(tNFC_RESULT_DEVT *discoveredDevice) {
+static void handleRfDiscoveryEvent(tNFC_RESULT_DEVT* discoveredDevice) {
if (discoveredDevice->more == NCI_DISCOVER_NTF_MORE) {
// there is more discovery notification coming
return;
@@ -221,356 +221,358 @@
**
*******************************************************************************/
static void nfaConnectionCallback(uint8_t connEvent,
- tNFA_CONN_EVT_DATA *eventData) {
+ tNFA_CONN_EVT_DATA* eventData) {
tNFA_STATUS status = NFA_STATUS_FAILED;
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: event= %u", __func__, connEvent);
switch (connEvent) {
- case NFA_POLL_ENABLED_EVT: // whether polling successfully started
- {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_POLL_ENABLED_EVT: status = %u", __func__, eventData->status);
+ case NFA_POLL_ENABLED_EVT: // whether polling successfully started
+ {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_POLL_ENABLED_EVT: status = %u", __func__, eventData->status);
- SyncEventGuard guard(sNfaEnableDisablePollingEvent);
- sNfaEnableDisablePollingEvent.notifyOne();
- } break;
+ SyncEventGuard guard(sNfaEnableDisablePollingEvent);
+ sNfaEnableDisablePollingEvent.notifyOne();
+ } break;
- case NFA_POLL_DISABLED_EVT: // Listening/Polling stopped
- {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_POLL_DISABLED_EVT: status = %u", __func__, eventData->status);
+ case NFA_POLL_DISABLED_EVT: // Listening/Polling stopped
+ {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_POLL_DISABLED_EVT: status = %u", __func__,
+ eventData->status);
- SyncEventGuard guard(sNfaEnableDisablePollingEvent);
- sNfaEnableDisablePollingEvent.notifyOne();
- } break;
+ SyncEventGuard guard(sNfaEnableDisablePollingEvent);
+ sNfaEnableDisablePollingEvent.notifyOne();
+ } break;
- case NFA_RF_DISCOVERY_STARTED_EVT: // RF Discovery started
- {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_RF_DISCOVERY_STARTED_EVT: status = %u",
- __func__, eventData->status);
+ case NFA_RF_DISCOVERY_STARTED_EVT: // RF Discovery started
+ {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_RF_DISCOVERY_STARTED_EVT: status = %u",
+ __func__, eventData->status);
- SyncEventGuard guard(sNfaEnableDisablePollingEvent);
- sNfaEnableDisablePollingEvent.notifyOne();
- } break;
+ SyncEventGuard guard(sNfaEnableDisablePollingEvent);
+ sNfaEnableDisablePollingEvent.notifyOne();
+ } break;
- case NFA_RF_DISCOVERY_STOPPED_EVT: // RF Discovery stopped event
- {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_RF_DISCOVERY_STOPPED_EVT: status = %u",
- __func__, eventData->status);
+ case NFA_RF_DISCOVERY_STOPPED_EVT: // RF Discovery stopped event
+ {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_RF_DISCOVERY_STOPPED_EVT: status = %u",
+ __func__, eventData->status);
- SyncEventGuard guard(sNfaEnableDisablePollingEvent);
- sNfaEnableDisablePollingEvent.notifyOne();
- } break;
+ SyncEventGuard guard(sNfaEnableDisablePollingEvent);
+ sNfaEnableDisablePollingEvent.notifyOne();
+ } break;
- case NFA_DISC_RESULT_EVT: // NFC link/protocol discovery notificaiton
- status = eventData->disc_result.status;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_DISC_RESULT_EVT: status = %d", __func__, status);
- if (status != NFA_STATUS_OK) {
- LOG(ERROR) << StringPrintf("%s: NFA_DISC_RESULT_EVT error: status = %d",
- __func__, status);
- } else {
- NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
- handleRfDiscoveryEvent(&eventData->disc_result.discovery_ntf);
- }
- break;
-
- case NFA_SELECT_RESULT_EVT: // NFC link/protocol discovery select response
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_SELECT_RESULT_EVT: status = %d, gIsSelectingRfInterface = %d, "
- "sIsDisabling=%d",
- __func__, eventData->status, gIsSelectingRfInterface, sIsDisabling);
-
- if (sIsDisabling)
- break;
-
- if (eventData->status != NFA_STATUS_OK) {
- if (gIsSelectingRfInterface) {
- nativeNfcTag_doConnectStatus(false);
+ case NFA_DISC_RESULT_EVT: // NFC link/protocol discovery notificaiton
+ status = eventData->disc_result.status;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_DISC_RESULT_EVT: status = %d", __func__, status);
+ if (status != NFA_STATUS_OK) {
+ LOG(ERROR) << StringPrintf("%s: NFA_DISC_RESULT_EVT error: status = %d",
+ __func__, status);
+ } else {
+ NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
+ handleRfDiscoveryEvent(&eventData->disc_result.discovery_ntf);
}
-
- LOG(ERROR) << StringPrintf("%s: NFA_SELECT_RESULT_EVT error: status = %d",
- __func__, eventData->status);
- NFA_Deactivate(FALSE);
- }
- break;
-
- case NFA_DEACTIVATE_FAIL_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DEACTIVATE_FAIL_EVT: status = %d", __func__,
- eventData->status);
- break;
-
- case NFA_ACTIVATED_EVT: // NFC link/protocol activated
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_ACTIVATED_EVT: gIsSelectingRfInterface=%d, sIsDisabling=%d",
- __func__, gIsSelectingRfInterface, sIsDisabling);
- if ((eventData->activated.activate_ntf.protocol != NFA_PROTOCOL_NFC_DEP) &&
- (!isListenMode(eventData->activated))) {
- nativeNfcTag_setRfInterface(
- (tNFA_INTF_TYPE)eventData->activated.activate_ntf.intf_param.type);
- }
- if (EXTNS_GetConnectFlag() == TRUE) {
- NfcTag::getInstance().setActivationState();
- nativeNfcTag_doConnectStatus(true);
break;
- }
- NfcTag::getInstance().setActive(true);
- if (sIsDisabling || !sIsNfaEnabled)
- break;
- gActivated = true;
- NfcTag::getInstance().setActivationState();
- if (gIsSelectingRfInterface) {
- nativeNfcTag_doConnectStatus(true);
- break;
- }
+ case NFA_SELECT_RESULT_EVT: // NFC link/protocol discovery select response
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_SELECT_RESULT_EVT: status = %d, gIsSelectingRfInterface = "
+ "%d, "
+ "sIsDisabling=%d",
+ __func__, eventData->status, gIsSelectingRfInterface, sIsDisabling);
- nativeNfcTag_resetPresenceCheck();
- if (isPeerToPeer(eventData->activated)) {
- if (sReaderModeEnabled) {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: ignoring peer target in reader mode.", __func__);
+ if (sIsDisabling) break;
+
+ if (eventData->status != NFA_STATUS_OK) {
+ if (gIsSelectingRfInterface) {
+ nativeNfcTag_doConnectStatus(false);
+ }
+
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_SELECT_RESULT_EVT error: status = %d", __func__,
+ eventData->status);
NFA_Deactivate(FALSE);
+ }
+ break;
+
+ case NFA_DEACTIVATE_FAIL_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_DEACTIVATE_FAIL_EVT: status = %d", __func__,
+ eventData->status);
+ break;
+
+ case NFA_ACTIVATED_EVT: // NFC link/protocol activated
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_ACTIVATED_EVT: gIsSelectingRfInterface=%d, sIsDisabling=%d",
+ __func__, gIsSelectingRfInterface, sIsDisabling);
+ if ((eventData->activated.activate_ntf.protocol !=
+ NFA_PROTOCOL_NFC_DEP) &&
+ (!isListenMode(eventData->activated))) {
+ nativeNfcTag_setRfInterface(
+ (tNFA_INTF_TYPE)eventData->activated.activate_ntf.intf_param.type);
+ }
+ if (EXTNS_GetConnectFlag() == TRUE) {
+ NfcTag::getInstance().setActivationState();
+ nativeNfcTag_doConnectStatus(true);
break;
}
- sP2pActive = true;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_ACTIVATED_EVT; is p2p", __func__);
- if (NFC_GetNCIVersion() == NCI_VERSION_1_0) {
- // Disable RF field events in case of p2p
- uint8_t nfa_disable_rf_events[] = {0x00};
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: Disabling RF field events", __func__);
- status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO,
- sizeof(nfa_disable_rf_events),
- &nfa_disable_rf_events[0]);
- if (status == NFA_STATUS_OK) {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: Disabled RF field events", __func__);
- } else {
- LOG(ERROR) << StringPrintf("%s: Failed to disable RF field events",
- __func__);
- }
- }
- } else if (pn544InteropIsBusy() == false) {
- NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
+ NfcTag::getInstance().setActive(true);
+ if (sIsDisabling || !sIsNfaEnabled) break;
+ gActivated = true;
- // We know it is not activating for P2P. If it activated in
- // listen mode then it is likely for an SE transaction.
- // Send the RF Event.
- if (isListenMode(eventData->activated)) {
- sSeRfActive = true;
+ NfcTag::getInstance().setActivationState();
+ if (gIsSelectingRfInterface) {
+ nativeNfcTag_doConnectStatus(true);
+ break;
}
- }
- break;
- case NFA_DEACTIVATED_EVT: // NFC link/protocol deactivated
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_DEACTIVATED_EVT Type: %u, gIsTagDeactivating: %d", __func__,
- eventData->deactivated.type, gIsTagDeactivating);
- NfcTag::getInstance().setDeactivationState(eventData->deactivated);
- if (eventData->deactivated.type != NFA_DEACTIVATE_TYPE_SLEEP) {
- {
- SyncEventGuard g(gDeactivatedEvent);
- gActivated = false; // guard this variable from multi-threaded access
- gDeactivatedEvent.notifyOne();
- }
nativeNfcTag_resetPresenceCheck();
- NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
- nativeNfcTag_abortWaits();
- NfcTag::getInstance().abort();
- } else if (gIsTagDeactivating) {
- NfcTag::getInstance().setActive(false);
- nativeNfcTag_doDeactivateStatus(0);
- } else if (EXTNS_GetDeactivateFlag() == TRUE) {
- NfcTag::getInstance().setActive(false);
- nativeNfcTag_doDeactivateStatus(0);
- }
-
- // If RF is activated for what we think is a Secure Element transaction
- // and it is deactivated to either IDLE or DISCOVERY mode, notify w/event.
- if ((eventData->deactivated.type == NFA_DEACTIVATE_TYPE_IDLE) ||
- (eventData->deactivated.type == NFA_DEACTIVATE_TYPE_DISCOVERY)) {
- if (sSeRfActive) {
- sSeRfActive = false;
- } else if (sP2pActive) {
- sP2pActive = false;
- // Make sure RF field events are re-enabled
+ if (isPeerToPeer(eventData->activated)) {
+ if (sReaderModeEnabled) {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: ignoring peer target in reader mode.", __func__);
+ NFA_Deactivate(FALSE);
+ break;
+ }
+ sP2pActive = true;
DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DEACTIVATED_EVT; is p2p", __func__);
+ << StringPrintf("%s: NFA_ACTIVATED_EVT; is p2p", __func__);
if (NFC_GetNCIVersion() == NCI_VERSION_1_0) {
// Disable RF field events in case of p2p
- uint8_t nfa_enable_rf_events[] = {0x01};
-
- if (!sIsDisabling && sIsNfaEnabled) {
+ uint8_t nfa_disable_rf_events[] = {0x00};
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: Disabling RF field events", __func__);
+ status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO,
+ sizeof(nfa_disable_rf_events),
+ &nfa_disable_rf_events[0]);
+ if (status == NFA_STATUS_OK) {
DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: Enabling RF field events", __func__);
- status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO,
- sizeof(nfa_enable_rf_events),
- &nfa_enable_rf_events[0]);
- if (status == NFA_STATUS_OK) {
+ << StringPrintf("%s: Disabled RF field events", __func__);
+ } else {
+ LOG(ERROR) << StringPrintf("%s: Failed to disable RF field events",
+ __func__);
+ }
+ }
+ } else if (pn544InteropIsBusy() == false) {
+ NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
+
+ // We know it is not activating for P2P. If it activated in
+ // listen mode then it is likely for an SE transaction.
+ // Send the RF Event.
+ if (isListenMode(eventData->activated)) {
+ sSeRfActive = true;
+ }
+ }
+ break;
+
+ case NFA_DEACTIVATED_EVT: // NFC link/protocol deactivated
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_DEACTIVATED_EVT Type: %u, gIsTagDeactivating: %d",
+ __func__, eventData->deactivated.type, gIsTagDeactivating);
+ NfcTag::getInstance().setDeactivationState(eventData->deactivated);
+ if (eventData->deactivated.type != NFA_DEACTIVATE_TYPE_SLEEP) {
+ {
+ SyncEventGuard g(gDeactivatedEvent);
+ gActivated = false; // guard this variable from multi-threaded access
+ gDeactivatedEvent.notifyOne();
+ }
+ nativeNfcTag_resetPresenceCheck();
+ NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
+ nativeNfcTag_abortWaits();
+ NfcTag::getInstance().abort();
+ } else if (gIsTagDeactivating) {
+ NfcTag::getInstance().setActive(false);
+ nativeNfcTag_doDeactivateStatus(0);
+ } else if (EXTNS_GetDeactivateFlag() == TRUE) {
+ NfcTag::getInstance().setActive(false);
+ nativeNfcTag_doDeactivateStatus(0);
+ }
+
+ // If RF is activated for what we think is a Secure Element transaction
+ // and it is deactivated to either IDLE or DISCOVERY mode, notify w/event.
+ if ((eventData->deactivated.type == NFA_DEACTIVATE_TYPE_IDLE) ||
+ (eventData->deactivated.type == NFA_DEACTIVATE_TYPE_DISCOVERY)) {
+ if (sSeRfActive) {
+ sSeRfActive = false;
+ } else if (sP2pActive) {
+ sP2pActive = false;
+ // Make sure RF field events are re-enabled
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_DEACTIVATED_EVT; is p2p", __func__);
+ if (NFC_GetNCIVersion() == NCI_VERSION_1_0) {
+ // Disable RF field events in case of p2p
+ uint8_t nfa_enable_rf_events[] = {0x01};
+
+ if (!sIsDisabling && sIsNfaEnabled) {
DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: Enabled RF field events", __func__);
- } else {
- LOG(ERROR) << StringPrintf("%s: Failed to enable RF field events",
- __func__);
+ << StringPrintf("%s: Enabling RF field events", __func__);
+ status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO,
+ sizeof(nfa_enable_rf_events),
+ &nfa_enable_rf_events[0]);
+ if (status == NFA_STATUS_OK) {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: Enabled RF field events", __func__);
+ } else {
+ LOG(ERROR) << StringPrintf(
+ "%s: Failed to enable RF field events", __func__);
+ }
}
}
}
}
- }
- break;
+ break;
- case NFA_TLV_DETECT_EVT: // TLV Detection complete
- status = eventData->tlv_detect.status;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_TLV_DETECT_EVT: status = %d, protocol = %d, num_tlvs = %d, "
- "num_bytes = %d",
- __func__, status, eventData->tlv_detect.protocol,
- eventData->tlv_detect.num_tlvs, eventData->tlv_detect.num_bytes);
- if (status != NFA_STATUS_OK) {
- LOG(ERROR) << StringPrintf("%s: NFA_TLV_DETECT_EVT error: status = %d",
- __func__, status);
- }
- break;
+ case NFA_TLV_DETECT_EVT: // TLV Detection complete
+ status = eventData->tlv_detect.status;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_TLV_DETECT_EVT: status = %d, protocol = %d, num_tlvs = %d, "
+ "num_bytes = %d",
+ __func__, status, eventData->tlv_detect.protocol,
+ eventData->tlv_detect.num_tlvs, eventData->tlv_detect.num_bytes);
+ if (status != NFA_STATUS_OK) {
+ LOG(ERROR) << StringPrintf("%s: NFA_TLV_DETECT_EVT error: status = %d",
+ __func__, status);
+ }
+ break;
- case NFA_NDEF_DETECT_EVT: // NDEF Detection complete;
- // if status is failure, it means the tag does not contain any or valid NDEF
- // data; pass the failure status to the NFC Service;
- status = eventData->ndef_detect.status;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_NDEF_DETECT_EVT: status = 0x%X, protocol = %u, "
- "max_size = %u, cur_size = %u, flags = 0x%X",
- __func__, status, eventData->ndef_detect.protocol,
- eventData->ndef_detect.max_size, eventData->ndef_detect.cur_size,
- eventData->ndef_detect.flags);
- NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
- nativeNfcTag_doCheckNdefResult(status, eventData->ndef_detect.max_size,
- eventData->ndef_detect.cur_size,
- eventData->ndef_detect.flags);
- break;
+ case NFA_NDEF_DETECT_EVT: // NDEF Detection complete;
+ // if status is failure, it means the tag does not contain any or valid
+ // NDEF data; pass the failure status to the NFC Service;
+ status = eventData->ndef_detect.status;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_NDEF_DETECT_EVT: status = 0x%X, protocol = %u, "
+ "max_size = %u, cur_size = %u, flags = 0x%X",
+ __func__, status, eventData->ndef_detect.protocol,
+ eventData->ndef_detect.max_size, eventData->ndef_detect.cur_size,
+ eventData->ndef_detect.flags);
+ NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
+ nativeNfcTag_doCheckNdefResult(status, eventData->ndef_detect.max_size,
+ eventData->ndef_detect.cur_size,
+ eventData->ndef_detect.flags);
+ break;
- case NFA_DATA_EVT: // Data message received (for non-NDEF reads)
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DATA_EVT: status = 0x%X, len = %d", __func__,
- eventData->status, eventData->data.len);
- nativeNfcTag_doTransceiveStatus(eventData->status, eventData->data.p_data,
- eventData->data.len);
- break;
- case NFA_RW_INTF_ERROR_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFC_RW_INTF_ERROR_EVT", __func__);
- nativeNfcTag_notifyRfTimeout();
- nativeNfcTag_doReadCompleted(NFA_STATUS_TIMEOUT);
- break;
- case NFA_SELECT_CPLT_EVT: // Select completed
- status = eventData->status;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_SELECT_CPLT_EVT: status = %d", __func__, status);
- if (status != NFA_STATUS_OK) {
- LOG(ERROR) << StringPrintf("%s: NFA_SELECT_CPLT_EVT error: status = %d",
- __func__, status);
- }
- break;
+ case NFA_DATA_EVT: // Data message received (for non-NDEF reads)
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_DATA_EVT: status = 0x%X, len = %d", __func__,
+ eventData->status, eventData->data.len);
+ nativeNfcTag_doTransceiveStatus(eventData->status, eventData->data.p_data,
+ eventData->data.len);
+ break;
+ case NFA_RW_INTF_ERROR_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFC_RW_INTF_ERROR_EVT", __func__);
+ nativeNfcTag_notifyRfTimeout();
+ nativeNfcTag_doReadCompleted(NFA_STATUS_TIMEOUT);
+ break;
+ case NFA_SELECT_CPLT_EVT: // Select completed
+ status = eventData->status;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_SELECT_CPLT_EVT: status = %d", __func__, status);
+ if (status != NFA_STATUS_OK) {
+ LOG(ERROR) << StringPrintf("%s: NFA_SELECT_CPLT_EVT error: status = %d",
+ __func__, status);
+ }
+ break;
- case NFA_READ_CPLT_EVT: // NDEF-read or tag-specific-read completed
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_READ_CPLT_EVT: status = 0x%X", __func__, eventData->status);
- nativeNfcTag_doReadCompleted(eventData->status);
- NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
- break;
+ case NFA_READ_CPLT_EVT: // NDEF-read or tag-specific-read completed
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_READ_CPLT_EVT: status = 0x%X", __func__, eventData->status);
+ nativeNfcTag_doReadCompleted(eventData->status);
+ NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
+ break;
- case NFA_WRITE_CPLT_EVT: // Write completed
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_WRITE_CPLT_EVT: status = %d", __func__, eventData->status);
- nativeNfcTag_doWriteStatus(eventData->status == NFA_STATUS_OK);
- break;
+ case NFA_WRITE_CPLT_EVT: // Write completed
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_WRITE_CPLT_EVT: status = %d", __func__, eventData->status);
+ nativeNfcTag_doWriteStatus(eventData->status == NFA_STATUS_OK);
+ break;
- case NFA_SET_TAG_RO_EVT: // Tag set as Read only
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_SET_TAG_RO_EVT: status = %d", __func__, eventData->status);
- nativeNfcTag_doMakeReadonlyResult(eventData->status);
- break;
+ case NFA_SET_TAG_RO_EVT: // Tag set as Read only
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_SET_TAG_RO_EVT: status = %d", __func__, eventData->status);
+ nativeNfcTag_doMakeReadonlyResult(eventData->status);
+ break;
- case NFA_CE_NDEF_WRITE_START_EVT: // NDEF write started
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_CE_NDEF_WRITE_START_EVT: status: %d", __func__,
- eventData->status);
+ case NFA_CE_NDEF_WRITE_START_EVT: // NDEF write started
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_CE_NDEF_WRITE_START_EVT: status: %d",
+ __func__, eventData->status);
- if (eventData->status != NFA_STATUS_OK)
- LOG(ERROR) << StringPrintf(
- "%s: NFA_CE_NDEF_WRITE_START_EVT error: status = %d", __func__,
- eventData->status);
- break;
+ if (eventData->status != NFA_STATUS_OK)
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_CE_NDEF_WRITE_START_EVT error: status = %d", __func__,
+ eventData->status);
+ break;
- case NFA_CE_NDEF_WRITE_CPLT_EVT: // NDEF write completed
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: FA_CE_NDEF_WRITE_CPLT_EVT: len = %u", __func__,
- eventData->ndef_write_cplt.len);
- break;
+ case NFA_CE_NDEF_WRITE_CPLT_EVT: // NDEF write completed
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: FA_CE_NDEF_WRITE_CPLT_EVT: len = %u", __func__,
+ eventData->ndef_write_cplt.len);
+ break;
- case NFA_LLCP_ACTIVATED_EVT: // LLCP link is activated
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_LLCP_ACTIVATED_EVT: is_initiator: %d remote_wks: %d, "
- "remote_lsc: %d, remote_link_miu: %d, local_link_miu: %d",
- __func__, eventData->llcp_activated.is_initiator,
- eventData->llcp_activated.remote_wks,
- eventData->llcp_activated.remote_lsc,
- eventData->llcp_activated.remote_link_miu,
- eventData->llcp_activated.local_link_miu);
+ case NFA_LLCP_ACTIVATED_EVT: // LLCP link is activated
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_LLCP_ACTIVATED_EVT: is_initiator: %d remote_wks: %d, "
+ "remote_lsc: %d, remote_link_miu: %d, local_link_miu: %d",
+ __func__, eventData->llcp_activated.is_initiator,
+ eventData->llcp_activated.remote_wks,
+ eventData->llcp_activated.remote_lsc,
+ eventData->llcp_activated.remote_link_miu,
+ eventData->llcp_activated.local_link_miu);
- PeerToPeer::getInstance().llcpActivatedHandler(getNative(0, 0),
- eventData->llcp_activated);
- break;
+ PeerToPeer::getInstance().llcpActivatedHandler(getNative(0, 0),
+ eventData->llcp_activated);
+ break;
- case NFA_LLCP_DEACTIVATED_EVT: // LLCP link is deactivated
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_LLCP_DEACTIVATED_EVT", __func__);
- PeerToPeer::getInstance().llcpDeactivatedHandler(
- getNative(0, 0), eventData->llcp_deactivated);
- break;
- case NFA_LLCP_FIRST_PACKET_RECEIVED_EVT: // Received first packet over llcp
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_LLCP_FIRST_PACKET_RECEIVED_EVT", __func__);
- PeerToPeer::getInstance().llcpFirstPacketHandler(getNative(0, 0));
- break;
- case NFA_PRESENCE_CHECK_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_PRESENCE_CHECK_EVT", __func__);
- nativeNfcTag_doPresenceCheckResult(eventData->status);
- break;
- case NFA_FORMAT_CPLT_EVT:
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_FORMAT_CPLT_EVT: status=0x%X", __func__, eventData->status);
- nativeNfcTag_formatStatus(eventData->status == NFA_STATUS_OK);
- break;
+ case NFA_LLCP_DEACTIVATED_EVT: // LLCP link is deactivated
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_LLCP_DEACTIVATED_EVT", __func__);
+ PeerToPeer::getInstance().llcpDeactivatedHandler(
+ getNative(0, 0), eventData->llcp_deactivated);
+ break;
+ case NFA_LLCP_FIRST_PACKET_RECEIVED_EVT: // Received first packet over llcp
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_LLCP_FIRST_PACKET_RECEIVED_EVT", __func__);
+ PeerToPeer::getInstance().llcpFirstPacketHandler(getNative(0, 0));
+ break;
+ case NFA_PRESENCE_CHECK_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_PRESENCE_CHECK_EVT", __func__);
+ nativeNfcTag_doPresenceCheckResult(eventData->status);
+ break;
+ case NFA_FORMAT_CPLT_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_FORMAT_CPLT_EVT: status=0x%X", __func__, eventData->status);
+ nativeNfcTag_formatStatus(eventData->status == NFA_STATUS_OK);
+ break;
- case NFA_I93_CMD_CPLT_EVT:
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_I93_CMD_CPLT_EVT: status=0x%X", __func__, eventData->status);
- break;
+ case NFA_I93_CMD_CPLT_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_I93_CMD_CPLT_EVT: status=0x%X", __func__, eventData->status);
+ break;
- case NFA_CE_UICC_LISTEN_CONFIGURED_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_CE_UICC_LISTEN_CONFIGURED_EVT : status=0x%X",
- __func__, eventData->status);
- break;
+ case NFA_CE_UICC_LISTEN_CONFIGURED_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_CE_UICC_LISTEN_CONFIGURED_EVT : status=0x%X",
+ __func__, eventData->status);
+ break;
- case NFA_SET_P2P_LISTEN_TECH_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_SET_P2P_LISTEN_TECH_EVT", __func__);
- PeerToPeer::getInstance().connectionEventHandler(connEvent, eventData);
- break;
+ case NFA_SET_P2P_LISTEN_TECH_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_SET_P2P_LISTEN_TECH_EVT", __func__);
+ PeerToPeer::getInstance().connectionEventHandler(connEvent, eventData);
+ break;
- default:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: unknown event ????", __func__);
- break;
+ default:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: unknown event ????", __func__);
+ break;
}
}
@@ -585,11 +587,11 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nfcManager_initNativeStruc(JNIEnv *e, jobject o) {
+static jboolean nfcManager_initNativeStruc(JNIEnv* e, jobject o) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
- nfc_jni_native_data *nat =
- (nfc_jni_native_data *)malloc(sizeof(struct nfc_jni_native_data));
+ nfc_jni_native_data* nat =
+ (nfc_jni_native_data*)malloc(sizeof(struct nfc_jni_native_data));
if (nat == NULL) {
LOG(ERROR) << StringPrintf("%s: fail allocate native data", __func__);
return JNI_FALSE;
@@ -660,145 +662,145 @@
**
*******************************************************************************/
void nfaDeviceManagementCallback(uint8_t dmEvent,
- tNFA_DM_CBACK_DATA *eventData) {
+ tNFA_DM_CBACK_DATA* eventData) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; event=0x%X", __func__, dmEvent);
switch (dmEvent) {
- case NFA_DM_ENABLE_EVT: /* Result of NFA_Enable */
- {
- SyncEventGuard guard(sNfaEnableEvent);
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_DM_ENABLE_EVT; status=0x%X", __func__, eventData->status);
- sIsNfaEnabled = eventData->status == NFA_STATUS_OK;
- sIsDisabling = false;
- sNfaEnableEvent.notifyOne();
- } break;
-
- case NFA_DM_DISABLE_EVT: /* Result of NFA_Disable */
- {
- SyncEventGuard guard(sNfaDisableEvent);
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DM_DISABLE_EVT", __func__);
- sIsNfaEnabled = false;
- sIsDisabling = false;
- sNfaDisableEvent.notifyOne();
- } break;
-
- case NFA_DM_SET_CONFIG_EVT: // result of NFA_SetConfig
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DM_SET_CONFIG_EVT", __func__);
+ case NFA_DM_ENABLE_EVT: /* Result of NFA_Enable */
{
- SyncEventGuard guard(sNfaSetConfigEvent);
- sNfaSetConfigEvent.notifyOne();
- }
- break;
-
- case NFA_DM_GET_CONFIG_EVT: /* Result of NFA_GetConfig */
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DM_GET_CONFIG_EVT", __func__);
- {
- SyncEventGuard guard(sNfaGetConfigEvent);
- if (eventData->status == NFA_STATUS_OK &&
- eventData->get_config.tlv_size <= sizeof(sConfig)) {
- sCurrentConfigLen = eventData->get_config.tlv_size;
- memcpy(sConfig, eventData->get_config.param_tlvs,
- eventData->get_config.tlv_size);
- } else {
- LOG(ERROR) << StringPrintf("%s: NFA_DM_GET_CONFIG failed", __func__);
- sCurrentConfigLen = 0;
- }
- sNfaGetConfigEvent.notifyOne();
- }
- break;
-
- case NFA_DM_RF_FIELD_EVT:
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_DM_RF_FIELD_EVT; status=0x%X; field status=%u", __func__,
- eventData->rf_field.status, eventData->rf_field.rf_field_status);
- if (!sP2pActive && eventData->rf_field.status == NFA_STATUS_OK) {
- struct nfc_jni_native_data *nat = getNative(NULL, NULL);
- JNIEnv *e = NULL;
- ScopedAttach attach(nat->vm, &e);
- if (e == NULL) {
- LOG(ERROR) << StringPrintf("jni env is null");
- return;
- }
- if (eventData->rf_field.rf_field_status == NFA_DM_RF_FIELD_ON)
- e->CallVoidMethod(nat->manager,
- android::gCachedNfcManagerNotifyRfFieldActivated);
- else
- e->CallVoidMethod(nat->manager,
- android::gCachedNfcManagerNotifyRfFieldDeactivated);
- }
- break;
-
- case NFA_DM_NFCC_TRANSPORT_ERR_EVT:
- case NFA_DM_NFCC_TIMEOUT_EVT: {
- if (dmEvent == NFA_DM_NFCC_TIMEOUT_EVT)
- LOG(ERROR) << StringPrintf("%s: NFA_DM_NFCC_TIMEOUT_EVT; abort",
- __func__);
- else if (dmEvent == NFA_DM_NFCC_TRANSPORT_ERR_EVT)
- LOG(ERROR) << StringPrintf("%s: NFA_DM_NFCC_TRANSPORT_ERR_EVT; abort",
- __func__);
-
- nativeNfcTag_abortWaits();
- NfcTag::getInstance().abort();
- sAbortConnlessWait = true;
- nativeLlcpConnectionlessSocket_abortWait();
- {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: aborting sNfaEnableDisablePollingEvent", __func__);
- SyncEventGuard guard(sNfaEnableDisablePollingEvent);
- sNfaEnableDisablePollingEvent.notifyOne();
- }
- {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: aborting sNfaEnableEvent", __func__);
SyncEventGuard guard(sNfaEnableEvent);
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_DM_ENABLE_EVT; status=0x%X", __func__, eventData->status);
+ sIsNfaEnabled = eventData->status == NFA_STATUS_OK;
+ sIsDisabling = false;
sNfaEnableEvent.notifyOne();
- }
- {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: aborting sNfaDisableEvent", __func__);
- SyncEventGuard guard(sNfaDisableEvent);
- sNfaDisableEvent.notifyOne();
- }
- sDiscoveryEnabled = false;
- sPollingEnabled = false;
- PowerSwitch::getInstance().abort();
+ } break;
- if (!sIsDisabling && sIsNfaEnabled) {
- EXTNS_Close();
- NFA_Disable(FALSE);
- sIsDisabling = true;
- } else {
+ case NFA_DM_DISABLE_EVT: /* Result of NFA_Disable */
+ {
+ SyncEventGuard guard(sNfaDisableEvent);
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_DM_DISABLE_EVT", __func__);
sIsNfaEnabled = false;
sIsDisabling = false;
- }
- PowerSwitch::getInstance().initialize(PowerSwitch::UNKNOWN_LEVEL);
- LOG(ERROR) << StringPrintf("%s: crash NFC service", __func__);
- //////////////////////////////////////////////
- // crash the NFC service process so it can restart automatically
- abort();
- //////////////////////////////////////////////
- } break;
+ sNfaDisableEvent.notifyOne();
+ } break;
- case NFA_DM_PWR_MODE_CHANGE_EVT:
- PowerSwitch::getInstance().deviceManagementCallback(dmEvent, eventData);
- break;
+ case NFA_DM_SET_CONFIG_EVT: // result of NFA_SetConfig
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_DM_SET_CONFIG_EVT", __func__);
+ {
+ SyncEventGuard guard(sNfaSetConfigEvent);
+ sNfaSetConfigEvent.notifyOne();
+ }
+ break;
- case NFA_DM_SET_POWER_SUB_STATE_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DM_SET_POWER_SUB_STATE_EVT; status=0x%X",
- __FUNCTION__, eventData->power_sub_state.status);
- SyncEventGuard guard(sNfaSetPowerSubState);
- sNfaSetPowerSubState.notifyOne();
- } break;
- default:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: unhandled event", __func__);
- break;
+ case NFA_DM_GET_CONFIG_EVT: /* Result of NFA_GetConfig */
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_DM_GET_CONFIG_EVT", __func__);
+ {
+ SyncEventGuard guard(sNfaGetConfigEvent);
+ if (eventData->status == NFA_STATUS_OK &&
+ eventData->get_config.tlv_size <= sizeof(sConfig)) {
+ sCurrentConfigLen = eventData->get_config.tlv_size;
+ memcpy(sConfig, eventData->get_config.param_tlvs,
+ eventData->get_config.tlv_size);
+ } else {
+ LOG(ERROR) << StringPrintf("%s: NFA_DM_GET_CONFIG failed", __func__);
+ sCurrentConfigLen = 0;
+ }
+ sNfaGetConfigEvent.notifyOne();
+ }
+ break;
+
+ case NFA_DM_RF_FIELD_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_DM_RF_FIELD_EVT; status=0x%X; field status=%u", __func__,
+ eventData->rf_field.status, eventData->rf_field.rf_field_status);
+ if (!sP2pActive && eventData->rf_field.status == NFA_STATUS_OK) {
+ struct nfc_jni_native_data* nat = getNative(NULL, NULL);
+ JNIEnv* e = NULL;
+ ScopedAttach attach(nat->vm, &e);
+ if (e == NULL) {
+ LOG(ERROR) << StringPrintf("jni env is null");
+ return;
+ }
+ if (eventData->rf_field.rf_field_status == NFA_DM_RF_FIELD_ON)
+ e->CallVoidMethod(nat->manager,
+ android::gCachedNfcManagerNotifyRfFieldActivated);
+ else
+ e->CallVoidMethod(nat->manager,
+ android::gCachedNfcManagerNotifyRfFieldDeactivated);
+ }
+ break;
+
+ case NFA_DM_NFCC_TRANSPORT_ERR_EVT:
+ case NFA_DM_NFCC_TIMEOUT_EVT: {
+ if (dmEvent == NFA_DM_NFCC_TIMEOUT_EVT)
+ LOG(ERROR) << StringPrintf("%s: NFA_DM_NFCC_TIMEOUT_EVT; abort",
+ __func__);
+ else if (dmEvent == NFA_DM_NFCC_TRANSPORT_ERR_EVT)
+ LOG(ERROR) << StringPrintf("%s: NFA_DM_NFCC_TRANSPORT_ERR_EVT; abort",
+ __func__);
+
+ nativeNfcTag_abortWaits();
+ NfcTag::getInstance().abort();
+ sAbortConnlessWait = true;
+ nativeLlcpConnectionlessSocket_abortWait();
+ {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: aborting sNfaEnableDisablePollingEvent", __func__);
+ SyncEventGuard guard(sNfaEnableDisablePollingEvent);
+ sNfaEnableDisablePollingEvent.notifyOne();
+ }
+ {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: aborting sNfaEnableEvent", __func__);
+ SyncEventGuard guard(sNfaEnableEvent);
+ sNfaEnableEvent.notifyOne();
+ }
+ {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: aborting sNfaDisableEvent", __func__);
+ SyncEventGuard guard(sNfaDisableEvent);
+ sNfaDisableEvent.notifyOne();
+ }
+ sDiscoveryEnabled = false;
+ sPollingEnabled = false;
+ PowerSwitch::getInstance().abort();
+
+ if (!sIsDisabling && sIsNfaEnabled) {
+ EXTNS_Close();
+ NFA_Disable(FALSE);
+ sIsDisabling = true;
+ } else {
+ sIsNfaEnabled = false;
+ sIsDisabling = false;
+ }
+ PowerSwitch::getInstance().initialize(PowerSwitch::UNKNOWN_LEVEL);
+ LOG(ERROR) << StringPrintf("%s: crash NFC service", __func__);
+ //////////////////////////////////////////////
+ // crash the NFC service process so it can restart automatically
+ abort();
+ //////////////////////////////////////////////
+ } break;
+
+ case NFA_DM_PWR_MODE_CHANGE_EVT:
+ PowerSwitch::getInstance().deviceManagementCallback(dmEvent, eventData);
+ break;
+
+ case NFA_DM_SET_POWER_SUB_STATE_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_DM_SET_POWER_SUB_STATE_EVT; status=0x%X",
+ __FUNCTION__, eventData->power_sub_state.status);
+ SyncEventGuard guard(sNfaSetPowerSubState);
+ sNfaSetPowerSubState.notifyOne();
+ } break;
+ default:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: unhandled event", __func__);
+ break;
}
}
@@ -813,10 +815,10 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nfcManager_sendRawFrame(JNIEnv *e, jobject, jbyteArray data) {
+static jboolean nfcManager_sendRawFrame(JNIEnv* e, jobject, jbyteArray data) {
ScopedByteArrayRO bytes(e, data);
- uint8_t *buf =
- const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(&bytes[0]));
+ uint8_t* buf =
+ const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
size_t bufLen = bytes.size();
tNFA_STATUS status = NFA_SendRawFrame(buf, bufLen, 0);
@@ -836,11 +838,11 @@
** Returns: True if aid is accpted by NFA Layer.
**
*******************************************************************************/
-static jboolean nfcManager_routeAid(JNIEnv *e, jobject, jbyteArray aid,
+static jboolean nfcManager_routeAid(JNIEnv* e, jobject, jbyteArray aid,
jint route, jint aidInfo) {
ScopedByteArrayRO bytes(e, aid);
- uint8_t *buf =
- const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(&bytes[0]));
+ uint8_t* buf =
+ const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
size_t bufLen = bytes.size();
return RoutingManager::getInstance().addAidRouting(buf, bufLen, route,
aidInfo);
@@ -857,10 +859,10 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nfcManager_unrouteAid(JNIEnv *e, jobject, jbyteArray aid) {
+static jboolean nfcManager_unrouteAid(JNIEnv* e, jobject, jbyteArray aid) {
ScopedByteArrayRO bytes(e, aid);
- uint8_t *buf =
- const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(&bytes[0]));
+ uint8_t* buf =
+ const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
size_t bufLen = bytes.size();
bool result = RoutingManager::getInstance().removeAidRouting(buf, bufLen);
return result;
@@ -877,7 +879,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nfcManager_commitRouting(JNIEnv *e, jobject) {
+static jboolean nfcManager_commitRouting(JNIEnv* e, jobject) {
return RoutingManager::getInstance().commitRouting();
}
@@ -893,13 +895,13 @@
** Returns: Handle retrieve from RoutingManager.
**
*******************************************************************************/
-static jint nfcManager_doRegisterT3tIdentifier(JNIEnv *e, jobject,
+static jint nfcManager_doRegisterT3tIdentifier(JNIEnv* e, jobject,
jbyteArray t3tIdentifier) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
ScopedByteArrayRO bytes(e, t3tIdentifier);
- uint8_t *buf =
- const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(&bytes[0]));
+ uint8_t* buf =
+ const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&bytes[0]));
size_t bufLen = bytes.size();
int handle = RoutingManager::getInstance().registerT3tIdentifier(buf, bufLen);
@@ -922,7 +924,7 @@
** Returns: None
**
*******************************************************************************/
-static void nfcManager_doDeregisterT3tIdentifier(JNIEnv *, jobject,
+static void nfcManager_doDeregisterT3tIdentifier(JNIEnv*, jobject,
jint handle) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; handle=%d", __func__, handle);
@@ -943,7 +945,7 @@
** Returns: LF_T3T_MAX value.
**
*******************************************************************************/
-static jint nfcManager_getLfT3tMax(JNIEnv *, jobject) {
+static jint nfcManager_getLfT3tMax(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("LF_T3T_MAX=%d", sLfT3tMax);
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
@@ -962,13 +964,13 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nfcManager_doInitialize(JNIEnv *e, jobject o) {
+static jboolean nfcManager_doInitialize(JNIEnv* e, jobject o) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; ver=%s nfa=%s NCI_VERSION=0x%02X", __func__,
nfca_version_string, nfa_version_string, NCI_VERSION);
tNFA_STATUS stat = NFA_STATUS_OK;
- PowerSwitch &powerSwitch = PowerSwitch::getInstance();
+ PowerSwitch& powerSwitch = PowerSwitch::getInstance();
if (sIsNfaEnabled) {
DLOG_IF(INFO, nfc_debug_enabled)
@@ -981,19 +983,19 @@
{
unsigned long num = 0;
- NfcAdaptation &theInstance = NfcAdaptation::GetInstance();
- theInstance.Initialize(); // start GKI, NCI task, NFC task
+ NfcAdaptation& theInstance = NfcAdaptation::GetInstance();
+ theInstance.Initialize(); // start GKI, NCI task, NFC task
{
SyncEventGuard guard(sNfaEnableEvent);
- tHAL_NFC_ENTRY *halFuncEntries = theInstance.GetHalEntryFuncs();
+ tHAL_NFC_ENTRY* halFuncEntries = theInstance.GetHalEntryFuncs();
NFA_Init(halFuncEntries);
stat = NFA_Enable(nfaDeviceManagementCallback, nfaConnectionCallback);
if (stat == NFA_STATUS_OK) {
num = initializeGlobalAppLogLevel();
- sNfaEnableEvent.wait(); // wait for NFA command to finish
+ sNfaEnableEvent.wait(); // wait for NFA command to finish
}
EXTNS_Init(nfaDeviceManagementCallback, nfaConnectionCallback);
}
@@ -1021,7 +1023,7 @@
NFA_SetConfig(NCI_PARAM_ID_NFC_DEP_OP, sizeof(uint8_t), &configData);
}
- struct nfc_jni_native_data *nat = getNative(e, o);
+ struct nfc_jni_native_data* nat = getNative(e, o);
if (nat) {
if (GetNumValue(NAME_POLLING_TECH_MASK, &num, sizeof(num)))
@@ -1082,11 +1084,11 @@
return sIsNfaEnabled ? JNI_TRUE : JNI_FALSE;
}
-static void nfcManager_doEnableDtaMode(JNIEnv *, jobject) {
+static void nfcManager_doEnableDtaMode(JNIEnv*, jobject) {
gIsDtaEnabled = true;
}
-static void nfcManager_doDisableDtaMode(JNIEnv *, jobject) {
+static void nfcManager_doDisableDtaMode(JNIEnv*, jobject) {
gIsDtaEnabled = false;
}
/*******************************************************************************
@@ -1104,14 +1106,14 @@
** Returns: None
**
*******************************************************************************/
-static void nfcManager_enableDiscovery(JNIEnv *e, jobject o,
+static void nfcManager_enableDiscovery(JNIEnv* e, jobject o,
jint technologies_mask,
jboolean enable_lptd,
jboolean reader_mode,
jboolean enable_host_routing,
jboolean enable_p2p, jboolean restart) {
tNFA_TECHNOLOGY_MASK tech_mask = DEFAULT_TECH_MASK;
- struct nfc_jni_native_data *nat = getNative(e, o);
+ struct nfc_jni_native_data* nat = getNative(e, o);
if (technologies_mask == -1 && nat)
tech_mask = (tNFA_TECHNOLOGY_MASK)nat->tech_mask;
@@ -1158,7 +1160,7 @@
NFA_DisableListening();
NFA_SetRfDiscoveryDuration(READER_MODE_DISCOVERY_DURATION);
} else if (!reader_mode && sReaderModeEnabled) {
- struct nfc_jni_native_data *nat = getNative(e, o);
+ struct nfc_jni_native_data* nat = getNative(e, o);
sReaderModeEnabled = false;
NFA_EnableListening();
NFA_SetRfDiscoveryDuration(nat->discovery_duration);
@@ -1197,7 +1199,7 @@
** Returns: None
**
*******************************************************************************/
-void nfcManager_disableDiscovery(JNIEnv *e, jobject o) {
+void nfcManager_disableDiscovery(JNIEnv* e, jobject o) {
tNFA_STATUS status = NFA_STATUS_OK;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter;", __func__);
@@ -1211,8 +1213,7 @@
// Stop RF Discovery.
startRfDiscovery(false);
- if (sPollingEnabled)
- status = stopPolling_rfDiscoveryDisabled();
+ if (sPollingEnabled) status = stopPolling_rfDiscoveryDisabled();
PeerToPeer::getInstance().enableP2pListening(false);
sP2pEnabled = false;
@@ -1256,8 +1257,7 @@
sHasLptd = true;
}
// Bail if we checked and didn't find any LPTD config before
- if (!sHasLptd)
- return;
+ if (!sHasLptd) return;
uint8_t enable_byte = enable ? 0x01 : 0x00;
SyncEventGuard guard(sNfaSetConfigEvent);
@@ -1287,7 +1287,7 @@
** Returns: NativeLlcpServiceSocket Java object.
**
*******************************************************************************/
-static jobject nfcManager_doCreateLlcpServiceSocket(JNIEnv *e, jobject,
+static jobject nfcManager_doCreateLlcpServiceSocket(JNIEnv* e, jobject,
jint nSap, jstring sn,
jint miu, jint rw,
jint linearBufferLength) {
@@ -1368,7 +1368,7 @@
** Returns: Last error code.
**
*******************************************************************************/
-static jint nfcManager_doGetLastError(JNIEnv *, jobject) {
+static jint nfcManager_doGetLastError(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: last error=%i", __func__, sLastError);
return sLastError;
@@ -1385,7 +1385,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nfcManager_doDeinitialize(JNIEnv *, jobject) {
+static jboolean nfcManager_doDeinitialize(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
sIsDisabling = true;
@@ -1401,7 +1401,7 @@
if (stat == NFA_STATUS_OK) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: wait for completion", __func__);
- sNfaDisableEvent.wait(); // wait for NFA command to finish
+ sNfaDisableEvent.wait(); // wait for NFA command to finish
PeerToPeer::getInstance().handleNfcOnOff(false);
} else {
LOG(ERROR) << StringPrintf("%s: fail disable; error=0x%X", __func__,
@@ -1426,7 +1426,7 @@
sNfaEnableDisablePollingEvent.notifyOne();
}
- NfcAdaptation &theInstance = NfcAdaptation::GetInstance();
+ NfcAdaptation& theInstance = NfcAdaptation::GetInstance();
theInstance.Finalize();
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
@@ -1448,7 +1448,7 @@
** Returns: NativeLlcpSocket Java object.
**
*******************************************************************************/
-static jobject nfcManager_doCreateLlcpSocket(JNIEnv *e, jobject, jint nSap,
+static jobject nfcManager_doCreateLlcpSocket(JNIEnv* e, jobject, jint nSap,
jint miu, jint rw,
jint linearBufferLength) {
DLOG_IF(INFO, nfc_debug_enabled)
@@ -1511,7 +1511,7 @@
** Returns: NativeLlcpConnectionlessSocket Java object.
**
*******************************************************************************/
-static jobject nfcManager_doCreateLlcpConnectionlessSocket(JNIEnv *, jobject,
+static jobject nfcManager_doCreateLlcpConnectionlessSocket(JNIEnv*, jobject,
jint nSap,
jstring /*sn*/) {
DLOG_IF(INFO, nfc_debug_enabled)
@@ -1530,7 +1530,7 @@
** Returns: True if the peer supports NFC-DEP.
**
*******************************************************************************/
-static bool isPeerToPeer(tNFA_ACTIVATED &activated) {
+static bool isPeerToPeer(tNFA_ACTIVATED& activated) {
return activated.activate_ntf.protocol == NFA_PROTOCOL_NFC_DEP;
}
@@ -1544,7 +1544,7 @@
** Returns: True if this listen mode.
**
*******************************************************************************/
-static bool isListenMode(tNFA_ACTIVATED &activated) {
+static bool isListenMode(tNFA_ACTIVATED& activated) {
return ((NFC_DISCOVERY_TYPE_LISTEN_A ==
activated.activate_ntf.rf_tech_param.mode) ||
(NFC_DISCOVERY_TYPE_LISTEN_B ==
@@ -1570,7 +1570,7 @@
** Returns: True
**
*******************************************************************************/
-static jboolean nfcManager_doCheckLlcp(JNIEnv *, jobject) {
+static jboolean nfcManager_doCheckLlcp(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return JNI_TRUE;
}
@@ -1584,7 +1584,7 @@
** Returns: True
**
*******************************************************************************/
-static jboolean nfcManager_doActivateLlcp(JNIEnv *, jobject) {
+static jboolean nfcManager_doActivateLlcp(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return JNI_TRUE;
}
@@ -1598,10 +1598,10 @@
** Returns: None
**
*******************************************************************************/
-static void nfcManager_doAbort(JNIEnv *e, jobject, jstring msg) {
+static void nfcManager_doAbort(JNIEnv* e, jobject, jstring msg) {
ScopedUtfChars message = {e, msg};
e->FatalError(message.c_str());
- abort(); // <-- Unreachable
+ abort(); // <-- Unreachable
}
/*******************************************************************************
@@ -1613,11 +1613,11 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nfcManager_doDownload(JNIEnv *, jobject) {
+static jboolean nfcManager_doDownload(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
- NfcAdaptation &theInstance = NfcAdaptation::GetInstance();
+ NfcAdaptation& theInstance = NfcAdaptation::GetInstance();
- theInstance.Initialize(); // start GKI, NCI task, NFC task
+ theInstance.Initialize(); // start GKI, NCI task, NFC task
theInstance.DownloadFirmware();
theInstance.Finalize();
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
@@ -1633,7 +1633,7 @@
** Returns: None
**
*******************************************************************************/
-static void nfcManager_doResetTimeouts(JNIEnv *, jobject) {
+static void nfcManager_doResetTimeouts(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
NfcTag::getInstance().resetAllTransceiveTimeouts();
}
@@ -1651,8 +1651,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static bool nfcManager_doSetTimeout(JNIEnv *, jobject, jint tech,
- jint timeout) {
+static bool nfcManager_doSetTimeout(JNIEnv*, jobject, jint tech, jint timeout) {
if (timeout <= 0) {
LOG(ERROR) << StringPrintf("%s: Timeout must be positive.", __func__);
return false;
@@ -1675,7 +1674,7 @@
** Returns: Timeout value.
**
*******************************************************************************/
-static jint nfcManager_doGetTimeout(JNIEnv *, jobject, jint tech) {
+static jint nfcManager_doGetTimeout(JNIEnv*, jobject, jint tech) {
int timeout = NfcTag::getInstance().getTransceiveTimeout(tech);
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: tech=%d, timeout=%d", __func__, tech, timeout);
@@ -1694,20 +1693,19 @@
** Returns: Void
**
*******************************************************************************/
-static void nfcManager_doDump(JNIEnv *e, jobject obj, jobject fdobj) {
+static void nfcManager_doDump(JNIEnv* e, jobject obj, jobject fdobj) {
int fd = jniGetFDFromFileDescriptor(e, fdobj);
- if (fd < 0)
- return;
+ if (fd < 0) return;
- NfcAdaptation &theInstance = NfcAdaptation::GetInstance();
+ NfcAdaptation& theInstance = NfcAdaptation::GetInstance();
theInstance.Dump(fd);
}
-static jint nfcManager_doGetNciVersion(JNIEnv *, jobject) {
+static jint nfcManager_doGetNciVersion(JNIEnv*, jobject) {
return NFC_GetNCIVersion();
}
-static void nfcManager_doSetScreenState(JNIEnv *e, jobject o,
+static void nfcManager_doSetScreenState(JNIEnv* e, jobject o,
jint screen_state_mask) {
tNFA_STATUS status = NFA_STATUS_OK;
uint8_t state = (screen_state_mask & NFA_SCREEN_STATE_MASK);
@@ -1794,25 +1792,19 @@
** Returns: None.
**
*******************************************************************************/
-static void nfcManager_doSetP2pInitiatorModes(JNIEnv *e, jobject o,
+static void nfcManager_doSetP2pInitiatorModes(JNIEnv* e, jobject o,
jint modes) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: modes=0x%X", __func__, modes);
- struct nfc_jni_native_data *nat = getNative(e, o);
+ struct nfc_jni_native_data* nat = getNative(e, o);
tNFA_TECHNOLOGY_MASK mask = 0;
- if (modes & 0x01)
- mask |= NFA_TECHNOLOGY_MASK_A;
- if (modes & 0x02)
- mask |= NFA_TECHNOLOGY_MASK_F;
- if (modes & 0x04)
- mask |= NFA_TECHNOLOGY_MASK_F;
- if (modes & 0x08)
- mask |= NFA_TECHNOLOGY_MASK_A_ACTIVE;
- if (modes & 0x10)
- mask |= NFA_TECHNOLOGY_MASK_F_ACTIVE;
- if (modes & 0x20)
- mask |= NFA_TECHNOLOGY_MASK_F_ACTIVE;
+ if (modes & 0x01) mask |= NFA_TECHNOLOGY_MASK_A;
+ if (modes & 0x02) mask |= NFA_TECHNOLOGY_MASK_F;
+ if (modes & 0x04) mask |= NFA_TECHNOLOGY_MASK_F;
+ if (modes & 0x08) mask |= NFA_TECHNOLOGY_MASK_A_ACTIVE;
+ if (modes & 0x10) mask |= NFA_TECHNOLOGY_MASK_F_ACTIVE;
+ if (modes & 0x20) mask |= NFA_TECHNOLOGY_MASK_F_ACTIVE;
nat->tech_mask = mask;
}
@@ -1828,29 +1820,26 @@
** Returns: None.
**
*******************************************************************************/
-static void nfcManager_doSetP2pTargetModes(JNIEnv *, jobject, jint modes) {
+static void nfcManager_doSetP2pTargetModes(JNIEnv*, jobject, jint modes) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: modes=0x%X", __func__, modes);
// Map in the right modes
tNFA_TECHNOLOGY_MASK mask = 0;
- if (modes & 0x01)
- mask |= NFA_TECHNOLOGY_MASK_A;
- if (modes & 0x02)
- mask |= NFA_TECHNOLOGY_MASK_F;
- if (modes & 0x04)
- mask |= NFA_TECHNOLOGY_MASK_F;
+ if (modes & 0x01) mask |= NFA_TECHNOLOGY_MASK_A;
+ if (modes & 0x02) mask |= NFA_TECHNOLOGY_MASK_F;
+ if (modes & 0x04) mask |= NFA_TECHNOLOGY_MASK_F;
if (modes & 0x08)
mask |= NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE;
PeerToPeer::getInstance().setP2pListenMask(mask);
}
-static void nfcManager_doEnableScreenOffSuspend(JNIEnv *e, jobject o) {
+static void nfcManager_doEnableScreenOffSuspend(JNIEnv* e, jobject o) {
PowerSwitch::getInstance().setScreenOffPowerState(
PowerSwitch::POWER_STATE_FULL);
}
-static void nfcManager_doDisableScreenOffSuspend(JNIEnv *e, jobject o) {
+static void nfcManager_doDisableScreenOffSuspend(JNIEnv* e, jobject o) {
PowerSwitch::getInstance().setScreenOffPowerState(
PowerSwitch::POWER_STATE_OFF);
}
@@ -1861,78 +1850,78 @@
**
*****************************************************************************/
static JNINativeMethod gMethods[] = {
- {"doDownload", "()Z", (void *)nfcManager_doDownload},
+ {"doDownload", "()Z", (void*)nfcManager_doDownload},
- {"initializeNativeStructure", "()Z", (void *)nfcManager_initNativeStruc},
+ {"initializeNativeStructure", "()Z", (void*)nfcManager_initNativeStruc},
- {"doInitialize", "()Z", (void *)nfcManager_doInitialize},
+ {"doInitialize", "()Z", (void*)nfcManager_doInitialize},
- {"doDeinitialize", "()Z", (void *)nfcManager_doDeinitialize},
+ {"doDeinitialize", "()Z", (void*)nfcManager_doDeinitialize},
- {"sendRawFrame", "([B)Z", (void *)nfcManager_sendRawFrame},
+ {"sendRawFrame", "([B)Z", (void*)nfcManager_sendRawFrame},
- {"routeAid", "([BII)Z", (void *)nfcManager_routeAid},
+ {"routeAid", "([BII)Z", (void*)nfcManager_routeAid},
- {"unrouteAid", "([B)Z", (void *)nfcManager_unrouteAid},
+ {"unrouteAid", "([B)Z", (void*)nfcManager_unrouteAid},
- {"commitRouting", "()Z", (void *)nfcManager_commitRouting},
+ {"commitRouting", "()Z", (void*)nfcManager_commitRouting},
{"doRegisterT3tIdentifier", "([B)I",
- (void *)nfcManager_doRegisterT3tIdentifier},
+ (void*)nfcManager_doRegisterT3tIdentifier},
{"doDeregisterT3tIdentifier", "(I)V",
- (void *)nfcManager_doDeregisterT3tIdentifier},
+ (void*)nfcManager_doDeregisterT3tIdentifier},
- {"getLfT3tMax", "()I", (void *)nfcManager_getLfT3tMax},
+ {"getLfT3tMax", "()I", (void*)nfcManager_getLfT3tMax},
- {"doEnableDiscovery", "(IZZZZZ)V", (void *)nfcManager_enableDiscovery},
+ {"doEnableDiscovery", "(IZZZZZ)V", (void*)nfcManager_enableDiscovery},
- {"doCheckLlcp", "()Z", (void *)nfcManager_doCheckLlcp},
+ {"doCheckLlcp", "()Z", (void*)nfcManager_doCheckLlcp},
- {"doActivateLlcp", "()Z", (void *)nfcManager_doActivateLlcp},
+ {"doActivateLlcp", "()Z", (void*)nfcManager_doActivateLlcp},
{"doCreateLlcpConnectionlessSocket",
"(ILjava/lang/String;)Lcom/android/nfc/dhimpl/"
"NativeLlcpConnectionlessSocket;",
- (void *)nfcManager_doCreateLlcpConnectionlessSocket},
+ (void*)nfcManager_doCreateLlcpConnectionlessSocket},
{"doCreateLlcpServiceSocket",
"(ILjava/lang/String;III)Lcom/android/nfc/dhimpl/NativeLlcpServiceSocket;",
- (void *)nfcManager_doCreateLlcpServiceSocket},
+ (void*)nfcManager_doCreateLlcpServiceSocket},
{"doCreateLlcpSocket", "(IIII)Lcom/android/nfc/dhimpl/NativeLlcpSocket;",
- (void *)nfcManager_doCreateLlcpSocket},
+ (void*)nfcManager_doCreateLlcpSocket},
- {"doGetLastError", "()I", (void *)nfcManager_doGetLastError},
+ {"doGetLastError", "()I", (void*)nfcManager_doGetLastError},
- {"disableDiscovery", "()V", (void *)nfcManager_disableDiscovery},
+ {"disableDiscovery", "()V", (void*)nfcManager_disableDiscovery},
- {"doSetTimeout", "(II)Z", (void *)nfcManager_doSetTimeout},
+ {"doSetTimeout", "(II)Z", (void*)nfcManager_doSetTimeout},
- {"doGetTimeout", "(I)I", (void *)nfcManager_doGetTimeout},
+ {"doGetTimeout", "(I)I", (void*)nfcManager_doGetTimeout},
- {"doResetTimeouts", "()V", (void *)nfcManager_doResetTimeouts},
+ {"doResetTimeouts", "()V", (void*)nfcManager_doResetTimeouts},
- {"doAbort", "(Ljava/lang/String;)V", (void *)nfcManager_doAbort},
+ {"doAbort", "(Ljava/lang/String;)V", (void*)nfcManager_doAbort},
{"doSetP2pInitiatorModes", "(I)V",
- (void *)nfcManager_doSetP2pInitiatorModes},
+ (void*)nfcManager_doSetP2pInitiatorModes},
- {"doSetP2pTargetModes", "(I)V", (void *)nfcManager_doSetP2pTargetModes},
+ {"doSetP2pTargetModes", "(I)V", (void*)nfcManager_doSetP2pTargetModes},
{"doEnableScreenOffSuspend", "()V",
- (void *)nfcManager_doEnableScreenOffSuspend},
+ (void*)nfcManager_doEnableScreenOffSuspend},
- {"doSetScreenState", "(I)V", (void *)nfcManager_doSetScreenState},
+ {"doSetScreenState", "(I)V", (void*)nfcManager_doSetScreenState},
{"doDisableScreenOffSuspend", "()V",
- (void *)nfcManager_doDisableScreenOffSuspend},
+ (void*)nfcManager_doDisableScreenOffSuspend},
- {"doDump", "(Ljava/io/FileDescriptor;)V", (void *)nfcManager_doDump},
+ {"doDump", "(Ljava/io/FileDescriptor;)V", (void*)nfcManager_doDump},
- {"getNciVersion", "()I", (void *)nfcManager_doGetNciVersion},
- {"doEnableDtaMode", "()V", (void *)nfcManager_doEnableDtaMode},
- {"doDisableDtaMode", "()V", (void *)nfcManager_doDisableDtaMode}
+ {"getNciVersion", "()I", (void*)nfcManager_doGetNciVersion},
+ {"doEnableDtaMode", "()V", (void*)nfcManager_doEnableDtaMode},
+ {"doDisableDtaMode", "()V", (void*)nfcManager_doDisableDtaMode}
};
@@ -1946,7 +1935,7 @@
** Returns: Status of registration.
**
*******************************************************************************/
-int register_com_android_nfc_NativeNfcManager(JNIEnv *e) {
+int register_com_android_nfc_NativeNfcManager(JNIEnv* e) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
PowerSwitch::getInstance().initialize(PowerSwitch::UNKNOWN_LEVEL);
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
@@ -1973,7 +1962,7 @@
SyncEventGuard guard(sNfaEnableDisablePollingEvent);
status = isStart ? NFA_StartRfDiscovery() : NFA_StopRfDiscovery();
if (status == NFA_STATUS_OK) {
- sNfaEnableDisablePollingEvent.wait(); // wait for NFA_RF_DISCOVERY_xxxx_EVT
+ sNfaEnableDisablePollingEvent.wait(); // wait for NFA_RF_DISCOVERY_xxxx_EVT
sRfEnabled = isStart;
} else {
LOG(ERROR) << StringPrintf(
@@ -2003,7 +1992,7 @@
**
*******************************************************************************/
void doStartupConfig() {
- struct nfc_jni_native_data *nat = getNative(0, 0);
+ struct nfc_jni_native_data* nat = getNative(0, 0);
tNFA_STATUS stat = NFA_STATUS_FAILED;
int actualLen = 0;
@@ -2015,15 +2004,14 @@
SyncEventGuard guard(sNfaSetConfigEvent);
stat = NFA_SetConfig(NCI_PARAM_ID_ACT_ORDER, sizeof(act_mode_order_param),
&act_mode_order_param[0]);
- if (stat == NFA_STATUS_OK)
- sNfaSetConfigEvent.wait();
+ if (stat == NFA_STATUS_OK) sNfaSetConfigEvent.wait();
}
// configure RF polling frequency for each technology
static tNFA_DM_DISC_FREQ_CFG nfa_dm_disc_freq_cfg;
// values in the polling_frequency[] map to members of nfa_dm_disc_freq_cfg
uint8_t polling_frequency[8] = {1, 1, 1, 1, 1, 1, 1, 1};
- actualLen = GetStrValue(NAME_POLL_FREQUENCY, (char *)polling_frequency, 8);
+ actualLen = GetStrValue(NAME_POLL_FREQUENCY, (char*)polling_frequency, 8);
if (actualLen == 8) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: polling frequency", __func__);
@@ -2076,8 +2064,8 @@
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
}
-static tNFA_STATUS
-startPolling_rfDiscoveryDisabled(tNFA_TECHNOLOGY_MASK tech_mask) {
+static tNFA_STATUS startPolling_rfDiscoveryDisabled(
+ tNFA_TECHNOLOGY_MASK tech_mask) {
tNFA_STATUS stat = NFA_STATUS_FAILED;
unsigned long num = 0;
@@ -2096,7 +2084,7 @@
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: wait for enable event", __func__);
sPollingEnabled = true;
- sNfaEnableDisablePollingEvent.wait(); // wait for NFA_POLL_ENABLED_EVT
+ sNfaEnableDisablePollingEvent.wait(); // wait for NFA_POLL_ENABLED_EVT
} else {
LOG(ERROR) << StringPrintf("%s: fail enable polling; error=0x%X", __func__,
stat);
@@ -2116,7 +2104,7 @@
stat = NFA_DisablePolling();
if (stat == NFA_STATUS_OK) {
sPollingEnabled = false;
- sNfaEnableDisablePollingEvent.wait(); // wait for NFA_POLL_DISABLED_EVT
+ sNfaEnableDisablePollingEvent.wait(); // wait for NFA_POLL_DISABLED_EVT
} else {
LOG(ERROR) << StringPrintf("%s: fail disable polling; error=0x%X", __func__,
stat);
diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index 812acc9..f25b299 100644
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -14,14 +14,6 @@
* limitations under the License.
*/
-#include "IntervalTimer.h"
-#include "JavaClassConstants.h"
-#include "Mutex.h"
-#include "NfcJniUtil.h"
-#include "NfcTag.h"
-#include "Pn544Interop.h"
-#include "_OverrideLog.h"
-#include "config.h"
#include <base/logging.h>
#include <errno.h>
#include <malloc.h>
@@ -30,8 +22,16 @@
#include <semaphore.h>
#include <signal.h>
#include <string.h>
-#include <string>
#include <time.h>
+#include <string>
+#include "IntervalTimer.h"
+#include "JavaClassConstants.h"
+#include "Mutex.h"
+#include "NfcJniUtil.h"
+#include "NfcTag.h"
+#include "Pn544Interop.h"
+#include "_OverrideLog.h"
+#include "config.h"
#include "ndef_utils.h"
#include "nfa_api.h"
@@ -40,9 +40,9 @@
#include "phNxpExtns.h"
#include "rw_api.h"
namespace android {
-extern nfc_jni_native_data *getNative(JNIEnv *e, jobject o);
+extern nfc_jni_native_data* getNative(JNIEnv* e, jobject o);
extern bool nfcManager_isNfcActive();
-} // namespace android
+} // namespace android
extern bool gActivated;
extern SyncEvent gDeactivatedEvent;
@@ -53,11 +53,12 @@
**
*****************************************************************************/
namespace android {
-bool gIsTagDeactivating = false; // flag for nfa callback indicating we are
- // deactivating for RF interface switch
-bool gIsSelectingRfInterface = false; // flag for nfa callback indicating we are
- // selecting for RF interface switch
-} // namespace android
+bool gIsTagDeactivating = false; // flag for nfa callback indicating we are
+ // deactivating for RF interface switch
+bool gIsSelectingRfInterface =
+ false; // flag for nfa callback indicating we are
+ // selecting for RF interface switch
+} // namespace android
/*****************************************************************************
**
@@ -75,12 +76,12 @@
#define NDEF_TYPE4_TAG 4
#define NDEF_MIFARE_CLASSIC_TAG 101
-#define STATUS_CODE_TARGET_LOST 146 // this error code comes from the service
+#define STATUS_CODE_TARGET_LOST 146 // this error code comes from the service
static uint32_t sCheckNdefCurrentSize = 0;
static tNFA_STATUS sCheckNdefStatus =
- 0; // whether tag already contains a NDEF message
-static bool sCheckNdefCapable = false; // whether tag has NDEF capability
+ 0; // whether tag already contains a NDEF message
+static bool sCheckNdefCapable = false; // whether tag has NDEF capability
static tNFA_HANDLE sNdefTypeHandlerHandle = NFA_HANDLE_INVALID;
static tNFA_INTF_TYPE sCurrentRfInterface = NFA_INTERFACE_ISO_DEP;
static std::basic_string<uint8_t> sRxDataBuffer;
@@ -89,7 +90,7 @@
static bool sTransceiveRfTimeout = false;
static Mutex sRfInterfaceMutex;
static uint32_t sReadDataLen = 0;
-static uint8_t *sReadData = NULL;
+static uint8_t* sReadData = NULL;
static bool sIsReadingNdefMessage = false;
static SyncEvent sReadEvent;
static sem_t sWriteSem;
@@ -99,8 +100,8 @@
static sem_t sCheckNdefSem;
static SyncEvent sPresenceCheckEvent;
static sem_t sMakeReadonlySem;
-static IntervalTimer sSwitchBackTimer; // timer used to tell us to switch back
- // to ISO_DEP frame interface
+static IntervalTimer sSwitchBackTimer; // timer used to tell us to switch back
+ // to ISO_DEP frame interface
static jboolean sWriteOk = JNI_FALSE;
static jboolean sWriteWaitingForComplete = JNI_FALSE;
static bool sFormatOk = false;
@@ -172,12 +173,11 @@
sIsReadingNdefMessage);
if (sIsReadingNdefMessage == false)
- return; // not reading NDEF message right now, so just return
+ return; // not reading NDEF message right now, so just return
if (status != NFA_STATUS_OK) {
sReadDataLen = 0;
- if (sReadData)
- free(sReadData);
+ if (sReadData) free(sReadData);
sReadData = NULL;
}
SyncEventGuard g(sReadEvent);
@@ -209,31 +209,31 @@
**
*******************************************************************************/
static void ndefHandlerCallback(tNFA_NDEF_EVT event,
- tNFA_NDEF_EVT_DATA *eventData) {
+ tNFA_NDEF_EVT_DATA* eventData) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: event=%u, eventData=%p", __func__, event, eventData);
switch (event) {
- case NFA_NDEF_REGISTER_EVT: {
- tNFA_NDEF_REGISTER &ndef_reg = eventData->ndef_reg;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_NDEF_REGISTER_EVT; status=0x%X; h=0x%X",
- __func__, ndef_reg.status, ndef_reg.ndef_type_handle);
- sNdefTypeHandlerHandle = ndef_reg.ndef_type_handle;
- } break;
+ case NFA_NDEF_REGISTER_EVT: {
+ tNFA_NDEF_REGISTER& ndef_reg = eventData->ndef_reg;
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_NDEF_REGISTER_EVT; status=0x%X; h=0x%X",
+ __func__, ndef_reg.status, ndef_reg.ndef_type_handle);
+ sNdefTypeHandlerHandle = ndef_reg.ndef_type_handle;
+ } break;
- case NFA_NDEF_DATA_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_NDEF_DATA_EVT; data_len = %u", __func__,
- eventData->ndef_data.len);
- sReadDataLen = eventData->ndef_data.len;
- sReadData = (uint8_t *)malloc(sReadDataLen);
- memcpy(sReadData, eventData->ndef_data.p_data, eventData->ndef_data.len);
- } break;
+ case NFA_NDEF_DATA_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_NDEF_DATA_EVT; data_len = %u", __func__,
+ eventData->ndef_data.len);
+ sReadDataLen = eventData->ndef_data.len;
+ sReadData = (uint8_t*)malloc(sReadDataLen);
+ memcpy(sReadData, eventData->ndef_data.p_data, eventData->ndef_data.len);
+ } break;
- default:
- LOG(ERROR) << StringPrintf("%s: Unknown event %u ????", __func__, event);
- break;
+ default:
+ LOG(ERROR) << StringPrintf("%s: Unknown event %u ????", __func__, event);
+ break;
}
}
@@ -248,7 +248,7 @@
** Returns: NDEF message.
**
*******************************************************************************/
-static jbyteArray nativeNfcTag_doRead(JNIEnv *e, jobject) {
+static jbyteArray nativeNfcTag_doRead(JNIEnv* e, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
tNFA_STATUS status = NFA_STATUS_FAILED;
jbyteArray buf = NULL;
@@ -268,24 +268,24 @@
} else {
status = NFA_RwReadNDef();
}
- sReadEvent.wait(); // wait for NFA_READ_CPLT_EVT
+ sReadEvent.wait(); // wait for NFA_READ_CPLT_EVT
}
sIsReadingNdefMessage = false;
- if (sReadDataLen > 0) // if stack actually read data from the tag
+ if (sReadDataLen > 0) // if stack actually read data from the tag
{
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: read %u bytes", __func__, sReadDataLen);
buf = e->NewByteArray(sReadDataLen);
- e->SetByteArrayRegion(buf, 0, sReadDataLen, (jbyte *)sReadData);
+ e->SetByteArrayRegion(buf, 0, sReadDataLen, (jbyte*)sReadData);
}
} else {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: create empty buffer", __func__);
sReadDataLen = 0;
- sReadData = (uint8_t *)malloc(1);
+ sReadData = (uint8_t*)malloc(1);
buf = e->NewByteArray(sReadDataLen);
- e->SetByteArrayRegion(buf, 0, sReadDataLen, (jbyte *)sReadData);
+ e->SetByteArrayRegion(buf, 0, sReadDataLen, (jbyte*)sReadData);
}
if (sReadData) {
@@ -345,7 +345,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeNfcTag_doWrite(JNIEnv *e, jobject, jbyteArray buf) {
+static jboolean nativeNfcTag_doWrite(JNIEnv* e, jobject, jbyteArray buf) {
jboolean result = JNI_FALSE;
tNFA_STATUS status = 0;
const int maxBufferSize = 1024;
@@ -353,8 +353,8 @@
uint32_t curDataSize = 0;
ScopedByteArrayRO bytes(e, buf);
- uint8_t *p_data = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(
- &bytes[0])); // TODO: const-ness API bug in NFA_RwWriteNDef!
+ uint8_t* p_data = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(
+ &bytes[0])); // TODO: const-ness API bug in NFA_RwWriteNDef!
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; len = %zu", __func__, bytes.size());
@@ -387,7 +387,7 @@
goto TheEnd;
}
- if (sFormatOk == false) // if format operation failed
+ if (sFormatOk == false) // if format operation failed
{
sem_wait(&sFormatSem);
sem_destroy(&sFormatSem);
@@ -405,7 +405,7 @@
}
sem_wait(&sFormatSem);
sem_destroy(&sFormatSem);
- if (sFormatOk == false) // if format operation failed
+ if (sFormatOk == false) // if format operation failed
goto TheEnd;
}
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: try write", __func__);
@@ -520,11 +520,11 @@
** Returns: Must return NXP status code, which NFC service expects.
**
*******************************************************************************/
-static jint nativeNfcTag_doConnect(JNIEnv *, jobject, jint targetHandle) {
+static jint nativeNfcTag_doConnect(JNIEnv*, jobject, jint targetHandle) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: targetHandle = %d", __func__, targetHandle);
int i = targetHandle;
- NfcTag &natTag = NfcTag::getInstance();
+ NfcTag& natTag = NfcTag::getInstance();
int retCode = NFCSTATUS_SUCCESS;
if (i >= NfcTag::MAX_NUM_TECHNOLOGY) {
@@ -589,10 +589,10 @@
if (fSwitchIfNeeded && (rfInterface == sCurrentRfInterface)) {
// already in the requested interface
sRfInterfaceMutex.unlock();
- return 0; // success
+ return 0; // success
}
- NfcTag &natTag = NfcTag::getInstance();
+ NfcTag& natTag = NfcTag::getInstance();
tNFA_STATUS status;
int rVal = 1;
@@ -613,14 +613,14 @@
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: deactivate to sleep", __func__);
if (NFA_STATUS_OK !=
- (status = NFA_Deactivate(TRUE))) // deactivate to sleep state
+ (status = NFA_Deactivate(TRUE))) // deactivate to sleep state
{
LOG(ERROR) << StringPrintf("%s: deactivate failed, status = %d",
__func__, status);
break;
}
- if (sReconnectEvent.wait(1000) == false) // if timeout occurred
+ if (sReconnectEvent.wait(1000) == false) // if timeout occurred
{
LOG(ERROR) << StringPrintf("%s: timeout waiting for deactivate",
__func__);
@@ -656,7 +656,7 @@
}
sConnectOk = false;
- if (sReconnectEvent.wait(1000) == false) // if timeout occured
+ if (sReconnectEvent.wait(1000) == false) // if timeout occured
{
LOG(ERROR) << StringPrintf("%s: timeout waiting for select", __func__);
break;
@@ -671,7 +671,7 @@
break;
}
if (sConnectOk) {
- rVal = 0; // success
+ rVal = 0; // success
sCurrentRfInterface = rfInterface;
} else {
rVal = 1;
@@ -699,7 +699,7 @@
**
*******************************************************************************/
static bool switchRfInterface(tNFA_INTF_TYPE rfInterface) {
- NfcTag &natTag = NfcTag::getInstance();
+ NfcTag& natTag = NfcTag::getInstance();
if (sCurrentConnectedTargetProtocol != NFC_PROTOCOL_ISO_DEP) {
DLOG_IF(INFO, nfc_debug_enabled)
@@ -726,10 +726,10 @@
** Returns: Status code.
**
*******************************************************************************/
-static jint nativeNfcTag_doReconnect(JNIEnv *, jobject) {
+static jint nativeNfcTag_doReconnect(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
int retCode = NFCSTATUS_SUCCESS;
- NfcTag &natTag = NfcTag::getInstance();
+ NfcTag& natTag = NfcTag::getInstance();
if (natTag.getActivationState() != NfcTag::Active) {
LOG(ERROR) << StringPrintf("%s: tag already deactivated", __func__);
@@ -770,7 +770,7 @@
** Returns: Status code.
**
*******************************************************************************/
-static jint nativeNfcTag_doHandleReconnect(JNIEnv *e, jobject o,
+static jint nativeNfcTag_doHandleReconnect(JNIEnv* e, jobject o,
jint targetHandle) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: targetHandle = %d", __func__, targetHandle);
@@ -788,7 +788,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeNfcTag_doDisconnect(JNIEnv *, jobject) {
+static jboolean nativeNfcTag_doDisconnect(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
tNFA_STATUS nfaStat = NFA_STATUS_OK;
@@ -821,7 +821,7 @@
** Returns: None
**
*******************************************************************************/
-void nativeNfcTag_doTransceiveStatus(tNFA_STATUS status, uint8_t *buf,
+void nativeNfcTag_doTransceiveStatus(tNFA_STATUS status, uint8_t* buf,
uint32_t bufLen) {
SyncEventGuard g(sTransceiveEvent);
DLOG_IF(INFO, nfc_debug_enabled)
@@ -842,16 +842,14 @@
if (sRxDataStatus == NFA_STATUS_OK || sRxDataStatus == NFC_STATUS_CONTINUE)
sRxDataBuffer.append(buf, bufLen);
- if (sRxDataStatus == NFA_STATUS_OK)
- sTransceiveEvent.notifyOne();
+ if (sRxDataStatus == NFA_STATUS_OK) sTransceiveEvent.notifyOne();
}
void nativeNfcTag_notifyRfTimeout() {
SyncEventGuard g(sTransceiveEvent);
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: waiting for transceive: %d", __func__, sWaitingForTransceive);
- if (!sWaitingForTransceive)
- return;
+ if (!sWaitingForTransceive) return;
sTransceiveRfTimeout = true;
@@ -871,7 +869,7 @@
** Returns: Response from tag.
**
*******************************************************************************/
-static jbyteArray nativeNfcTag_doTransceive(JNIEnv *e, jobject o,
+static jbyteArray nativeNfcTag_doTransceive(JNIEnv* e, jobject o,
jbyteArray data, jboolean raw,
jintArray statusTargetLost) {
int timeout =
@@ -881,14 +879,14 @@
bool waitOk = false;
bool isNack = false;
- jint *targetLost = NULL;
+ jint* targetLost = NULL;
tNFA_STATUS status;
if (NfcTag::getInstance().getActivationState() != NfcTag::Active) {
if (statusTargetLost) {
targetLost = e->GetIntArrayElements(statusTargetLost, 0);
if (targetLost)
- *targetLost = 1; // causes NFC service to throw TagLostException
+ *targetLost = 1; // causes NFC service to throw TagLostException
e->ReleaseIntArrayElements(statusTargetLost, targetLost, 0);
}
DLOG_IF(INFO, nfc_debug_enabled)
@@ -896,18 +894,17 @@
return NULL;
}
- NfcTag &natTag = NfcTag::getInstance();
+ NfcTag& natTag = NfcTag::getInstance();
// get input buffer and length from java call
ScopedByteArrayRO bytes(e, data);
- uint8_t *buf = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(
- &bytes[0])); // TODO: API bug; NFA_SendRawFrame should take const*!
+ uint8_t* buf = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(
+ &bytes[0])); // TODO: API bug; NFA_SendRawFrame should take const*!
size_t bufLen = bytes.size();
if (statusTargetLost) {
targetLost = e->GetIntArrayElements(statusTargetLost, 0);
- if (targetLost)
- *targetLost = 0; // success, tag is still present
+ if (targetLost) *targetLost = 0; // success, tag is still present
}
sSwitchBackTimer.kill();
@@ -934,18 +931,18 @@
waitOk = sTransceiveEvent.wait(timeout);
}
- if (waitOk == false || sTransceiveRfTimeout) // if timeout occurred
+ if (waitOk == false || sTransceiveRfTimeout) // if timeout occurred
{
LOG(ERROR) << StringPrintf("%s: wait response timeout", __func__);
if (targetLost)
- *targetLost = 1; // causes NFC service to throw TagLostException
+ *targetLost = 1; // causes NFC service to throw TagLostException
break;
}
if (NfcTag::getInstance().getActivationState() != NfcTag::Active) {
LOG(ERROR) << StringPrintf("%s: already deactivated", __func__);
if (targetLost)
- *targetLost = 1; // causes NFC service to throw TagLostException
+ *targetLost = 1; // causes NFC service to throw TagLostException
break;
}
@@ -969,7 +966,7 @@
<< StringPrintf("%s: reconnect finish", __func__);
} else if (sCurrentConnectedTargetProtocol == NFC_PROTOCOL_MIFARE) {
uint32_t transDataLen = sRxDataBuffer.size();
- uint8_t *transData = (uint8_t *)sRxDataBuffer.data();
+ uint8_t* transData = (uint8_t*)sRxDataBuffer.data();
if (EXTNS_CheckMfcResponse(&transData, &transDataLen) ==
NFCSTATUS_FAILED) {
nativeNfcTag_doReconnect(e, o);
@@ -979,7 +976,7 @@
}
if (result.get() != NULL) {
e->SetByteArrayRegion(result.get(), 0, transDataLen,
- (const jbyte *)transData);
+ (const jbyte*)transData);
} else
LOG(ERROR) << StringPrintf("%s: Failed to allocate java byte array",
__func__);
@@ -989,19 +986,18 @@
result.reset(e->NewByteArray(sRxDataBuffer.size()));
if (result.get() != NULL) {
e->SetByteArrayRegion(result.get(), 0, sRxDataBuffer.size(),
- (const jbyte *)sRxDataBuffer.data());
+ (const jbyte*)sRxDataBuffer.data());
} else
LOG(ERROR) << StringPrintf("%s: Failed to allocate java byte array",
__func__);
- } // else a nack is treated as a transceive failure to the upper layers
+ } // else a nack is treated as a transceive failure to the upper layers
sRxDataBuffer.clear();
}
} while (0);
sWaitingForTransceive = false;
- if (targetLost)
- e->ReleaseIntArrayElements(statusTargetLost, targetLost, 0);
+ if (targetLost) e->ReleaseIntArrayElements(statusTargetLost, targetLost, 0);
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
return result.release();
@@ -1020,7 +1016,7 @@
** Returns: Type of tag represented by NFC Service.
**
*******************************************************************************/
-static jint nativeNfcTag_doGetNdefType(JNIEnv *, jobject, jint libnfcType,
+static jint nativeNfcTag_doGetNdefType(JNIEnv*, jobject, jint libnfcType,
jint javaType) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; libnfc type=%d; java type=%d", __func__,
@@ -1100,7 +1096,7 @@
if (sCheckNdefStatus != NFA_STATUS_OK &&
sCheckNdefStatus != NFA_STATUS_TIMEOUT)
sCheckNdefStatus = NFA_STATUS_FAILED;
- sCheckNdefCapable = false; // assume tag is NOT ndef capable
+ sCheckNdefCapable = false; // assume tag is NOT ndef capable
if (sCheckNdefStatus == NFA_STATUS_OK) {
// NDEF content is on the tag
sCheckNdefMaxSize = maxSize;
@@ -1112,9 +1108,9 @@
sCheckNdefMaxSize = 0;
sCheckNdefCurrentSize = 0;
sCheckNdefCardReadOnly = flags & RW_NDEF_FL_READ_ONLY;
- if ((flags & RW_NDEF_FL_UNKNOWN) == 0) // if stack understands the tag
+ if ((flags & RW_NDEF_FL_UNKNOWN) == 0) // if stack understands the tag
{
- if (flags & RW_NDEF_FL_SUPPORTED) // if tag is ndef capable
+ if (flags & RW_NDEF_FL_SUPPORTED) // if tag is ndef capable
sCheckNdefCapable = true;
}
} else {
@@ -1138,9 +1134,9 @@
** Returns: Status code; 0 is success.
**
*******************************************************************************/
-static jint nativeNfcTag_doCheckNdef(JNIEnv *e, jobject o, jintArray ndefInfo) {
+static jint nativeNfcTag_doCheckNdef(JNIEnv* e, jobject o, jintArray ndefInfo) {
tNFA_STATUS status = NFA_STATUS_FAILED;
- jint *ndef = NULL;
+ jint* ndef = NULL;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
@@ -1286,7 +1282,7 @@
** Returns: True if tag is in RF field.
**
*******************************************************************************/
-static jboolean nativeNfcTag_doPresenceCheck(JNIEnv *, jobject) {
+static jboolean nativeNfcTag_doPresenceCheck(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
tNFA_STATUS status = NFA_STATUS_OK;
jboolean isPresent = JNI_FALSE;
@@ -1300,7 +1296,7 @@
tNFA_DEACTIVATED deactivated = {NFA_DEACTIVATE_TYPE_IDLE};
{
SyncEventGuard g(gDeactivatedEvent);
- gActivated = false; // guard this variable from multi-threaded access
+ gActivated = false; // guard this variable from multi-threaded access
gDeactivatedEvent.notifyOne();
}
@@ -1371,7 +1367,7 @@
** Returns: True if formattable.
**
*******************************************************************************/
-static jboolean nativeNfcTag_doIsNdefFormatable(JNIEnv *e, jobject o,
+static jboolean nativeNfcTag_doIsNdefFormatable(JNIEnv* e, jobject o,
jint /*libNfcType*/, jbyteArray,
jbyteArray, jbyteArray) {
jboolean isFormattable = JNI_FALSE;
@@ -1397,7 +1393,7 @@
if (NfcTag::getInstance().isMifareDESFire()) {
/* Identifies as DESfire, use get version cmd to be sure */
jbyteArray versionCmd = e->NewByteArray(5);
- e->SetByteArrayRegion(versionCmd, 0, 5, (jbyte *)cmd);
+ e->SetByteArrayRegion(versionCmd, 0, 5, (jbyte*)cmd);
jbyteArray respBytes =
nativeNfcTag_doTransceive(e, o, versionCmd, JNI_TRUE, NULL);
if (respBytes != NULL) {
@@ -1412,11 +1408,11 @@
// 9 bytes, with byte 7 0x91 and byte 8 having status
// code 0xAF (these values are fixed and well-known).
int respLength = e->GetArrayLength(respBytes);
- uint8_t *resp = (uint8_t *)e->GetByteArrayElements(respBytes, NULL);
+ uint8_t* resp = (uint8_t*)e->GetByteArrayElements(respBytes, NULL);
if (respLength == 9 && resp[7] == 0x91 && resp[8] == 0xAF) {
isFormattable = JNI_TRUE;
}
- e->ReleaseByteArrayElements(respBytes, (jbyte *)resp, JNI_ABORT);
+ e->ReleaseByteArrayElements(respBytes, (jbyte*)resp, JNI_ABORT);
}
}
}
@@ -1439,13 +1435,13 @@
** Returns: True if formattable.
**
*******************************************************************************/
-static jboolean nativeNfcTag_doIsIsoDepNdefFormatable(JNIEnv *e, jobject o,
+static jboolean nativeNfcTag_doIsIsoDepNdefFormatable(JNIEnv* e, jobject o,
jbyteArray pollBytes,
jbyteArray actBytes) {
uint8_t uidFake[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
jbyteArray uidArray = e->NewByteArray(8);
- e->SetByteArrayRegion(uidArray, 0, 8, (jbyte *)uidFake);
+ e->SetByteArrayRegion(uidArray, 0, 8, (jbyte*)uidFake);
return nativeNfcTag_doIsNdefFormatable(e, o, 0, uidArray, pollBytes,
actBytes);
}
@@ -1463,8 +1459,8 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeNfcTag_makeMifareNdefFormat(JNIEnv *e, jobject o,
- uint8_t *key,
+static jboolean nativeNfcTag_makeMifareNdefFormat(JNIEnv* e, jobject o,
+ uint8_t* key,
uint32_t keySize) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
tNFA_STATUS status = NFA_STATUS_OK;
@@ -1507,7 +1503,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeNfcTag_doNdefFormat(JNIEnv *e, jobject o, jbyteArray) {
+static jboolean nativeNfcTag_doNdefFormat(JNIEnv* e, jobject o, jbyteArray) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
tNFA_STATUS status = NFA_STATUS_OK;
@@ -1585,8 +1581,8 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeNfcTag_makeMifareReadonly(JNIEnv *e, jobject o,
- uint8_t *key, int32_t keySize) {
+static jboolean nativeNfcTag_makeMifareReadonly(JNIEnv* e, jobject o,
+ uint8_t* key, int32_t keySize) {
jboolean result = JNI_FALSE;
tNFA_STATUS status = NFA_STATUS_OK;
@@ -1642,7 +1638,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-static jboolean nativeNfcTag_doMakeReadonly(JNIEnv *e, jobject o, jbyteArray) {
+static jboolean nativeNfcTag_doMakeReadonly(JNIEnv* e, jobject o, jbyteArray) {
jboolean result = JNI_FALSE;
tNFA_STATUS status;
@@ -1672,7 +1668,7 @@
// Hard-lock the tag (cannot be reverted)
status = NFA_RwSetTagReadOnly(TRUE);
if (status == NFA_STATUS_REJECTED) {
- status = NFA_RwSetTagReadOnly(FALSE); // try soft lock
+ status = NFA_RwSetTagReadOnly(FALSE); // try soft lock
if (status != NFA_STATUS_OK) {
LOG(ERROR) << StringPrintf("%s: fail soft lock, status=%d", __func__,
status);
@@ -1722,7 +1718,7 @@
void nativeNfcTag_registerNdefTypeHandler() {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
sNdefTypeHandlerHandle = NFA_HANDLE_INVALID;
- NFA_RegisterNDefTypeHandler(TRUE, NFA_TNF_DEFAULT, (uint8_t *)"", 0,
+ NFA_RegisterNDefTypeHandler(TRUE, NFA_TNF_DEFAULT, (uint8_t*)"", 0,
ndefHandlerCallback);
EXTNS_MfcRegisterNDefTypeHandler(ndefHandlerCallback);
}
@@ -1780,20 +1776,20 @@
**
*****************************************************************************/
static JNINativeMethod gMethods[] = {
- {"doConnect", "(I)I", (void *)nativeNfcTag_doConnect},
- {"doDisconnect", "()Z", (void *)nativeNfcTag_doDisconnect},
- {"doReconnect", "()I", (void *)nativeNfcTag_doReconnect},
- {"doHandleReconnect", "(I)I", (void *)nativeNfcTag_doHandleReconnect},
- {"doTransceive", "([BZ[I)[B", (void *)nativeNfcTag_doTransceive},
- {"doGetNdefType", "(II)I", (void *)nativeNfcTag_doGetNdefType},
- {"doCheckNdef", "([I)I", (void *)nativeNfcTag_doCheckNdef},
- {"doRead", "()[B", (void *)nativeNfcTag_doRead},
- {"doWrite", "([B)Z", (void *)nativeNfcTag_doWrite},
- {"doPresenceCheck", "()Z", (void *)nativeNfcTag_doPresenceCheck},
+ {"doConnect", "(I)I", (void*)nativeNfcTag_doConnect},
+ {"doDisconnect", "()Z", (void*)nativeNfcTag_doDisconnect},
+ {"doReconnect", "()I", (void*)nativeNfcTag_doReconnect},
+ {"doHandleReconnect", "(I)I", (void*)nativeNfcTag_doHandleReconnect},
+ {"doTransceive", "([BZ[I)[B", (void*)nativeNfcTag_doTransceive},
+ {"doGetNdefType", "(II)I", (void*)nativeNfcTag_doGetNdefType},
+ {"doCheckNdef", "([I)I", (void*)nativeNfcTag_doCheckNdef},
+ {"doRead", "()[B", (void*)nativeNfcTag_doRead},
+ {"doWrite", "([B)Z", (void*)nativeNfcTag_doWrite},
+ {"doPresenceCheck", "()Z", (void*)nativeNfcTag_doPresenceCheck},
{"doIsIsoDepNdefFormatable", "([B[B)Z",
- (void *)nativeNfcTag_doIsIsoDepNdefFormatable},
- {"doNdefFormat", "([B)Z", (void *)nativeNfcTag_doNdefFormat},
- {"doMakeReadonly", "([B)Z", (void *)nativeNfcTag_doMakeReadonly},
+ (void*)nativeNfcTag_doIsIsoDepNdefFormatable},
+ {"doNdefFormat", "([B)Z", (void*)nativeNfcTag_doNdefFormat},
+ {"doMakeReadonly", "([B)Z", (void*)nativeNfcTag_doMakeReadonly},
};
/*******************************************************************************
@@ -1806,7 +1802,7 @@
** Returns: Status of registration.
**
*******************************************************************************/
-int register_com_android_nfc_NativeNfcTag(JNIEnv *e) {
+int register_com_android_nfc_NativeNfcTag(JNIEnv* e) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return jniRegisterNativeMethods(e, gNativeNfcTagClassName, gMethods,
NELEM(gMethods));
diff --git a/nci/jni/NativeP2pDevice.cpp b/nci/jni/NativeP2pDevice.cpp
index 1ff8f28..b103cd0 100644
--- a/nci/jni/NativeP2pDevice.cpp
+++ b/nci/jni/NativeP2pDevice.cpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#include "_OverrideLog.h"
#include <log/log.h>
+#include "_OverrideLog.h"
#include "JavaClassConstants.h"
#include "NfcJniUtil.h"
@@ -24,27 +24,27 @@
namespace android {
-static jboolean nativeP2pDeviceDoConnect(JNIEnv *, jobject) {
+static jboolean nativeP2pDeviceDoConnect(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return JNI_TRUE;
}
-static jboolean nativeP2pDeviceDoDisconnect(JNIEnv *, jobject) {
+static jboolean nativeP2pDeviceDoDisconnect(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return JNI_TRUE;
}
-static jbyteArray nativeP2pDeviceDoTransceive(JNIEnv *, jobject, jbyteArray) {
+static jbyteArray nativeP2pDeviceDoTransceive(JNIEnv*, jobject, jbyteArray) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return NULL;
}
-static jbyteArray nativeP2pDeviceDoReceive(JNIEnv *, jobject) {
+static jbyteArray nativeP2pDeviceDoReceive(JNIEnv*, jobject) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return NULL;
}
-static jboolean nativeP2pDeviceDoSend(JNIEnv *, jobject, jbyteArray) {
+static jboolean nativeP2pDeviceDoSend(JNIEnv*, jobject, jbyteArray) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", __func__);
return JNI_TRUE;
}
@@ -55,11 +55,11 @@
**
*****************************************************************************/
static JNINativeMethod gMethods[] = {
- {"doConnect", "()Z", (void *)nativeP2pDeviceDoConnect},
- {"doDisconnect", "()Z", (void *)nativeP2pDeviceDoDisconnect},
- {"doTransceive", "([B)[B", (void *)nativeP2pDeviceDoTransceive},
- {"doReceive", "()[B", (void *)nativeP2pDeviceDoReceive},
- {"doSend", "([B)Z", (void *)nativeP2pDeviceDoSend},
+ {"doConnect", "()Z", (void*)nativeP2pDeviceDoConnect},
+ {"doDisconnect", "()Z", (void*)nativeP2pDeviceDoDisconnect},
+ {"doTransceive", "([B)[B", (void*)nativeP2pDeviceDoTransceive},
+ {"doReceive", "()[B", (void*)nativeP2pDeviceDoReceive},
+ {"doSend", "([B)Z", (void*)nativeP2pDeviceDoSend},
};
/*******************************************************************************
@@ -72,9 +72,9 @@
** Returns: Status of registration.
**
*******************************************************************************/
-int register_com_android_nfc_NativeP2pDevice(JNIEnv *e) {
+int register_com_android_nfc_NativeP2pDevice(JNIEnv* e) {
return jniRegisterNativeMethods(e, gNativeP2pDeviceClassName, gMethods,
NELEM(gMethods));
}
-} // namespace android
+} // namespace android
diff --git a/nci/jni/NfcJniUtil.cpp b/nci/jni/NfcJniUtil.cpp
index ed85468..0413c3d 100644
--- a/nci/jni/NfcJniUtil.cpp
+++ b/nci/jni/NfcJniUtil.cpp
@@ -18,11 +18,11 @@
#include <errno.h>
-#include "RoutingManager.h"
-#include "_OverrideLog.h"
#include <log/log.h>
#include <nativehelper/JNIHelp.h>
#include <nativehelper/ScopedLocalRef.h>
+#include "RoutingManager.h"
+#include "_OverrideLog.h"
/*******************************************************************************
**
@@ -35,15 +35,14 @@
** Returns: JNI version.
**
*******************************************************************************/
-jint JNI_OnLoad(JavaVM *jvm, void *) {
+jint JNI_OnLoad(JavaVM* jvm, void*) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", __func__);
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
LOG(INFO) << StringPrintf("NFC Service: loading nci JNI");
// Check JNI version
- if (jvm->GetEnv((void **)&e, JNI_VERSION_1_6))
- return JNI_ERR;
+ if (jvm->GetEnv((void**)&e, JNI_VERSION_1_6)) return JNI_ERR;
if (android::register_com_android_nfc_NativeNfcManager(e) == -1)
return JNI_ERR;
@@ -51,8 +50,7 @@
return JNI_ERR;
if (android::register_com_android_nfc_NativeLlcpSocket(e) == -1)
return JNI_ERR;
- if (android::register_com_android_nfc_NativeNfcTag(e) == -1)
- return JNI_ERR;
+ if (android::register_com_android_nfc_NativeNfcTag(e) == -1) return JNI_ERR;
if (android::register_com_android_nfc_NativeLlcpConnectionlessSocket(e) == -1)
return JNI_ERR;
if (android::register_com_android_nfc_NativeP2pDevice(e) == -1)
@@ -74,7 +72,7 @@
** Returns: Status code.
**
*******************************************************************************/
-int nfc_jni_cache_object(JNIEnv *e, const char *className, jobject *cachedObj) {
+int nfc_jni_cache_object(JNIEnv* e, const char* className, jobject* cachedObj) {
ScopedLocalRef<jclass> cls(e, e->FindClass(className));
if (cls.get() == NULL) {
LOG(ERROR) << StringPrintf("%s: find class error", __func__);
@@ -107,7 +105,7 @@
** Returns: Value of mHandle.
**
*******************************************************************************/
-int nfc_jni_get_nfc_socket_handle(JNIEnv *e, jobject o) {
+int nfc_jni_get_nfc_socket_handle(JNIEnv* e, jobject o) {
ScopedLocalRef<jclass> c(e, e->GetObjectClass(o));
jfieldID f = e->GetFieldID(c.get(), "mHandle", "I");
return e->GetIntField(o, f);
@@ -124,11 +122,11 @@
** Returns: Pointer to the value of mNative.
**
*******************************************************************************/
-struct nfc_jni_native_data *nfc_jni_get_nat(JNIEnv *e, jobject o) {
+struct nfc_jni_native_data* nfc_jni_get_nat(JNIEnv* e, jobject o) {
ScopedLocalRef<jclass> c(e, e->GetObjectClass(o));
jfieldID f = e->GetFieldID(c.get(), "mNative", "J");
/* Retrieve native structure address */
- return (struct nfc_jni_native_data *)e->GetLongField(o, f);
+ return (struct nfc_jni_native_data*)e->GetLongField(o, f);
}
/*******************************************************************************
@@ -140,8 +138,8 @@
** Returns -1 on failure, 0 on success
**
*******************************************************************************/
-int nfc_jni_cache_object_local(JNIEnv *e, const char *className,
- jobject *cachedObj) {
+int nfc_jni_cache_object_local(JNIEnv* e, const char* className,
+ jobject* cachedObj) {
ScopedLocalRef<jclass> cls(e, e->FindClass(className));
if (cls.get() == NULL) {
LOG(ERROR) << StringPrintf("%s: find class error", __func__);
@@ -163,4 +161,4 @@
return 0;
}
-} // namespace android
+} // namespace android
diff --git a/nci/jni/NfcJniUtil.h b/nci/jni/NfcJniUtil.h
index c10b0a9..443c93f 100644
--- a/nci/jni/NfcJniUtil.h
+++ b/nci/jni/NfcJniUtil.h
@@ -90,7 +90,7 @@
int running;
/* Our VM */
- JavaVM *vm;
+ JavaVM* vm;
int env_version;
/* Reference to the NFCManager instance */
@@ -121,29 +121,29 @@
};
class ScopedAttach {
-public:
- ScopedAttach(JavaVM *vm, JNIEnv **env) : vm_(vm) {
+ public:
+ ScopedAttach(JavaVM* vm, JNIEnv** env) : vm_(vm) {
vm_->AttachCurrentThread(env, NULL);
}
~ScopedAttach() { vm_->DetachCurrentThread(); }
-private:
- JavaVM *vm_;
+ private:
+ JavaVM* vm_;
};
-jint JNI_OnLoad(JavaVM *jvm, void *reserved);
+jint JNI_OnLoad(JavaVM* jvm, void* reserved);
namespace android {
-int nfc_jni_cache_object(JNIEnv *e, const char *clsname, jobject *cached_obj);
-int nfc_jni_cache_object_local(JNIEnv *e, const char *className,
- jobject *cachedObj);
-int nfc_jni_get_nfc_socket_handle(JNIEnv *e, jobject o);
-struct nfc_jni_native_data *nfc_jni_get_nat(JNIEnv *e, jobject o);
-int register_com_android_nfc_NativeNfcManager(JNIEnv *e);
-int register_com_android_nfc_NativeNfcTag(JNIEnv *e);
-int register_com_android_nfc_NativeP2pDevice(JNIEnv *e);
-int register_com_android_nfc_NativeLlcpConnectionlessSocket(JNIEnv *e);
-int register_com_android_nfc_NativeLlcpServiceSocket(JNIEnv *e);
-int register_com_android_nfc_NativeLlcpSocket(JNIEnv *e);
-} // namespace android
+int nfc_jni_cache_object(JNIEnv* e, const char* clsname, jobject* cached_obj);
+int nfc_jni_cache_object_local(JNIEnv* e, const char* className,
+ jobject* cachedObj);
+int nfc_jni_get_nfc_socket_handle(JNIEnv* e, jobject o);
+struct nfc_jni_native_data* nfc_jni_get_nat(JNIEnv* e, jobject o);
+int register_com_android_nfc_NativeNfcManager(JNIEnv* e);
+int register_com_android_nfc_NativeNfcTag(JNIEnv* e);
+int register_com_android_nfc_NativeP2pDevice(JNIEnv* e);
+int register_com_android_nfc_NativeLlcpConnectionlessSocket(JNIEnv* e);
+int register_com_android_nfc_NativeLlcpServiceSocket(JNIEnv* e);
+int register_com_android_nfc_NativeLlcpSocket(JNIEnv* e);
+} // namespace android
diff --git a/nci/jni/NfcTag.cpp b/nci/jni/NfcTag.cpp
index 022aa1e..e129aa1 100644
--- a/nci/jni/NfcTag.cpp
+++ b/nci/jni/NfcTag.cpp
@@ -18,12 +18,12 @@
* Tag-reading, tag-writing operations.
*/
#include "NfcTag.h"
-#include "JavaClassConstants.h"
-#include "_OverrideLog.h"
-#include "config.h"
#include <base/logging.h>
#include <nativehelper/ScopedLocalRef.h>
#include <nativehelper/ScopedPrimitiveArray.h>
+#include "JavaClassConstants.h"
+#include "_OverrideLog.h"
+#include "config.h"
#include "nfc_brcm_defs.h"
#include "phNxpExtns.h"
@@ -39,12 +39,19 @@
**
*******************************************************************************/
NfcTag::NfcTag()
- : mNumTechList(0), mTechnologyTimeoutsTable(MAX_NUM_TECHNOLOGY),
- mNativeData(NULL), mIsActivated(false), mActivationState(Idle),
- mProtocol(NFC_PROTOCOL_UNKNOWN), mtT1tMaxMessageSize(0),
- mReadCompletedStatus(NFA_STATUS_OK), mLastKovioUidLen(0),
- mNdefDetectionTimedOut(false), mIsDynamicTagId(false),
- mPresenceCheckAlgorithm(NFA_RW_PRES_CHK_DEFAULT), mIsFelicaLite(false) {
+ : mNumTechList(0),
+ mTechnologyTimeoutsTable(MAX_NUM_TECHNOLOGY),
+ mNativeData(NULL),
+ mIsActivated(false),
+ mActivationState(Idle),
+ mProtocol(NFC_PROTOCOL_UNKNOWN),
+ mtT1tMaxMessageSize(0),
+ mReadCompletedStatus(NFA_STATUS_OK),
+ mLastKovioUidLen(0),
+ mNdefDetectionTimedOut(false),
+ mIsDynamicTagId(false),
+ mPresenceCheckAlgorithm(NFA_RW_PRES_CHK_DEFAULT),
+ mIsFelicaLite(false) {
memset(mTechList, 0, sizeof(mTechList));
memset(mTechHandles, 0, sizeof(mTechHandles));
memset(mTechLibNfcTypes, 0, sizeof(mTechLibNfcTypes));
@@ -61,7 +68,7 @@
** Returns: Reference to NfcTag object.
**
*******************************************************************************/
-NfcTag &NfcTag::getInstance() {
+NfcTag& NfcTag::getInstance() {
static NfcTag tag;
return tag;
}
@@ -76,7 +83,7 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::initialize(nfc_jni_native_data *native) {
+void NfcTag::initialize(nfc_jni_native_data* native) {
long num = 0;
mNativeData = native;
@@ -128,12 +135,11 @@
** Returns: None.
**
*******************************************************************************/
-void NfcTag::setDeactivationState(tNFA_DEACTIVATED &deactivated) {
+void NfcTag::setDeactivationState(tNFA_DEACTIVATED& deactivated) {
static const char fn[] = "NfcTag::setDeactivationState";
mActivationState = Idle;
mNdefDetectionTimedOut = false;
- if (deactivated.type == NFA_DEACTIVATE_TYPE_SLEEP)
- mActivationState = Sleep;
+ if (deactivated.type == NFA_DEACTIVATE_TYPE_SLEEP) mActivationState = Sleep;
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: state=%u", fn, mActivationState);
}
@@ -213,18 +219,16 @@
** activated, false otherwise
**
*******************************************************************************/
-bool NfcTag::IsSameKovio(tNFA_ACTIVATED &activationData) {
+bool NfcTag::IsSameKovio(tNFA_ACTIVATED& activationData) {
static const char fn[] = "NfcTag::IsSameKovio";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
- tNFC_ACTIVATE_DEVT &rfDetail = activationData.activate_ntf;
+ tNFC_ACTIVATE_DEVT& rfDetail = activationData.activate_ntf;
- if (rfDetail.protocol != NFC_PROTOCOL_KOVIO)
- return false;
+ if (rfDetail.protocol != NFC_PROTOCOL_KOVIO) return false;
memcpy(&(mTechParams[0]), &(rfDetail.rf_tech_param),
sizeof(rfDetail.rf_tech_param));
- if (mTechParams[0].mode != NFC_DISCOVERY_TYPE_POLL_KOVIO)
- return false;
+ if (mTechParams[0].mode != NFC_DISCOVERY_TYPE_POLL_KOVIO) return false;
struct timespec now;
clock_gettime(CLOCK_REALTIME, &now);
@@ -266,10 +270,10 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::discoverTechnologies(tNFA_ACTIVATED &activationData) {
+void NfcTag::discoverTechnologies(tNFA_ACTIVATED& activationData) {
static const char fn[] = "NfcTag::discoverTechnologies (activation)";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
- tNFC_ACTIVATE_DEVT &rfDetail = activationData.activate_ntf;
+ tNFC_ACTIVATE_DEVT& rfDetail = activationData.activate_ntf;
mNumTechList = 0;
mTechHandles[mNumTechList] = rfDetail.rf_disc_id;
@@ -281,10 +285,10 @@
if (NFC_PROTOCOL_T1T == rfDetail.protocol) {
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
} else if (NFC_PROTOCOL_T2T == rfDetail.protocol) {
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
// could be MifFare UL or Classic or Kovio
{
// need to look at first byte of uid to find Manufacture Byte
@@ -304,8 +308,8 @@
memcpy(&(mTechParams[mNumTechList]), &(rfDetail.rf_tech_param),
sizeof(rfDetail.rf_tech_param));
mTechList[mNumTechList] =
- TARGET_TYPE_MIFARE_UL; // is TagTechnology.MIFARE_ULTRALIGHT by
- // Java API
+ TARGET_TYPE_MIFARE_UL; // is TagTechnology.MIFARE_ULTRALIGHT by
+ // Java API
}
}
}
@@ -325,7 +329,7 @@
} else if (NFC_PROTOCOL_ISO_DEP == rfDetail.protocol) {
// type-4 tag uses technology ISO-DEP and technology A or B
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_4; // is TagTechnology.ISO_DEP by Java API
+ TARGET_TYPE_ISO14443_4; // is TagTechnology.ISO_DEP by Java API
if ((rfDetail.rf_tech_param.mode == NFC_DISCOVERY_TYPE_POLL_A) ||
(rfDetail.rf_tech_param.mode == NFC_DISCOVERY_TYPE_POLL_A_ACTIVE) ||
(rfDetail.rf_tech_param.mode == NFC_DISCOVERY_TYPE_LISTEN_A) ||
@@ -334,7 +338,7 @@
mTechHandles[mNumTechList] = rfDetail.rf_disc_id;
mTechLibNfcTypes[mNumTechList] = rfDetail.protocol;
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
// save the stack's data structure for interpretation later
memcpy(&(mTechParams[mNumTechList]), &(rfDetail.rf_tech_param),
sizeof(rfDetail.rf_tech_param));
@@ -348,7 +352,7 @@
mTechHandles[mNumTechList] = rfDetail.rf_disc_id;
mTechLibNfcTypes[mNumTechList] = rfDetail.protocol;
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3B; // is TagTechnology.NFC_B by Java API
+ TARGET_TYPE_ISO14443_3B; // is TagTechnology.NFC_B by Java API
// save the stack's data structure for interpretation later
memcpy(&(mTechParams[mNumTechList]), &(rfDetail.rf_tech_param),
sizeof(rfDetail.rf_tech_param));
@@ -363,7 +367,7 @@
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: Mifare Classic", fn);
EXTNS_MfcInit(activationData);
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
mNumTechList++;
mTechHandles[mNumTechList] = rfDetail.rf_disc_id;
mTechLibNfcTypes[mNumTechList] = rfDetail.protocol;
@@ -371,8 +375,8 @@
memcpy(&(mTechParams[mNumTechList]), &(rfDetail.rf_tech_param),
sizeof(rfDetail.rf_tech_param));
mTechList[mNumTechList] =
- TARGET_TYPE_MIFARE_CLASSIC; // is TagTechnology.MIFARE_CLASSIC by Java
- // API
+ TARGET_TYPE_MIFARE_CLASSIC; // is TagTechnology.MIFARE_CLASSIC by Java
+ // API
} else {
LOG(ERROR) << StringPrintf("%s: unknown protocol ????", fn);
mTechList[mNumTechList] = TARGET_TYPE_UNKNOWN;
@@ -399,9 +403,9 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::discoverTechnologies(tNFA_DISC_RESULT &discoveryData) {
+void NfcTag::discoverTechnologies(tNFA_DISC_RESULT& discoveryData) {
static const char fn[] = "NfcTag::discoverTechnologies (discovery)";
- tNFC_RESULT_DEVT &discovery_ntf = discoveryData.discovery_ntf;
+ tNFC_RESULT_DEVT& discovery_ntf = discoveryData.discovery_ntf;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: enter: rf disc. id=%u; protocol=%u, mNumTechList=%u", fn,
@@ -419,10 +423,10 @@
if (NFC_PROTOCOL_T1T == discovery_ntf.protocol) {
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
} else if (NFC_PROTOCOL_T2T == discovery_ntf.protocol) {
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
// type-2 tags are identical to Mifare Ultralight, so Ultralight is also
// discovered
if ((discovery_ntf.rf_tech_param.param.pa.sel_rsp == 0) &&
@@ -432,8 +436,8 @@
mTechHandles[mNumTechList] = discovery_ntf.rf_disc_id;
mTechLibNfcTypes[mNumTechList] = discovery_ntf.protocol;
mTechList[mNumTechList] =
- TARGET_TYPE_MIFARE_UL; // is TagTechnology.MIFARE_ULTRALIGHT by Java
- // API
+ TARGET_TYPE_MIFARE_UL; // is TagTechnology.MIFARE_ULTRALIGHT by Java
+ // API
}
// save the stack's data structure for interpretation later
@@ -444,7 +448,7 @@
} else if (NFC_PROTOCOL_ISO_DEP == discovery_ntf.protocol) {
// type-4 tag uses technology ISO-DEP and technology A or B
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_4; // is TagTechnology.ISO_DEP by Java API
+ TARGET_TYPE_ISO14443_4; // is TagTechnology.ISO_DEP by Java API
if ((discovery_ntf.rf_tech_param.mode == NFC_DISCOVERY_TYPE_POLL_A) ||
(discovery_ntf.rf_tech_param.mode ==
NFC_DISCOVERY_TYPE_POLL_A_ACTIVE) ||
@@ -456,7 +460,7 @@
mTechHandles[mNumTechList] = discovery_ntf.rf_disc_id;
mTechLibNfcTypes[mNumTechList] = discovery_ntf.protocol;
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A; // is TagTechnology.NFC_A by Java API
// save the stack's data structure for interpretation later
memcpy(&(mTechParams[mNumTechList]), &(discovery_ntf.rf_tech_param),
sizeof(discovery_ntf.rf_tech_param));
@@ -474,7 +478,7 @@
mTechHandles[mNumTechList] = discovery_ntf.rf_disc_id;
mTechLibNfcTypes[mNumTechList] = discovery_ntf.protocol;
mTechList[mNumTechList] =
- TARGET_TYPE_ISO14443_3B; // is TagTechnology.NFC_B by Java API
+ TARGET_TYPE_ISO14443_3B; // is TagTechnology.NFC_B by Java API
// save the stack's data structure for interpretation later
memcpy(&(mTechParams[mNumTechList]), &(discovery_ntf.rf_tech_param),
sizeof(discovery_ntf.rf_tech_param));
@@ -524,11 +528,11 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::createNativeNfcTag(tNFA_ACTIVATED &activationData) {
+void NfcTag::createNativeNfcTag(tNFA_ACTIVATED& activationData) {
static const char fn[] = "NfcTag::createNativeNfcTag";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
ScopedAttach attach(mNativeData->vm, &e);
if (e == NULL) {
LOG(ERROR) << StringPrintf("%s: jni env is null", fn);
@@ -594,7 +598,7 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::fillNativeNfcTagMembers1(JNIEnv *e, jclass tag_cls, jobject tag) {
+void NfcTag::fillNativeNfcTagMembers1(JNIEnv* e, jclass tag_cls, jobject tag) {
static const char fn[] = "NfcTag::fillNativeNfcTagMembers1";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", fn);
@@ -645,8 +649,8 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::fillNativeNfcTagMembers2(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED & /*activationData*/) {
+void NfcTag::fillNativeNfcTagMembers2(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& /*activationData*/) {
static const char fn[] = "NfcTag::fillNativeNfcTagMembers2";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", fn);
jfieldID f = e->GetFieldID(tag_cls, "mConnectedTechIndex", "I");
@@ -669,8 +673,8 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::fillNativeNfcTagMembers3(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED &activationData) {
+void NfcTag::fillNativeNfcTagMembers3(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& activationData) {
static const char fn[] = "NfcTag::fillNativeNfcTagMembers3";
ScopedLocalRef<jbyteArray> pollBytes(e, e->NewByteArray(0));
ScopedLocalRef<jclass> byteArrayClass(e, e->GetObjectClass(pollBytes.get()));
@@ -688,13 +692,13 @@
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: tech A", fn);
pollBytes.reset(e->NewByteArray(2));
e->SetByteArrayRegion(pollBytes.get(), 0, 2,
- (jbyte *)mTechParams[i].param.pa.sens_res);
+ (jbyte*)mTechParams[i].param.pa.sens_res);
} else if (NFC_DISCOVERY_TYPE_POLL_B == mTechParams[i].mode ||
NFC_DISCOVERY_TYPE_POLL_B_PRIME == mTechParams[i].mode ||
NFC_DISCOVERY_TYPE_LISTEN_B == mTechParams[i].mode ||
NFC_DISCOVERY_TYPE_LISTEN_B_PRIME == mTechParams[i].mode) {
if (mTechList[i] ==
- TARGET_TYPE_ISO14443_3B) // is TagTechnology.NFC_B by Java API
+ TARGET_TYPE_ISO14443_3B) // is TagTechnology.NFC_B by Java API
{
/*****************
see NFC Forum Digital Protocol specification; section 5.6.2;
@@ -705,10 +709,10 @@
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: tech B; TARGET_TYPE_ISO14443_3B", fn);
len = mTechParams[i].param.pb.sensb_res_len;
- len = len - 4; // subtract 4 bytes for NFCID0 at byte 2 through 5
+ len = len - 4; // subtract 4 bytes for NFCID0 at byte 2 through 5
pollBytes.reset(e->NewByteArray(len));
e->SetByteArrayRegion(pollBytes.get(), 0, len,
- (jbyte *)(mTechParams[i].param.pb.sensb_res + 4));
+ (jbyte*)(mTechParams[i].param.pb.sensb_res + 4));
} else {
pollBytes.reset(e->NewByteArray(0));
}
@@ -723,7 +727,7 @@
System Code: 2 bytes;
****************/
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: tech F", fn);
- uint8_t result[10]; // return result to NFC service
+ uint8_t result[10]; // return result to NFC service
memset(result, 0, sizeof(result));
len = 10;
@@ -735,9 +739,9 @@
[i].param.pf.sensf_res[ii],mTechParams [i].param.pf.sensf_res[ii]);
}
***/
- memcpy(result, mTechParams[i].param.pf.sensf_res + 8, 8); // copy PMm
+ memcpy(result, mTechParams[i].param.pf.sensf_res + 8, 8); // copy PMm
if (activationData.params.t3t.num_system_codes >
- 0) // copy the first System Code
+ 0) // copy the first System Code
{
uint16_t systemCode = *(activationData.params.t3t.p_system_codes);
result[8] = (uint8_t)(systemCode >> 8);
@@ -746,7 +750,7 @@
"%s: tech F; sys code=0x%X 0x%X", fn, result[8], result[9]);
}
pollBytes.reset(e->NewByteArray(len));
- e->SetByteArrayRegion(pollBytes.get(), 0, len, (jbyte *)result);
+ e->SetByteArrayRegion(pollBytes.get(), 0, len, (jbyte*)result);
} else if (NFC_DISCOVERY_TYPE_POLL_V == mTechParams[i].mode ||
NFC_DISCOVERY_TYPE_LISTEN_ISO15693 == mTechParams[i].mode) {
DLOG_IF(INFO, nfc_debug_enabled)
@@ -757,13 +761,13 @@
uint8_t data[2] = {activationData.params.i93.afi,
activationData.params.i93.dsfid};
pollBytes.reset(e->NewByteArray(2));
- e->SetByteArrayRegion(pollBytes.get(), 0, 2, (jbyte *)data);
+ e->SetByteArrayRegion(pollBytes.get(), 0, 2, (jbyte*)data);
} else {
LOG(ERROR) << StringPrintf("%s: tech unknown ????", fn);
pollBytes.reset(e->NewByteArray(0));
- } // switch: every type of technology
+ } // switch: every type of technology
e->SetObjectArrayElement(techPollBytes.get(), i, pollBytes.get());
- } // for: every technology in the array
+ } // for: every technology in the array
jfieldID f = e->GetFieldID(tag_cls, "mTechPollBytes", "[[B");
e->SetObjectField(tag, f, techPollBytes.get());
}
@@ -784,8 +788,8 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::fillNativeNfcTagMembers4(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED &activationData) {
+void NfcTag::fillNativeNfcTagMembers4(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& activationData) {
static const char fn[] = "NfcTag::fillNativeNfcTagMembers4";
ScopedLocalRef<jbyteArray> actBytes(e, e->NewByteArray(0));
ScopedLocalRef<jclass> byteArrayClass(e, e->GetObjectClass(actBytes.get()));
@@ -802,7 +806,7 @@
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: T2T; tech A", fn);
actBytes.reset(e->NewByteArray(1));
e->SetByteArrayRegion(actBytes.get(), 0, 1,
- (jbyte *)&mTechParams[i].param.pa.sel_rsp);
+ (jbyte*)&mTechParams[i].param.pa.sel_rsp);
} else if (NFC_PROTOCOL_T3T == mTechLibNfcTypes[i]) {
// felica
DLOG_IF(INFO, nfc_debug_enabled)
@@ -814,11 +818,11 @@
<< StringPrintf("%s: Mifare Classic; tech A", fn);
actBytes.reset(e->NewByteArray(1));
e->SetByteArrayRegion(actBytes.get(), 0, 1,
- (jbyte *)&mTechParams[i].param.pa.sel_rsp);
+ (jbyte*)&mTechParams[i].param.pa.sel_rsp);
} else if (NFC_PROTOCOL_ISO_DEP == mTechLibNfcTypes[i]) {
// t4t
if (mTechList[i] ==
- TARGET_TYPE_ISO14443_4) // is TagTechnology.ISO_DEP by Java API
+ TARGET_TYPE_ISO14443_4) // is TagTechnology.ISO_DEP by Java API
{
if ((mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_A) ||
(mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_A_ACTIVE) ||
@@ -830,7 +834,7 @@
// returns this data;
if (activationData.activate_ntf.intf_param.type ==
NFC_INTERFACE_ISO_DEP) {
- tNFC_INTF_PA_ISO_DEP &pa_iso =
+ tNFC_INTF_PA_ISO_DEP& pa_iso =
activationData.activate_ntf.intf_param.intf_param.pa_iso;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: T4T; ISO_DEP for tech A; copy historical bytes; len=%u",
@@ -838,7 +842,7 @@
actBytes.reset(e->NewByteArray(pa_iso.his_byte_len));
if (pa_iso.his_byte_len > 0)
e->SetByteArrayRegion(actBytes.get(), 0, pa_iso.his_byte_len,
- (jbyte *)(pa_iso.his_byte));
+ (jbyte*)(pa_iso.his_byte));
} else {
LOG(ERROR) << StringPrintf(
"%s: T4T; ISO_DEP for tech A; wrong interface=%u", fn,
@@ -855,7 +859,7 @@
// data;
if (activationData.activate_ntf.intf_param.type ==
NFC_INTERFACE_ISO_DEP) {
- tNFC_INTF_PB_ISO_DEP &pb_iso =
+ tNFC_INTF_PB_ISO_DEP& pb_iso =
activationData.activate_ntf.intf_param.intf_param.pb_iso;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: T4T; ISO_DEP for tech B; copy response bytes; len=%u", fn,
@@ -863,7 +867,7 @@
actBytes.reset(e->NewByteArray(pb_iso.hi_info_len));
if (pb_iso.hi_info_len > 0)
e->SetByteArrayRegion(actBytes.get(), 0, pb_iso.hi_info_len,
- (jbyte *)(pb_iso.hi_info));
+ (jbyte*)(pb_iso.hi_info));
} else {
LOG(ERROR) << StringPrintf(
"%s: T4T; ISO_DEP for tech B; wrong interface=%u", fn,
@@ -872,16 +876,16 @@
}
}
} else if (mTechList[i] ==
- TARGET_TYPE_ISO14443_3A) // is TagTechnology.NFC_A by Java API
+ TARGET_TYPE_ISO14443_3A) // is TagTechnology.NFC_A by Java API
{
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: T4T; tech A", fn);
actBytes.reset(e->NewByteArray(1));
e->SetByteArrayRegion(actBytes.get(), 0, 1,
- (jbyte *)&mTechParams[i].param.pa.sel_rsp);
+ (jbyte*)&mTechParams[i].param.pa.sel_rsp);
} else {
actBytes.reset(e->NewByteArray(0));
}
- } // case NFC_PROTOCOL_ISO_DEP: //t4t
+ } // case NFC_PROTOCOL_ISO_DEP: //t4t
else if (NFC_PROTOCOL_T5T == mTechLibNfcTypes[i]) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: tech iso 15693", fn);
@@ -891,14 +895,14 @@
uint8_t data[2] = {activationData.params.i93.afi,
activationData.params.i93.dsfid};
actBytes.reset(e->NewByteArray(2));
- e->SetByteArrayRegion(actBytes.get(), 0, 2, (jbyte *)data);
+ e->SetByteArrayRegion(actBytes.get(), 0, 2, (jbyte*)data);
} else {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: tech unknown ????", fn);
actBytes.reset(e->NewByteArray(0));
}
e->SetObjectArrayElement(techActBytes.get(), i, actBytes.get());
- } // for: every technology in the array
+ } // for: every technology in the array
jfieldID f = e->GetFieldID(tag_cls, "mTechActBytes", "[[B");
e->SetObjectField(tag, f, techActBytes.get());
}
@@ -919,8 +923,8 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::fillNativeNfcTagMembers5(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED &activationData) {
+void NfcTag::fillNativeNfcTagMembers5(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& activationData) {
static const char fn[] = "NfcTag::fillNativeNfcTagMembers5";
int len = 0;
ScopedLocalRef<jbyteArray> uid(e, NULL);
@@ -930,7 +934,7 @@
len = mTechParams[0].param.pk.uid_len;
uid.reset(e->NewByteArray(len));
e->SetByteArrayRegion(uid.get(), 0, len,
- (jbyte *)&mTechParams[0].param.pk.uid);
+ (jbyte*)&mTechParams[0].param.pk.uid);
} else if (NFC_DISCOVERY_TYPE_POLL_A == mTechParams[0].mode ||
NFC_DISCOVERY_TYPE_POLL_A_ACTIVE == mTechParams[0].mode ||
NFC_DISCOVERY_TYPE_LISTEN_A == mTechParams[0].mode ||
@@ -939,7 +943,7 @@
len = mTechParams[0].param.pa.nfcid1_len;
uid.reset(e->NewByteArray(len));
e->SetByteArrayRegion(uid.get(), 0, len,
- (jbyte *)&mTechParams[0].param.pa.nfcid1);
+ (jbyte*)&mTechParams[0].param.pa.nfcid1);
// a tag's NFCID1 can change dynamically at each activation;
// only the first byte (0x08) is constant; a dynamic NFCID1's length
// must be 4 bytes (see NFC Digitial Protocol,
@@ -953,20 +957,20 @@
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: tech B", fn);
uid.reset(e->NewByteArray(NFC_NFCID0_MAX_LEN));
e->SetByteArrayRegion(uid.get(), 0, NFC_NFCID0_MAX_LEN,
- (jbyte *)&mTechParams[0].param.pb.nfcid0);
+ (jbyte*)&mTechParams[0].param.pb.nfcid0);
} else if (NFC_DISCOVERY_TYPE_POLL_F == mTechParams[0].mode ||
NFC_DISCOVERY_TYPE_POLL_F_ACTIVE == mTechParams[0].mode ||
NFC_DISCOVERY_TYPE_LISTEN_F == mTechParams[0].mode ||
NFC_DISCOVERY_TYPE_LISTEN_F_ACTIVE == mTechParams[0].mode) {
uid.reset(e->NewByteArray(NFC_NFCID2_LEN));
e->SetByteArrayRegion(uid.get(), 0, NFC_NFCID2_LEN,
- (jbyte *)&mTechParams[0].param.pf.nfcid2);
+ (jbyte*)&mTechParams[0].param.pf.nfcid2);
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: tech F", fn);
} else if (NFC_DISCOVERY_TYPE_POLL_V == mTechParams[0].mode ||
NFC_DISCOVERY_TYPE_LISTEN_ISO15693 == mTechParams[0].mode) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: tech iso 15693", fn);
- jbyte data[I93_UID_BYTE_LEN]; // 8 bytes
- for (int i = 0; i < I93_UID_BYTE_LEN; ++i) // reverse the ID
+ jbyte data[I93_UID_BYTE_LEN]; // 8 bytes
+ for (int i = 0; i < I93_UID_BYTE_LEN; ++i) // reverse the ID
data[i] = activationData.params.i93.uid[I93_UID_BYTE_LEN - i - 1];
uid.reset(e->NewByteArray(I93_UID_BYTE_LEN));
e->SetByteArrayRegion(uid.get(), 0, I93_UID_BYTE_LEN, data);
@@ -1019,20 +1023,18 @@
for (int i = 0; i < mNumTechList; i++) {
// if remote device does not support P2P, just skip it
- if (mTechLibNfcTypes[i] != NFA_PROTOCOL_NFC_DEP)
- continue;
+ if (mTechLibNfcTypes[i] != NFA_PROTOCOL_NFC_DEP) continue;
// if remote device supports tech F;
// tech F is preferred because it is faster than tech A
if ((mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_F) ||
(mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_F_ACTIVE)) {
rfDiscoveryId = mTechHandles[i];
- break; // no need to search further
+ break; // no need to search further
} else if ((mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_A) ||
(mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_A_ACTIVE)) {
// only choose tech A if tech F is unavailable
- if (rfDiscoveryId == 0)
- rfDiscoveryId = mTechHandles[i];
+ if (rfDiscoveryId == 0) rfDiscoveryId = mTechHandles[i];
}
}
@@ -1142,7 +1144,7 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::calculateT1tMaxMessageSize(tNFA_ACTIVATED &activate) {
+void NfcTag::calculateT1tMaxMessageSize(tNFA_ACTIVATED& activate) {
static const char fn[] = "NfcTag::calculateT1tMaxMessageSize";
// make sure the tag is type-1
@@ -1153,17 +1155,17 @@
// examine the first byte of header ROM bytes
switch (activate.params.t1t.hr[0]) {
- case RW_T1T_IS_TOPAZ96:
- mtT1tMaxMessageSize = 90;
- break;
- case RW_T1T_IS_TOPAZ512:
- mtT1tMaxMessageSize = 462;
- break;
- default:
- LOG(ERROR) << StringPrintf("%s: unknown T1T HR0=%u", fn,
- activate.params.t1t.hr[0]);
- mtT1tMaxMessageSize = 0;
- break;
+ case RW_T1T_IS_TOPAZ96:
+ mtT1tMaxMessageSize = 90;
+ break;
+ case RW_T1T_IS_TOPAZ512:
+ mtT1tMaxMessageSize = 462;
+ break;
+ default:
+ LOG(ERROR) << StringPrintf("%s: unknown T1T HR0=%u", fn,
+ activate.params.t1t.hr[0]);
+ mtT1tMaxMessageSize = 0;
+ break;
}
}
@@ -1256,15 +1258,15 @@
** Returns: True if the response is NACK
**
*******************************************************************************/
-bool NfcTag::isT2tNackResponse(const uint8_t *response, uint32_t responseLen) {
+bool NfcTag::isT2tNackResponse(const uint8_t* response, uint32_t responseLen) {
static const char fn[] = "NfcTag::isT2tNackResponse";
bool isNack = false;
if (responseLen == 1) {
if (response[0] == 0xA)
- isNack = false; // an ACK response, so definitely not a NACK
+ isNack = false; // an ACK response, so definitely not a NACK
else
- isNack = true; // assume every value is a NACK
+ isNack = true; // assume every value is a NACK
}
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: return %u", fn, isNack);
return isNack;
@@ -1292,56 +1294,55 @@
** Returns: None
**
*******************************************************************************/
-void NfcTag::connectionEventHandler(uint8_t event, tNFA_CONN_EVT_DATA *data) {
+void NfcTag::connectionEventHandler(uint8_t event, tNFA_CONN_EVT_DATA* data) {
static const char fn[] = "NfcTag::connectionEventHandler";
switch (event) {
- case NFA_DISC_RESULT_EVT: {
- tNFA_DISC_RESULT &disc_result = data->disc_result;
- if (disc_result.status == NFA_STATUS_OK) {
- discoverTechnologies(disc_result);
+ case NFA_DISC_RESULT_EVT: {
+ tNFA_DISC_RESULT& disc_result = data->disc_result;
+ if (disc_result.status == NFA_STATUS_OK) {
+ discoverTechnologies(disc_result);
+ }
+ } break;
+
+ case NFA_ACTIVATED_EVT:
+ // Only do tag detection if we are polling and it is not 'EE Direct RF'
+ // activation (which may happen when we are activated as a tag).
+ if (data->activated.activate_ntf.rf_tech_param.mode <
+ NCI_DISCOVERY_TYPE_LISTEN_A &&
+ data->activated.activate_ntf.intf_param.type !=
+ NFC_INTERFACE_EE_DIRECT_RF) {
+ tNFA_ACTIVATED& activated = data->activated;
+ if (IsSameKovio(activated)) break;
+ mIsActivated = true;
+ mProtocol = activated.activate_ntf.protocol;
+ calculateT1tMaxMessageSize(activated);
+ discoverTechnologies(activated);
+ createNativeNfcTag(activated);
+ }
+ break;
+
+ case NFA_DEACTIVATED_EVT:
+ mIsActivated = false;
+ mProtocol = NFC_PROTOCOL_UNKNOWN;
+ resetTechnologies();
+ break;
+
+ case NFA_READ_CPLT_EVT: {
+ SyncEventGuard g(mReadCompleteEvent);
+ mReadCompletedStatus = data->status;
+ mNdefDetectionTimedOut = data->status != NFA_STATUS_OK;
+ if (mNdefDetectionTimedOut)
+ LOG(ERROR) << StringPrintf("%s: NDEF detection timed out", fn);
+ mReadCompleteEvent.notifyOne();
+ } break;
+
+ case NFA_NDEF_DETECT_EVT: {
+ tNFA_NDEF_DETECT& ndef_detect = data->ndef_detect;
+ mNdefDetectionTimedOut = ndef_detect.status == NFA_STATUS_TIMEOUT;
+ if (mNdefDetectionTimedOut)
+ LOG(ERROR) << StringPrintf("%s: NDEF detection timed out", fn);
}
- } break;
-
- case NFA_ACTIVATED_EVT:
- // Only do tag detection if we are polling and it is not 'EE Direct RF'
- // activation (which may happen when we are activated as a tag).
- if (data->activated.activate_ntf.rf_tech_param.mode <
- NCI_DISCOVERY_TYPE_LISTEN_A &&
- data->activated.activate_ntf.intf_param.type !=
- NFC_INTERFACE_EE_DIRECT_RF) {
- tNFA_ACTIVATED &activated = data->activated;
- if (IsSameKovio(activated))
- break;
- mIsActivated = true;
- mProtocol = activated.activate_ntf.protocol;
- calculateT1tMaxMessageSize(activated);
- discoverTechnologies(activated);
- createNativeNfcTag(activated);
- }
- break;
-
- case NFA_DEACTIVATED_EVT:
- mIsActivated = false;
- mProtocol = NFC_PROTOCOL_UNKNOWN;
- resetTechnologies();
- break;
-
- case NFA_READ_CPLT_EVT: {
- SyncEventGuard g(mReadCompleteEvent);
- mReadCompletedStatus = data->status;
- mNdefDetectionTimedOut = data->status != NFA_STATUS_OK;
- if (mNdefDetectionTimedOut)
- LOG(ERROR) << StringPrintf("%s: NDEF detection timed out", fn);
- mReadCompleteEvent.notifyOne();
- } break;
-
- case NFA_NDEF_DETECT_EVT: {
- tNFA_NDEF_DETECT &ndef_detect = data->ndef_detect;
- mNdefDetectionTimedOut = ndef_detect.status == NFA_STATUS_TIMEOUT;
- if (mNdefDetectionTimedOut)
- LOG(ERROR) << StringPrintf("%s: NDEF detection timed out", fn);
- }
}
}
@@ -1367,8 +1368,8 @@
*******************************************************************************/
bool NfcTag::isDynamicTagId() {
return mIsDynamicTagId &&
- (mTechList[0] == TARGET_TYPE_ISO14443_4) && // type-4 tag
- (mTechList[1] == TARGET_TYPE_ISO14443_3A); // tech A
+ (mTechList[0] == TARGET_TYPE_ISO14443_4) && // type-4 tag
+ (mTechList[1] == TARGET_TYPE_ISO14443_3A); // tech A
}
/*******************************************************************************
@@ -1381,16 +1382,16 @@
**
*******************************************************************************/
void NfcTag::resetAllTransceiveTimeouts() {
- mTechnologyTimeoutsTable[TARGET_TYPE_ISO14443_3A] = 618; // NfcA
- mTechnologyTimeoutsTable[TARGET_TYPE_ISO14443_3B] = 1000; // NfcB
- mTechnologyTimeoutsTable[TARGET_TYPE_ISO14443_4] = 618; // ISO-DEP
- mTechnologyTimeoutsTable[TARGET_TYPE_FELICA] = 255; // Felica
- mTechnologyTimeoutsTable[TARGET_TYPE_V] = 1000; // NfcV
+ mTechnologyTimeoutsTable[TARGET_TYPE_ISO14443_3A] = 618; // NfcA
+ mTechnologyTimeoutsTable[TARGET_TYPE_ISO14443_3B] = 1000; // NfcB
+ mTechnologyTimeoutsTable[TARGET_TYPE_ISO14443_4] = 618; // ISO-DEP
+ mTechnologyTimeoutsTable[TARGET_TYPE_FELICA] = 255; // Felica
+ mTechnologyTimeoutsTable[TARGET_TYPE_V] = 1000; // NfcV
mTechnologyTimeoutsTable[TARGET_TYPE_NDEF] = 1000;
mTechnologyTimeoutsTable[TARGET_TYPE_NDEF_FORMATABLE] = 1000;
- mTechnologyTimeoutsTable[TARGET_TYPE_MIFARE_CLASSIC] = 618; // MifareClassic
- mTechnologyTimeoutsTable[TARGET_TYPE_MIFARE_UL] = 618; // MifareUltralight
- mTechnologyTimeoutsTable[TARGET_TYPE_KOVIO_BARCODE] = 1000; // NfcBarcode
+ mTechnologyTimeoutsTable[TARGET_TYPE_MIFARE_CLASSIC] = 618; // MifareClassic
+ mTechnologyTimeoutsTable[TARGET_TYPE_MIFARE_UL] = 618; // MifareUltralight
+ mTechnologyTimeoutsTable[TARGET_TYPE_KOVIO_BARCODE] = 1000; // NfcBarcode
}
/*******************************************************************************
@@ -1466,8 +1467,7 @@
// Short Product Information, 2011-11-24, section 3.5
if (mTechParams[i].param.pa.nfcid1[0] == 0x05) {
uint8_t highNibble = mTechParams[i].param.pa.nfcid1[1] & 0xF0;
- if (highNibble == 0x30)
- retval = true;
+ if (highNibble == 0x30) retval = true;
}
break;
}
@@ -1493,8 +1493,7 @@
if (mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_A) {
// Kovio 2Kb RFID Tag, Functional Specification,
// March 2, 2012, v2.0, section 8.3.
- if (mTechParams[i].param.pa.nfcid1[0] == 0x37)
- retval = true;
+ if (mTechParams[i].param.pa.nfcid1[0] == 0x37) retval = true;
break;
}
}
diff --git a/nci/jni/NfcTag.h b/nci/jni/NfcTag.h
index 4342b86..bda0aed 100644
--- a/nci/jni/NfcTag.h
+++ b/nci/jni/NfcTag.h
@@ -19,24 +19,24 @@
*/
#pragma once
+#include <vector>
#include "NfcJniUtil.h"
#include "SyncEvent.h"
-#include <vector>
#include "nfa_rw_api.h"
class NfcTag {
-public:
+ public:
enum ActivationState { Idle, Sleep, Active };
static const int MAX_NUM_TECHNOLOGY =
- 11; // max number of technologies supported by one or more tags
- int mTechList[MAX_NUM_TECHNOLOGY]; // array of NFC technologies according to
- // NFC service
- int mTechHandles[MAX_NUM_TECHNOLOGY]; // array of tag handles according to NFC
- // service
- int mTechLibNfcTypes[MAX_NUM_TECHNOLOGY]; // array of detailed tag types
- // according to NFC service
- int mNumTechList; // current number of NFC technologies in the list
+ 11; // max number of technologies supported by one or more tags
+ int mTechList[MAX_NUM_TECHNOLOGY]; // array of NFC technologies according to
+ // NFC service
+ int mTechHandles[MAX_NUM_TECHNOLOGY]; // array of tag handles according to
+ // NFC service
+ int mTechLibNfcTypes[MAX_NUM_TECHNOLOGY]; // array of detailed tag types
+ // according to NFC service
+ int mNumTechList; // current number of NFC technologies in the list
/*******************************************************************************
**
@@ -58,7 +58,7 @@
** Returns: Reference to NfcTag object.
**
*******************************************************************************/
- static NfcTag &getInstance();
+ static NfcTag& getInstance();
/*******************************************************************************
**
@@ -69,7 +69,7 @@
** Returns: None
**
*******************************************************************************/
- void initialize(nfc_jni_native_data *native);
+ void initialize(nfc_jni_native_data* native);
/*******************************************************************************
**
@@ -93,7 +93,7 @@
** Returns: None
**
*******************************************************************************/
- void connectionEventHandler(uint8_t event, tNFA_CONN_EVT_DATA *data);
+ void connectionEventHandler(uint8_t event, tNFA_CONN_EVT_DATA* data);
/*******************************************************************************
**
@@ -127,7 +127,7 @@
** Returns: None.
**
*******************************************************************************/
- void setDeactivationState(tNFA_DEACTIVATED &deactivated);
+ void setDeactivationState(tNFA_DEACTIVATED& deactivated);
/*******************************************************************************
**
@@ -243,7 +243,7 @@
** Returns: True if the response is NACK
**
*******************************************************************************/
- bool isT2tNackResponse(const uint8_t *response, uint32_t responseLen);
+ bool isT2tNackResponse(const uint8_t* response, uint32_t responseLen);
/*******************************************************************************
**
@@ -364,23 +364,23 @@
*******************************************************************************/
bool isKovioType2Tag();
-private:
+ private:
std::vector<int> mTechnologyTimeoutsTable;
std::vector<int> mTechnologyDefaultTimeoutsTable;
- nfc_jni_native_data *mNativeData;
+ nfc_jni_native_data* mNativeData;
bool mIsActivated;
ActivationState mActivationState;
tNFC_PROTOCOL mProtocol;
- int mtT1tMaxMessageSize; // T1T max NDEF message size
+ int mtT1tMaxMessageSize; // T1T max NDEF message size
tNFA_STATUS mReadCompletedStatus;
- int mLastKovioUidLen; // len of uid of last Kovio tag activated
- bool mNdefDetectionTimedOut; // whether NDEF detection algorithm timed out
+ int mLastKovioUidLen; // len of uid of last Kovio tag activated
+ bool mNdefDetectionTimedOut; // whether NDEF detection algorithm timed out
tNFC_RF_TECH_PARAMS
- mTechParams[MAX_NUM_TECHNOLOGY]; // array of technology parameters
+ mTechParams[MAX_NUM_TECHNOLOGY]; // array of technology parameters
SyncEvent mReadCompleteEvent;
- struct timespec mLastKovioTime; // time of last Kovio tag activation
- uint8_t mLastKovioUid[NFC_KOVIO_MAX_LEN]; // uid of last Kovio tag activated
- bool mIsDynamicTagId; // whether the tag has dynamic tag ID
+ struct timespec mLastKovioTime; // time of last Kovio tag activation
+ uint8_t mLastKovioUid[NFC_KOVIO_MAX_LEN]; // uid of last Kovio tag activated
+ bool mIsDynamicTagId; // whether the tag has dynamic tag ID
tNFA_RW_PRES_CHK_OPTION mPresenceCheckAlgorithm;
bool mIsFelicaLite;
@@ -399,7 +399,7 @@
** activated, false otherwise
**
*******************************************************************************/
- bool IsSameKovio(tNFA_ACTIVATED &activationData);
+ bool IsSameKovio(tNFA_ACTIVATED& activationData);
/*******************************************************************************
**
@@ -413,7 +413,7 @@
** Returns: None
**
*******************************************************************************/
- void discoverTechnologies(tNFA_ACTIVATED &activationData);
+ void discoverTechnologies(tNFA_ACTIVATED& activationData);
/*******************************************************************************
**
@@ -427,7 +427,7 @@
** Returns: None
**
*******************************************************************************/
- void discoverTechnologies(tNFA_DISC_RESULT &discoveryData);
+ void discoverTechnologies(tNFA_DISC_RESULT& discoveryData);
/*******************************************************************************
**
@@ -441,7 +441,7 @@
** Returns: None
**
*******************************************************************************/
- void createNativeNfcTag(tNFA_ACTIVATED &activationData);
+ void createNativeNfcTag(tNFA_ACTIVATED& activationData);
/*******************************************************************************
**
@@ -456,7 +456,7 @@
** Returns: None
**
*******************************************************************************/
- void fillNativeNfcTagMembers1(JNIEnv *e, jclass tag_cls, jobject tag);
+ void fillNativeNfcTagMembers1(JNIEnv* e, jclass tag_cls, jobject tag);
/*******************************************************************************
**
@@ -475,8 +475,8 @@
** Returns: None
**
*******************************************************************************/
- void fillNativeNfcTagMembers2(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED &activationData);
+ void fillNativeNfcTagMembers2(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& activationData);
/*******************************************************************************
**
@@ -494,8 +494,8 @@
** Returns: None
**
*******************************************************************************/
- void fillNativeNfcTagMembers3(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED &activationData);
+ void fillNativeNfcTagMembers3(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& activationData);
/*******************************************************************************
**
@@ -513,8 +513,8 @@
** Returns: None
**
*******************************************************************************/
- void fillNativeNfcTagMembers4(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED &activationData);
+ void fillNativeNfcTagMembers4(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& activationData);
/*******************************************************************************
**
@@ -532,8 +532,8 @@
** Returns: None
**
*******************************************************************************/
- void fillNativeNfcTagMembers5(JNIEnv *e, jclass tag_cls, jobject tag,
- tNFA_ACTIVATED &activationData);
+ void fillNativeNfcTagMembers5(JNIEnv* e, jclass tag_cls, jobject tag,
+ tNFA_ACTIVATED& activationData);
/*******************************************************************************
**
@@ -558,5 +558,5 @@
** Returns: None
**
*******************************************************************************/
- void calculateT1tMaxMessageSize(tNFA_ACTIVATED &activate);
+ void calculateT1tMaxMessageSize(tNFA_ACTIVATED& activate);
};
diff --git a/nci/jni/PeerToPeer.cpp b/nci/jni/PeerToPeer.cpp
index 828b643..5560175 100644
--- a/nci/jni/PeerToPeer.cpp
+++ b/nci/jni/PeerToPeer.cpp
@@ -18,12 +18,12 @@
* Communicate with a peer using NFC-DEP, LLCP, SNEP.
*/
#include "PeerToPeer.h"
+#include <nativehelper/ScopedLocalRef.h>
#include "JavaClassConstants.h"
#include "NfcJniUtil.h"
#include "_OverrideLog.h"
#include "config.h"
#include "llcp_defs.h"
-#include <nativehelper/ScopedLocalRef.h>
/* Some older PN544-based solutions would only send the first SYMM back
* (as an initiator) after the full LTO (750ms). But our connect timer
@@ -41,7 +41,7 @@
extern void nativeNfcTag_deregisterNdefTypeHandler();
extern void startRfDiscovery(bool isStart);
extern bool isDiscoveryStarted();
-} // namespace android
+} // namespace android
PeerToPeer PeerToPeer::sP2p;
const std::string P2pServer::sSnepServiceName("urn:nfc:sn:snep");
@@ -56,7 +56,8 @@
**
*******************************************************************************/
PeerToPeer::PeerToPeer()
- : mRemoteWKS(0), mIsP2pListening(false),
+ : mRemoteWKS(0),
+ mIsP2pListening(false),
mP2pListenTechMask(NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
NFA_TECHNOLOGY_MASK_A_ACTIVE |
NFA_TECHNOLOGY_MASK_F_ACTIVE),
@@ -85,7 +86,7 @@
** Returns: Singleton PeerToPeer object.
**
*******************************************************************************/
-PeerToPeer &PeerToPeer::getInstance() { return sP2p; }
+PeerToPeer& PeerToPeer::getInstance() { return sP2p; }
/*******************************************************************************
**
@@ -160,7 +161,7 @@
** Returns: PeerToPeer object.
**
*******************************************************************************/
-sp<P2pServer> PeerToPeer::findServerLocked(const char *serviceName) {
+sp<P2pServer> PeerToPeer::findServerLocked(const char* serviceName) {
for (int i = 0; i < sMax; i++) {
if ((mServers[i] != NULL) &&
(mServers[i]->mServiceName.compare(serviceName) == 0))
@@ -183,7 +184,7 @@
**
*******************************************************************************/
bool PeerToPeer::registerServer(tJNI_HANDLE jniHandle,
- const char *serviceName) {
+ const char* serviceName) {
static const char fn[] = "PeerToPeer::registerServer";
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; service name: %s JNI handle: %u", fn,
@@ -273,8 +274,8 @@
** Returns: None
**
*******************************************************************************/
-void PeerToPeer::llcpActivatedHandler(nfc_jni_native_data *nat,
- tNFA_LLCP_ACTIVATED &activated) {
+void PeerToPeer::llcpActivatedHandler(nfc_jni_native_data* nat,
+ tNFA_LLCP_ACTIVATED& activated) {
static const char fn[] = "PeerToPeer::llcpActivatedHandler";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
@@ -283,7 +284,7 @@
mRemoteWKS = activated.remote_wks;
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
ScopedAttach attach(nat->vm, &e);
if (e == NULL) {
LOG(ERROR) << StringPrintf("%s: jni env is null", fn);
@@ -320,7 +321,7 @@
/* Set tag handle */
f = e->GetFieldID(tag_cls.get(), "mHandle", "I");
e->SetIntField(tag.get(), f,
- (jint)0x1234); // ?? This handle is not used for anything
+ (jint)0x1234); // ?? This handle is not used for anything
if (nat->tag != NULL) {
e->DeleteGlobalRef(nat->tag);
@@ -354,11 +355,11 @@
**
*******************************************************************************/
void PeerToPeer::llcpDeactivatedHandler(
- nfc_jni_native_data *nat, tNFA_LLCP_DEACTIVATED & /*deactivated*/) {
+ nfc_jni_native_data* nat, tNFA_LLCP_DEACTIVATED& /*deactivated*/) {
static const char fn[] = "PeerToPeer::llcpDeactivatedHandler";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
ScopedAttach attach(nat->vm, &e);
if (e == NULL) {
LOG(ERROR) << StringPrintf("%s: jni env is null", fn);
@@ -381,11 +382,11 @@
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", fn);
}
-void PeerToPeer::llcpFirstPacketHandler(nfc_jni_native_data *nat) {
+void PeerToPeer::llcpFirstPacketHandler(nfc_jni_native_data* nat) {
static const char fn[] = "PeerToPeer::llcpFirstPacketHandler";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
ScopedAttach attach(nat->vm, &e);
if (e == NULL) {
LOG(ERROR) << StringPrintf("%s: jni env is null", fn);
@@ -534,7 +535,7 @@
{
SyncEventGuard guard(mClients[i]->mRegisteringEvent);
NFA_P2pRegisterClient(NFA_P2P_DLINK_TYPE, nfaClientCallback);
- mClients[i]->mRegisteringEvent.wait(); // wait for NFA_P2P_REG_CLIENT_EVT
+ mClients[i]->mRegisteringEvent.wait(); // wait for NFA_P2P_REG_CLIENT_EVT
}
if (mClients[i]->mNfaP2pClientHandle != NFA_HANDLE_INVALID) {
@@ -603,7 +604,7 @@
**
*******************************************************************************/
bool PeerToPeer::connectConnOriented(tJNI_HANDLE jniHandle,
- const char *serviceName) {
+ const char* serviceName) {
static const char fn[] = "PeerToPeer::connectConnOriented";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: enter; h: %u service name=%s", fn, jniHandle, serviceName);
@@ -648,7 +649,7 @@
**
*******************************************************************************/
bool PeerToPeer::createDataLinkConn(tJNI_HANDLE jniHandle,
- const char *serviceName,
+ const char* serviceName,
uint8_t destinationSap) {
static const char fn[] = "PeerToPeer::createDataLinkConn";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
@@ -667,7 +668,7 @@
if (serviceName)
nfaStat = NFA_P2pConnectByName(pClient->mNfaP2pClientHandle,
- const_cast<char *>(serviceName),
+ const_cast<char*>(serviceName),
pClient->mClientConn->mMaxInfoUnit,
pClient->mClientConn->mRecvWindow);
else if (destinationSap)
@@ -838,7 +839,7 @@
** Returns: True if ok.
**
*******************************************************************************/
-bool PeerToPeer::send(tJNI_HANDLE jniHandle, uint8_t *buffer,
+bool PeerToPeer::send(tJNI_HANDLE jniHandle, uint8_t* buffer,
uint16_t bufferLen) {
static const char fn[] = "PeerToPeer::send";
tNFA_STATUS nfaStat = NFA_STATUS_FAILED;
@@ -858,12 +859,12 @@
SyncEventGuard guard(pConn->mCongEvent);
nfaStat = NFA_P2pSendData(pConn->mNfaConnHandle, bufferLen, buffer);
if (nfaStat == NFA_STATUS_CONGESTED)
- pConn->mCongEvent.wait(); // wait for NFA_P2P_CONGEST_EVT
+ pConn->mCongEvent.wait(); // wait for NFA_P2P_CONGEST_EVT
else
break;
if (pConn->mNfaConnHandle ==
- NFA_HANDLE_INVALID) // peer already disconnected
+ NFA_HANDLE_INVALID) // peer already disconnected
{
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: peer disconnected", fn);
@@ -896,8 +897,8 @@
** Returns: True if ok.
**
*******************************************************************************/
-bool PeerToPeer::receive(tJNI_HANDLE jniHandle, uint8_t *buffer,
- uint16_t bufferLen, uint16_t &actualLen) {
+bool PeerToPeer::receive(tJNI_HANDLE jniHandle, uint8_t* buffer,
+ uint16_t bufferLen, uint16_t& actualLen) {
static const char fn[] = "PeerToPeer::receive";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: enter; jniHandle: %u bufferLen: %u", fn, jniHandle, bufferLen);
@@ -921,7 +922,7 @@
// NFA_P2pReadData() is synchronous
stat = NFA_P2pReadData(pConn->mNfaConnHandle, bufferLen, &actualDataLen2,
buffer, &isMoreData);
- if ((stat == NFA_STATUS_OK) && (actualDataLen2 > 0)) // received some data
+ if ((stat == NFA_STATUS_OK) && (actualDataLen2 > 0)) // received some data
{
actualLen = (uint16_t)actualDataLen2;
retVal = true;
@@ -933,7 +934,7 @@
SyncEventGuard guard(pConn->mReadEvent);
pConn->mReadEvent.wait();
}
- } // while
+ } // while
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: exit; nfa h: 0x%X ok: %u actual len: %u", fn,
@@ -976,11 +977,11 @@
{
SyncEventGuard guard1(pConn->mCongEvent);
- pConn->mCongEvent.notifyOne(); // unblock send() if congested
+ pConn->mCongEvent.notifyOne(); // unblock send() if congested
}
{
SyncEventGuard guard2(pConn->mReadEvent);
- pConn->mReadEvent.notifyOne(); // unblock receive()
+ pConn->mReadEvent.notifyOne(); // unblock receive()
}
if (pConn->mNfaConnHandle != NFA_HANDLE_INVALID) {
@@ -1153,7 +1154,7 @@
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: enter; is on=%u", fn, isOn);
- mIsP2pListening = false; // In both cases, P2P will not be listening
+ mIsP2pListening = false; // In both cases, P2P will not be listening
AutoMutex mutex(mMutex);
if (isOn) {
@@ -1171,23 +1172,24 @@
mClients[ii]->mClientConn->mNfaConnHandle = NFA_HANDLE_INVALID;
{
SyncEventGuard guard1(mClients[ii]->mClientConn->mCongEvent);
- mClients[ii]->mClientConn->mCongEvent.notifyOne(); // unblock send()
+ mClients[ii]
+ ->mClientConn->mCongEvent.notifyOne(); // unblock send()
}
{
SyncEventGuard guard2(mClients[ii]->mClientConn->mReadEvent);
mClients[ii]
- ->mClientConn->mReadEvent.notifyOne(); // unblock receive()
+ ->mClientConn->mReadEvent.notifyOne(); // unblock receive()
}
}
}
- } // loop
+ } // loop
// Now look through all the server control blocks
for (int ii = 0; ii < sMax; ii++) {
if (mServers[ii] != NULL) {
mServers[ii]->unblockAll();
}
- } // loop
+ } // loop
}
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", fn);
}
@@ -1204,7 +1206,7 @@
**
*******************************************************************************/
void PeerToPeer::nfaServerCallback(tNFA_P2P_EVT p2pEvent,
- tNFA_P2P_EVT_DATA *eventData) {
+ tNFA_P2P_EVT_DATA* eventData) {
static const char fn[] = "PeerToPeer::nfaServerCallback";
sp<P2pServer> pSrv = NULL;
sp<NfaConn> pConn = NULL;
@@ -1213,157 +1215,159 @@
<< StringPrintf("%s: enter; event=0x%X", fn, p2pEvent);
switch (p2pEvent) {
- case NFA_P2P_REG_SERVER_EVT: // NFA_P2pRegisterServer() has started to listen
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_REG_SERVER_EVT; handle: 0x%04x; service sap=0x%02x name: "
- "%s",
- fn, eventData->reg_server.server_handle,
- eventData->reg_server.server_sap, eventData->reg_server.service_name);
-
- sP2p.mMutex.lock();
- pSrv = sP2p.findServerLocked(eventData->reg_server.service_name);
- sP2p.mMutex.unlock();
- if (pSrv == NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_REG_SERVER_EVT for unknown service: %s", fn,
- eventData->reg_server.service_name);
- } else {
- SyncEventGuard guard(pSrv->mRegServerEvent);
- pSrv->mNfaP2pServerHandle = eventData->reg_server.server_handle;
- pSrv->mRegServerEvent.notifyOne(); // unblock registerServer()
- }
- break;
-
- case NFA_P2P_ACTIVATED_EVT: // remote device has activated
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_ACTIVATED_EVT; handle: 0x%04x", fn,
- eventData->activated.handle);
- break;
-
- case NFA_P2P_DEACTIVATED_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DEACTIVATED_EVT; handle: 0x%04x", fn,
- eventData->activated.handle);
- break;
-
- case NFA_P2P_CONN_REQ_EVT:
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_CONN_REQ_EVT; nfa server h=0x%04x; nfa conn h=0x%04x; "
- "remote sap=0x%02x",
- fn, eventData->conn_req.server_handle, eventData->conn_req.conn_handle,
- eventData->conn_req.remote_sap);
-
- sP2p.mMutex.lock();
- pSrv = sP2p.findServerLocked(eventData->conn_req.server_handle);
- sP2p.mMutex.unlock();
- if (pSrv == NULL) {
- LOG(ERROR) << StringPrintf("%s: NFA_P2P_CONN_REQ_EVT; unknown server h",
- fn);
- return;
- }
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u", fn, pSrv->mJniHandle);
-
- // Look for a connection block that is waiting (handle invalid)
- if ((pConn = pSrv->findServerConnection((tNFA_HANDLE)NFA_HANDLE_INVALID)) ==
- NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_CONN_REQ_EVT; server not listening", fn);
- } else {
- SyncEventGuard guard(pSrv->mConnRequestEvent);
- pConn->mNfaConnHandle = eventData->conn_req.conn_handle;
- pConn->mRemoteMaxInfoUnit = eventData->conn_req.remote_miu;
- pConn->mRemoteRecvWindow = eventData->conn_req.remote_rw;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u; conn jni "
- "h=%u; notify conn req",
- fn, pSrv->mJniHandle, pConn->mJniHandle);
- pSrv->mConnRequestEvent.notifyOne(); // unblock accept()
- }
- break;
-
- case NFA_P2P_CONNECTED_EVT:
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_CONNECTED_EVT; h=0x%x remote sap=0x%X", fn,
- eventData->connected.client_handle, eventData->connected.remote_sap);
- break;
-
- case NFA_P2P_DISC_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn,
- eventData->disc.handle, eventData->disc.reason);
- // Look for the connection block
- if ((pConn = sP2p.findConnection(eventData->disc.handle)) == NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_DISC_EVT: can't find conn for NFA handle: 0x%04x", fn,
- eventData->disc.handle);
- } else {
- sP2p.mDisconnectMutex.lock();
- pConn->mNfaConnHandle = NFA_HANDLE_INVALID;
- {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
- SyncEventGuard guard3(pConn->mDisconnectingEvent);
- pConn->mDisconnectingEvent.notifyOne();
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
- }
- {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
- SyncEventGuard guard1(pConn->mCongEvent);
- pConn->mCongEvent.notifyOne(); // unblock write (if congested)
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; notified congest event", fn);
- }
- {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
- SyncEventGuard guard2(pConn->mReadEvent);
- pConn->mReadEvent.notifyOne(); // unblock receive()
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; notified read event", fn);
- }
- sP2p.mDisconnectMutex.unlock();
- }
- break;
-
- case NFA_P2P_DATA_EVT:
- // Look for the connection block
- if ((pConn = sP2p.findConnection(eventData->data.handle)) == NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn,
- eventData->data.handle);
- } else {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
- eventData->data.handle, eventData->data.remote_sap);
- SyncEventGuard guard(pConn->mReadEvent);
- pConn->mReadEvent.notifyOne();
- }
- break;
-
- case NFA_P2P_CONGEST_EVT:
- // Look for the connection block
- if ((pConn = sP2p.findConnection(eventData->congest.handle)) == NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x", fn,
- eventData->congest.handle);
- } else {
+ case NFA_P2P_REG_SERVER_EVT: // NFA_P2pRegisterServer() has started to
+ // listen
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
- eventData->congest.handle, eventData->congest.is_congested);
- if (eventData->congest.is_congested == FALSE) {
- SyncEventGuard guard(pConn->mCongEvent);
- pConn->mCongEvent.notifyOne();
- }
- }
- break;
+ "%s: NFA_P2P_REG_SERVER_EVT; handle: 0x%04x; service sap=0x%02x "
+ "name: "
+ "%s",
+ fn, eventData->reg_server.server_handle,
+ eventData->reg_server.server_sap, eventData->reg_server.service_name);
- default:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: unknown event 0x%X ????", fn, p2pEvent);
- break;
+ sP2p.mMutex.lock();
+ pSrv = sP2p.findServerLocked(eventData->reg_server.service_name);
+ sP2p.mMutex.unlock();
+ if (pSrv == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_REG_SERVER_EVT for unknown service: %s", fn,
+ eventData->reg_server.service_name);
+ } else {
+ SyncEventGuard guard(pSrv->mRegServerEvent);
+ pSrv->mNfaP2pServerHandle = eventData->reg_server.server_handle;
+ pSrv->mRegServerEvent.notifyOne(); // unblock registerServer()
+ }
+ break;
+
+ case NFA_P2P_ACTIVATED_EVT: // remote device has activated
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_ACTIVATED_EVT; handle: 0x%04x", fn,
+ eventData->activated.handle);
+ break;
+
+ case NFA_P2P_DEACTIVATED_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DEACTIVATED_EVT; handle: 0x%04x", fn,
+ eventData->activated.handle);
+ break;
+
+ case NFA_P2P_CONN_REQ_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_CONN_REQ_EVT; nfa server h=0x%04x; nfa conn h=0x%04x; "
+ "remote sap=0x%02x",
+ fn, eventData->conn_req.server_handle,
+ eventData->conn_req.conn_handle, eventData->conn_req.remote_sap);
+
+ sP2p.mMutex.lock();
+ pSrv = sP2p.findServerLocked(eventData->conn_req.server_handle);
+ sP2p.mMutex.unlock();
+ if (pSrv == NULL) {
+ LOG(ERROR) << StringPrintf("%s: NFA_P2P_CONN_REQ_EVT; unknown server h",
+ fn);
+ return;
+ }
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u", fn, pSrv->mJniHandle);
+
+ // Look for a connection block that is waiting (handle invalid)
+ if ((pConn = pSrv->findServerConnection(
+ (tNFA_HANDLE)NFA_HANDLE_INVALID)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_CONN_REQ_EVT; server not listening", fn);
+ } else {
+ SyncEventGuard guard(pSrv->mConnRequestEvent);
+ pConn->mNfaConnHandle = eventData->conn_req.conn_handle;
+ pConn->mRemoteMaxInfoUnit = eventData->conn_req.remote_miu;
+ pConn->mRemoteRecvWindow = eventData->conn_req.remote_rw;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_CONN_REQ_EVT; server jni h=%u; conn jni "
+ "h=%u; notify conn req",
+ fn, pSrv->mJniHandle, pConn->mJniHandle);
+ pSrv->mConnRequestEvent.notifyOne(); // unblock accept()
+ }
+ break;
+
+ case NFA_P2P_CONNECTED_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_CONNECTED_EVT; h=0x%x remote sap=0x%X", fn,
+ eventData->connected.client_handle, eventData->connected.remote_sap);
+ break;
+
+ case NFA_P2P_DISC_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn,
+ eventData->disc.handle, eventData->disc.reason);
+ // Look for the connection block
+ if ((pConn = sP2p.findConnection(eventData->disc.handle)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT: can't find conn for NFA handle: 0x%04x", fn,
+ eventData->disc.handle);
+ } else {
+ sP2p.mDisconnectMutex.lock();
+ pConn->mNfaConnHandle = NFA_HANDLE_INVALID;
+ {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
+ SyncEventGuard guard3(pConn->mDisconnectingEvent);
+ pConn->mDisconnectingEvent.notifyOne();
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
+ }
+ {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
+ SyncEventGuard guard1(pConn->mCongEvent);
+ pConn->mCongEvent.notifyOne(); // unblock write (if congested)
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; notified congest event", fn);
+ }
+ {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
+ SyncEventGuard guard2(pConn->mReadEvent);
+ pConn->mReadEvent.notifyOne(); // unblock receive()
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DISC_EVT; notified read event", fn);
+ }
+ sP2p.mDisconnectMutex.unlock();
+ }
+ break;
+
+ case NFA_P2P_DATA_EVT:
+ // Look for the connection block
+ if ((pConn = sP2p.findConnection(eventData->data.handle)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn,
+ eventData->data.handle);
+ } else {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
+ eventData->data.handle, eventData->data.remote_sap);
+ SyncEventGuard guard(pConn->mReadEvent);
+ pConn->mReadEvent.notifyOne();
+ }
+ break;
+
+ case NFA_P2P_CONGEST_EVT:
+ // Look for the connection block
+ if ((pConn = sP2p.findConnection(eventData->congest.handle)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x",
+ fn, eventData->congest.handle);
+ } else {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
+ eventData->congest.handle, eventData->congest.is_congested);
+ if (eventData->congest.is_congested == FALSE) {
+ SyncEventGuard guard(pConn->mCongEvent);
+ pConn->mCongEvent.notifyOne();
+ }
+ }
+ break;
+
+ default:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: unknown event 0x%X ????", fn, p2pEvent);
+ break;
}
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", fn);
}
@@ -1380,7 +1384,7 @@
**
*******************************************************************************/
void PeerToPeer::nfaClientCallback(tNFA_P2P_EVT p2pEvent,
- tNFA_P2P_EVT_DATA *eventData) {
+ tNFA_P2P_EVT_DATA* eventData) {
static const char fn[] = "PeerToPeer::nfaClientCallback";
sp<NfaConn> pConn = NULL;
sp<P2pClient> pClient = NULL;
@@ -1389,145 +1393,147 @@
<< StringPrintf("%s: enter; event=%u", fn, p2pEvent);
switch (p2pEvent) {
- case NFA_P2P_REG_CLIENT_EVT:
- // Look for a client that is trying to register
- if ((pClient = sP2p.findClient((tNFA_HANDLE)NFA_HANDLE_INVALID)) == NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_REG_CLIENT_EVT: can't find waiting client", fn);
- } else {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_REG_CLIENT_EVT; Conn Handle: 0x%04x, pClient: 0x%p", fn,
- eventData->reg_client.client_handle, pClient.get());
-
- SyncEventGuard guard(pClient->mRegisteringEvent);
- pClient->mNfaP2pClientHandle = eventData->reg_client.client_handle;
- pClient->mRegisteringEvent.notifyOne();
- }
- break;
-
- case NFA_P2P_ACTIVATED_EVT:
- // Look for a client that is trying to register
- if ((pClient = sP2p.findClient(eventData->activated.handle)) == NULL) {
- LOG(ERROR) << StringPrintf("%s: NFA_P2P_ACTIVATED_EVT: can't find client",
- fn);
- } else {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_ACTIVATED_EVT; Conn Handle: 0x%04x, pClient: 0x%p", fn,
- eventData->activated.handle, pClient.get());
- }
- break;
-
- case NFA_P2P_DEACTIVATED_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DEACTIVATED_EVT: conn handle: 0x%X", fn,
- eventData->deactivated.handle);
- break;
-
- case NFA_P2P_CONNECTED_EVT:
- // Look for the client that is trying to connect
- if ((pClient = sP2p.findClient(eventData->connected.client_handle)) ==
- NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_CONNECTED_EVT: can't find client: 0x%04x", fn,
- eventData->connected.client_handle);
- } else {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_CONNECTED_EVT; client_handle=0x%04x "
- "conn_handle: 0x%04x remote sap=0x%X pClient: 0x%p",
- fn, eventData->connected.client_handle,
- eventData->connected.conn_handle,
- eventData->connected.remote_sap, pClient.get());
-
- SyncEventGuard guard(pClient->mConnectingEvent);
- pClient->mClientConn->mNfaConnHandle = eventData->connected.conn_handle;
- pClient->mClientConn->mRemoteMaxInfoUnit =
- eventData->connected.remote_miu;
- pClient->mClientConn->mRemoteRecvWindow = eventData->connected.remote_rw;
- pClient->mConnectingEvent.notifyOne(); // unblock createDataLinkConn()
- }
- break;
-
- case NFA_P2P_DISC_EVT:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn,
- eventData->disc.handle, eventData->disc.reason);
- // Look for the connection block
- if ((pConn = sP2p.findConnection(eventData->disc.handle)) == NULL) {
- // If no connection, may be a client that is trying to connect
- if ((pClient = sP2p.findClient(eventData->disc.handle)) == NULL) {
+ case NFA_P2P_REG_CLIENT_EVT:
+ // Look for a client that is trying to register
+ if ((pClient = sP2p.findClient((tNFA_HANDLE)NFA_HANDLE_INVALID)) ==
+ NULL) {
LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_DISC_EVT: can't find client for NFA handle: 0x%04x",
- fn, eventData->disc.handle);
- return;
- }
- // Unblock createDataLinkConn()
- SyncEventGuard guard(pClient->mConnectingEvent);
- pClient->mConnectingEvent.notifyOne();
- } else {
- sP2p.mDisconnectMutex.lock();
- pConn->mNfaConnHandle = NFA_HANDLE_INVALID;
- {
+ "%s: NFA_P2P_REG_CLIENT_EVT: can't find waiting client", fn);
+ } else {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
- SyncEventGuard guard3(pConn->mDisconnectingEvent);
- pConn->mDisconnectingEvent.notifyOne();
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
- }
- {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
- SyncEventGuard guard1(pConn->mCongEvent);
- pConn->mCongEvent.notifyOne(); // unblock write (if congested)
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; notified congest event", fn);
- }
- {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
- SyncEventGuard guard2(pConn->mReadEvent);
- pConn->mReadEvent.notifyOne(); // unblock receive()
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DISC_EVT; notified read event", fn);
- }
- sP2p.mDisconnectMutex.unlock();
- }
- break;
+ "%s: NFA_P2P_REG_CLIENT_EVT; Conn Handle: 0x%04x, pClient: 0x%p",
+ fn, eventData->reg_client.client_handle, pClient.get());
- case NFA_P2P_DATA_EVT:
- // Look for the connection block
- if ((pConn = sP2p.findConnection(eventData->data.handle)) == NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn,
- eventData->data.handle);
- } else {
+ SyncEventGuard guard(pClient->mRegisteringEvent);
+ pClient->mNfaP2pClientHandle = eventData->reg_client.client_handle;
+ pClient->mRegisteringEvent.notifyOne();
+ }
+ break;
+
+ case NFA_P2P_ACTIVATED_EVT:
+ // Look for a client that is trying to register
+ if ((pClient = sP2p.findClient(eventData->activated.handle)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_ACTIVATED_EVT: can't find client", fn);
+ } else {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_ACTIVATED_EVT; Conn Handle: 0x%04x, pClient: 0x%p", fn,
+ eventData->activated.handle, pClient.get());
+ }
+ break;
+
+ case NFA_P2P_DEACTIVATED_EVT:
DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
- eventData->data.handle, eventData->data.remote_sap);
- SyncEventGuard guard(pConn->mReadEvent);
- pConn->mReadEvent.notifyOne();
- }
- break;
+ << StringPrintf("%s: NFA_P2P_DEACTIVATED_EVT: conn handle: 0x%X", fn,
+ eventData->deactivated.handle);
+ break;
- case NFA_P2P_CONGEST_EVT:
- // Look for the connection block
- if ((pConn = sP2p.findConnection(eventData->congest.handle)) == NULL) {
- LOG(ERROR) << StringPrintf(
- "%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x", fn,
- eventData->congest.handle);
- } else {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
- eventData->congest.handle, eventData->congest.is_congested);
+ case NFA_P2P_CONNECTED_EVT:
+ // Look for the client that is trying to connect
+ if ((pClient = sP2p.findClient(eventData->connected.client_handle)) ==
+ NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_CONNECTED_EVT: can't find client: 0x%04x", fn,
+ eventData->connected.client_handle);
+ } else {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_CONNECTED_EVT; client_handle=0x%04x "
+ "conn_handle: 0x%04x remote sap=0x%X pClient: 0x%p",
+ fn, eventData->connected.client_handle,
+ eventData->connected.conn_handle, eventData->connected.remote_sap,
+ pClient.get());
- SyncEventGuard guard(pConn->mCongEvent);
- pConn->mCongEvent.notifyOne();
- }
- break;
+ SyncEventGuard guard(pClient->mConnectingEvent);
+ pClient->mClientConn->mNfaConnHandle = eventData->connected.conn_handle;
+ pClient->mClientConn->mRemoteMaxInfoUnit =
+ eventData->connected.remote_miu;
+ pClient->mClientConn->mRemoteRecvWindow =
+ eventData->connected.remote_rw;
+ pClient->mConnectingEvent.notifyOne(); // unblock createDataLinkConn()
+ }
+ break;
- default:
- LOG(ERROR) << StringPrintf("%s: unknown event 0x%X ????", fn, p2pEvent);
- break;
+ case NFA_P2P_DISC_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DISC_EVT; h=0x%04x; reason=0x%X", fn,
+ eventData->disc.handle, eventData->disc.reason);
+ // Look for the connection block
+ if ((pConn = sP2p.findConnection(eventData->disc.handle)) == NULL) {
+ // If no connection, may be a client that is trying to connect
+ if ((pClient = sP2p.findClient(eventData->disc.handle)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT: can't find client for NFA handle: 0x%04x",
+ fn, eventData->disc.handle);
+ return;
+ }
+ // Unblock createDataLinkConn()
+ SyncEventGuard guard(pClient->mConnectingEvent);
+ pClient->mConnectingEvent.notifyOne();
+ } else {
+ sP2p.mDisconnectMutex.lock();
+ pConn->mNfaConnHandle = NFA_HANDLE_INVALID;
+ {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; try guard disconn event", fn);
+ SyncEventGuard guard3(pConn->mDisconnectingEvent);
+ pConn->mDisconnectingEvent.notifyOne();
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; notified disconn event", fn);
+ }
+ {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; try guard congest event", fn);
+ SyncEventGuard guard1(pConn->mCongEvent);
+ pConn->mCongEvent.notifyOne(); // unblock write (if congested)
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_DISC_EVT; notified congest event", fn);
+ }
+ {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DISC_EVT; try guard read event", fn);
+ SyncEventGuard guard2(pConn->mReadEvent);
+ pConn->mReadEvent.notifyOne(); // unblock receive()
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DISC_EVT; notified read event", fn);
+ }
+ sP2p.mDisconnectMutex.unlock();
+ }
+ break;
+
+ case NFA_P2P_DATA_EVT:
+ // Look for the connection block
+ if ((pConn = sP2p.findConnection(eventData->data.handle)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_DATA_EVT: can't find conn for NFA handle: 0x%04x", fn,
+ eventData->data.handle);
+ } else {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_P2P_DATA_EVT; h=0x%X; remote sap=0x%X", fn,
+ eventData->data.handle, eventData->data.remote_sap);
+ SyncEventGuard guard(pConn->mReadEvent);
+ pConn->mReadEvent.notifyOne();
+ }
+ break;
+
+ case NFA_P2P_CONGEST_EVT:
+ // Look for the connection block
+ if ((pConn = sP2p.findConnection(eventData->congest.handle)) == NULL) {
+ LOG(ERROR) << StringPrintf(
+ "%s: NFA_P2P_CONGEST_EVT: can't find conn for NFA handle: 0x%04x",
+ fn, eventData->congest.handle);
+ } else {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_P2P_CONGEST_EVT; nfa handle: 0x%04x congested: %u", fn,
+ eventData->congest.handle, eventData->congest.is_congested);
+
+ SyncEventGuard guard(pConn->mCongEvent);
+ pConn->mCongEvent.notifyOne();
+ }
+ break;
+
+ default:
+ LOG(ERROR) << StringPrintf("%s: unknown event 0x%X ????", fn, p2pEvent);
+ break;
}
}
@@ -1543,13 +1549,13 @@
**
*******************************************************************************/
void PeerToPeer::connectionEventHandler(uint8_t event,
- tNFA_CONN_EVT_DATA * /*eventData*/) {
+ tNFA_CONN_EVT_DATA* /*eventData*/) {
switch (event) {
- case NFA_SET_P2P_LISTEN_TECH_EVT: {
- SyncEventGuard guard(mSetTechEvent);
- mSetTechEvent.notifyOne(); // unblock NFA_SetP2pListenTech()
- break;
- }
+ case NFA_SET_P2P_LISTEN_TECH_EVT: {
+ SyncEventGuard guard(mSetTechEvent);
+ mSetTechEvent.notifyOne(); // unblock NFA_SetP2pListenTech()
+ break;
+ }
}
}
@@ -1583,7 +1589,7 @@
** Returns: None
**
*******************************************************************************/
-P2pServer::P2pServer(PeerToPeer::tJNI_HANDLE jniHandle, const char *serviceName)
+P2pServer::P2pServer(PeerToPeer::tJNI_HANDLE jniHandle, const char* serviceName)
: mNfaP2pServerHandle(NFA_HANDLE_INVALID), mJniHandle(jniHandle) {
mServiceName.assign(serviceName);
@@ -1613,10 +1619,10 @@
************************/
stat = NFA_P2pSetLLCPConfig(LLCP_MAX_MIU, LLCP_OPT_VALUE, LLCP_WAITING_TIME,
LLCP_LTO_VALUE,
- 0, // use 0 for infinite timeout for symmetry
- // procedure when acting as initiator
- 0, // use 0 for infinite timeout for symmetry
- // procedure when acting as target
+ 0, // use 0 for infinite timeout for symmetry
+ // procedure when acting as initiator
+ 0, // use 0 for infinite timeout for symmetry
+ // procedure when acting as target
LLCP_DELAY_RESP_TIME, LLCP_DATA_LINK_TIMEOUT,
LLCP_DELAY_TIME_TO_SEND_FIRST_PDU);
if (stat != NFA_STATUS_OK)
@@ -1624,12 +1630,12 @@
stat);
if (sSnepServiceName.compare(mServiceName) == 0)
- serverSap = 4; // LLCP_SAP_SNEP == 4
+ serverSap = 4; // LLCP_SAP_SNEP == 4
{
SyncEventGuard guard(mRegServerEvent);
stat = NFA_P2pRegisterServer(serverSap, NFA_P2P_DLINK_TYPE,
- const_cast<char *>(mServiceName.c_str()),
+ const_cast<char*>(mServiceName.c_str()),
PeerToPeer::nfaServerCallback);
if (stat != NFA_STATUS_OK) {
LOG(ERROR) << StringPrintf("%s: fail register p2p server; error=0x%X", fn,
@@ -1662,10 +1668,10 @@
// Wait for NFA_P2P_CONN_REQ_EVT or NFA_NDEF_DATA_EVT when remote device
// requests connection
SyncEventGuard guard(mConnRequestEvent);
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: serverJniHandle: %u; connJniHandle: %u; wait for "
- "incoming connection",
- fn, serverJniHandle, connJniHandle);
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: serverJniHandle: %u; connJniHandle: %u; wait for "
+ "incoming connection",
+ fn, serverJniHandle, connJniHandle);
mConnRequestEvent.wait();
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: serverJniHandle: %u; connJniHandle: %u; nfa conn h: 0x%X; got "
@@ -1713,11 +1719,12 @@
mServerConn[jj]->mNfaConnHandle = NFA_HANDLE_INVALID;
{
SyncEventGuard guard1(mServerConn[jj]->mCongEvent);
- mServerConn[jj]->mCongEvent.notifyOne(); // unblock write (if congested)
+ mServerConn[jj]
+ ->mCongEvent.notifyOne(); // unblock write (if congested)
}
{
SyncEventGuard guard2(mServerConn[jj]->mReadEvent);
- mServerConn[jj]->mReadEvent.notifyOne(); // unblock receive()
+ mServerConn[jj]->mReadEvent.notifyOne(); // unblock receive()
}
}
}
@@ -1850,5 +1857,9 @@
**
*******************************************************************************/
NfaConn::NfaConn()
- : mNfaConnHandle(NFA_HANDLE_INVALID), mJniHandle(0), mMaxInfoUnit(0),
- mRecvWindow(0), mRemoteMaxInfoUnit(0), mRemoteRecvWindow(0) {}
+ : mNfaConnHandle(NFA_HANDLE_INVALID),
+ mJniHandle(0),
+ mMaxInfoUnit(0),
+ mRecvWindow(0),
+ mRemoteMaxInfoUnit(0),
+ mRemoteRecvWindow(0) {}
diff --git a/nci/jni/PeerToPeer.h b/nci/jni/PeerToPeer.h
index 323bdc7..b9f0fc1 100644
--- a/nci/jni/PeerToPeer.h
+++ b/nci/jni/PeerToPeer.h
@@ -18,12 +18,12 @@
* Communicate with a peer using NFC-DEP, LLCP, SNEP.
*/
#pragma once
+#include <utils/RefBase.h>
+#include <utils/StrongPointer.h>
+#include <string>
#include "NfcJniUtil.h"
#include "SyncEvent.h"
#include "nfa_p2p_api.h"
-#include <string>
-#include <utils/RefBase.h>
-#include <utils/StrongPointer.h>
class P2pServer;
class P2pClient;
@@ -38,7 +38,7 @@
**
*****************************************************************************/
class PeerToPeer {
-public:
+ public:
typedef unsigned int tJNI_HANDLE;
/*******************************************************************************
@@ -72,7 +72,7 @@
** Returns: Singleton PeerToPeer object.
**
*******************************************************************************/
- static PeerToPeer &getInstance();
+ static PeerToPeer& getInstance();
/*******************************************************************************
**
@@ -96,8 +96,8 @@
** Returns: None
**
*******************************************************************************/
- void llcpActivatedHandler(nfc_jni_native_data *nativeData,
- tNFA_LLCP_ACTIVATED &activated);
+ void llcpActivatedHandler(nfc_jni_native_data* nativeData,
+ tNFA_LLCP_ACTIVATED& activated);
/*******************************************************************************
**
@@ -110,10 +110,10 @@
** Returns: None
**
*******************************************************************************/
- void llcpDeactivatedHandler(nfc_jni_native_data *nativeData,
- tNFA_LLCP_DEACTIVATED &deactivated);
+ void llcpDeactivatedHandler(nfc_jni_native_data* nativeData,
+ tNFA_LLCP_DEACTIVATED& deactivated);
- void llcpFirstPacketHandler(nfc_jni_native_data *nativeData);
+ void llcpFirstPacketHandler(nfc_jni_native_data* nativeData);
/*******************************************************************************
**
@@ -126,7 +126,7 @@
** Returns: None
**
*******************************************************************************/
- void connectionEventHandler(uint8_t event, tNFA_CONN_EVT_DATA *eventData);
+ void connectionEventHandler(uint8_t event, tNFA_CONN_EVT_DATA* eventData);
/*******************************************************************************
**
@@ -140,7 +140,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- bool registerServer(tJNI_HANDLE jniHandle, const char *serviceName);
+ bool registerServer(tJNI_HANDLE jniHandle, const char* serviceName);
/*******************************************************************************
**
@@ -194,7 +194,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- bool connectConnOriented(tJNI_HANDLE jniHandle, const char *serviceName);
+ bool connectConnOriented(tJNI_HANDLE jniHandle, const char* serviceName);
/*******************************************************************************
**
@@ -221,7 +221,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- bool send(tJNI_HANDLE jniHandle, uint8_t *buffer, uint16_t bufferLen);
+ bool send(tJNI_HANDLE jniHandle, uint8_t* buffer, uint16_t bufferLen);
/*******************************************************************************
**
@@ -236,8 +236,8 @@
** Returns: True if ok.
**
*******************************************************************************/
- bool receive(tJNI_HANDLE jniHandle, uint8_t *buffer, uint16_t bufferLen,
- uint16_t &actualLen);
+ bool receive(tJNI_HANDLE jniHandle, uint8_t* buffer, uint16_t bufferLen,
+ uint16_t& actualLen);
/*******************************************************************************
**
@@ -356,7 +356,7 @@
**
*******************************************************************************/
static void nfaServerCallback(tNFA_P2P_EVT p2pEvent,
- tNFA_P2P_EVT_DATA *eventData);
+ tNFA_P2P_EVT_DATA* eventData);
/*******************************************************************************
**
@@ -370,16 +370,16 @@
**
*******************************************************************************/
static void nfaClientCallback(tNFA_P2P_EVT p2pEvent,
- tNFA_P2P_EVT_DATA *eventData);
+ tNFA_P2P_EVT_DATA* eventData);
-private:
+ private:
static const int sMax = 10;
static PeerToPeer sP2p;
// Variables below only accessed from a single thread
- uint16_t mRemoteWKS; // Peer's well known services
- bool mIsP2pListening; // If P2P listening is enabled or not
- tNFA_TECHNOLOGY_MASK mP2pListenTechMask; // P2P Listen mask
+ uint16_t mRemoteWKS; // Peer's well known services
+ bool mIsP2pListening; // If P2P listening is enabled or not
+ tNFA_TECHNOLOGY_MASK mP2pListenTechMask; // P2P Listen mask
// Variable below is protected by mNewJniHandleMutex
tJNI_HANDLE mNextJniHandle;
@@ -392,13 +392,14 @@
android::sp<P2pClient> mClients[sMax];
// Synchronization variables
- SyncEvent mSetTechEvent; // completion event for NFA_SetP2pListenTech()
- SyncEvent mSnepDefaultServerStartStopEvent; // completion event for
- // NFA_SnepStartDefaultServer(),
- // NFA_SnepStopDefaultServer()
- SyncEvent mSnepRegisterEvent; // completion event for NFA_SnepRegisterClient()
- Mutex mDisconnectMutex; // synchronize the disconnect operation
- Mutex mNewJniHandleMutex; // synchronize the creation of a new JNI handle
+ SyncEvent mSetTechEvent; // completion event for NFA_SetP2pListenTech()
+ SyncEvent mSnepDefaultServerStartStopEvent; // completion event for
+ // NFA_SnepStartDefaultServer(),
+ // NFA_SnepStopDefaultServer()
+ SyncEvent
+ mSnepRegisterEvent; // completion event for NFA_SnepRegisterClient()
+ Mutex mDisconnectMutex; // synchronize the disconnect operation
+ Mutex mNewJniHandleMutex; // synchronize the creation of a new JNI handle
/*******************************************************************************
**
@@ -412,7 +413,7 @@
**
*******************************************************************************/
static void ndefTypeCallback(tNFA_NDEF_EVT event,
- tNFA_NDEF_EVT_DATA *evetnData);
+ tNFA_NDEF_EVT_DATA* evetnData);
/*******************************************************************************
**
@@ -448,7 +449,7 @@
** Returns: PeerToPeer object.
**
*******************************************************************************/
- android::sp<P2pServer> findServerLocked(const char *serviceName);
+ android::sp<P2pServer> findServerLocked(const char* serviceName);
/*******************************************************************************
**
@@ -486,7 +487,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- bool createDataLinkConn(tJNI_HANDLE jniHandle, const char *serviceName,
+ bool createDataLinkConn(tJNI_HANDLE jniHandle, const char* serviceName,
uint8_t destinationSap);
/*******************************************************************************
@@ -558,16 +559,16 @@
**
*****************************************************************************/
class NfaConn : public android::RefBase {
-public:
- tNFA_HANDLE mNfaConnHandle; // NFA handle of the P2P connection
- PeerToPeer::tJNI_HANDLE mJniHandle; // JNI handle of the P2P connection
+ public:
+ tNFA_HANDLE mNfaConnHandle; // NFA handle of the P2P connection
+ PeerToPeer::tJNI_HANDLE mJniHandle; // JNI handle of the P2P connection
uint16_t mMaxInfoUnit;
uint8_t mRecvWindow;
uint16_t mRemoteMaxInfoUnit;
uint8_t mRemoteRecvWindow;
- SyncEvent mReadEvent; // event for reading
- SyncEvent mCongEvent; // event for congestion
- SyncEvent mDisconnectingEvent; // event for disconnecting
+ SyncEvent mReadEvent; // event for reading
+ SyncEvent mCongEvent; // event for congestion
+ SyncEvent mDisconnectingEvent; // event for disconnecting
/*******************************************************************************
**
@@ -589,13 +590,13 @@
**
*****************************************************************************/
class P2pServer : public android::RefBase {
-public:
+ public:
static const std::string sSnepServiceName;
- tNFA_HANDLE mNfaP2pServerHandle; // NFA p2p handle of local server
- PeerToPeer::tJNI_HANDLE mJniHandle; // JNI Handle
- SyncEvent mRegServerEvent; // for NFA_P2pRegisterServer()
- SyncEvent mConnRequestEvent; // for accept()
+ tNFA_HANDLE mNfaP2pServerHandle; // NFA p2p handle of local server
+ PeerToPeer::tJNI_HANDLE mJniHandle; // JNI Handle
+ SyncEvent mRegServerEvent; // for NFA_P2pRegisterServer()
+ SyncEvent mConnRequestEvent; // for accept()
std::string mServiceName;
/*******************************************************************************
@@ -607,7 +608,7 @@
** Returns: None
**
*******************************************************************************/
- P2pServer(PeerToPeer::tJNI_HANDLE jniHandle, const char *serviceName);
+ P2pServer(PeerToPeer::tJNI_HANDLE jniHandle, const char* serviceName);
/*******************************************************************************
**
@@ -684,7 +685,7 @@
*******************************************************************************/
bool removeServerConnection(PeerToPeer::tJNI_HANDLE jniHandle);
-private:
+ private:
Mutex mMutex;
// mServerConn is protected by mMutex
android::sp<NfaConn> mServerConn[MAX_NFA_CONNS_PER_SERVER];
@@ -711,13 +712,13 @@
**
*****************************************************************************/
class P2pClient : public android::RefBase {
-public:
- tNFA_HANDLE mNfaP2pClientHandle; // NFA p2p handle of client
- bool mIsConnecting; // Set true while connecting
+ public:
+ tNFA_HANDLE mNfaP2pClientHandle; // NFA p2p handle of client
+ bool mIsConnecting; // Set true while connecting
android::sp<NfaConn> mClientConn;
- SyncEvent mRegisteringEvent; // For client registration
- SyncEvent mConnectingEvent; // for NFA_P2pConnectByName or Sap()
- SyncEvent mSnepEvent; // To wait for SNEP completion
+ SyncEvent mRegisteringEvent; // For client registration
+ SyncEvent mConnectingEvent; // for NFA_P2pConnectByName or Sap()
+ SyncEvent mSnepEvent; // To wait for SNEP completion
/*******************************************************************************
**
diff --git a/nci/jni/Pn544Interop.cpp b/nci/jni/Pn544Interop.cpp
index 8776b7d..68d5dab 100644
--- a/nci/jni/Pn544Interop.cpp
+++ b/nci/jni/Pn544Interop.cpp
@@ -37,13 +37,13 @@
*****************************************************************************/
static const int gIntervalTime =
- 1000; // millisecond between the check to restore polling
+ 1000; // millisecond between the check to restore polling
static IntervalTimer gTimer;
static Mutex gMutex;
static void pn544InteropStartPolling(
- union sigval); // callback function for interval timer
-static bool gIsBusy = false; // is timer busy?
-static bool gAbortNow = false; // stop timer during next callback
+ union sigval); // callback function for interval timer
+static bool gIsBusy = false; // is timer busy?
+static bool gAbortNow = false; // stop timer during next callback
/*******************************************************************************
**
@@ -63,7 +63,7 @@
gIsBusy = true;
gAbortNow = false;
gTimer.set(gIntervalTime,
- pn544InteropStartPolling); // after some time, start polling again
+ pn544InteropStartPolling); // after some time, start polling again
gMutex.unlock();
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: exit", __func__);
}
@@ -99,7 +99,7 @@
<< StringPrintf("%s: try again later", __func__);
gTimer.set(
gIntervalTime,
- pn544InteropStartPolling); // after some time, start polling again
+ pn544InteropStartPolling); // after some time, start polling again
}
TheEnd:
diff --git a/nci/jni/PowerSwitch.cpp b/nci/jni/PowerSwitch.cpp
index 4fb3ac9..95c188f 100644
--- a/nci/jni/PowerSwitch.cpp
+++ b/nci/jni/PowerSwitch.cpp
@@ -48,7 +48,8 @@
: mCurrLevel(UNKNOWN_LEVEL),
mCurrDeviceMgtPowerState(NFA_DM_PWR_STATE_UNKNOWN),
mExpectedDeviceMgtPowerState(NFA_DM_PWR_STATE_UNKNOWN),
- mDesiredScreenOffPowerState(0), mCurrActivity(0) {}
+ mDesiredScreenOffPowerState(0),
+ mCurrActivity(0) {}
/*******************************************************************************
**
@@ -70,7 +71,7 @@
** Returns: Reference to this object.
**
*******************************************************************************/
-PowerSwitch &PowerSwitch::getInstance() { return sPowerSwitch; }
+PowerSwitch& PowerSwitch::getInstance() { return sPowerSwitch; }
/*******************************************************************************
**
@@ -95,19 +96,19 @@
"%s: desired screen-off state=%d", fn, mDesiredScreenOffPowerState);
switch (level) {
- case FULL_POWER:
- mCurrDeviceMgtPowerState = NFA_DM_PWR_MODE_FULL;
- mCurrLevel = level;
- break;
+ case FULL_POWER:
+ mCurrDeviceMgtPowerState = NFA_DM_PWR_MODE_FULL;
+ mCurrLevel = level;
+ break;
- case UNKNOWN_LEVEL:
- mCurrDeviceMgtPowerState = NFA_DM_PWR_STATE_UNKNOWN;
- mCurrLevel = level;
- break;
+ case UNKNOWN_LEVEL:
+ mCurrDeviceMgtPowerState = NFA_DM_PWR_STATE_UNKNOWN;
+ mCurrLevel = level;
+ break;
- default:
- LOG(ERROR) << StringPrintf("%s: not handled", fn);
- break;
+ default:
+ LOG(ERROR) << StringPrintf("%s: not handled", fn);
+ break;
}
mMutex.unlock();
}
@@ -170,25 +171,26 @@
}
switch (newLevel) {
- case FULL_POWER:
- if (mCurrDeviceMgtPowerState == NFA_DM_PWR_MODE_OFF_SLEEP)
- retval = setPowerOffSleepState(false);
- break;
+ case FULL_POWER:
+ if (mCurrDeviceMgtPowerState == NFA_DM_PWR_MODE_OFF_SLEEP)
+ retval = setPowerOffSleepState(false);
+ break;
- case LOW_POWER:
- case POWER_OFF:
- if (isPowerOffSleepFeatureEnabled())
- retval = setPowerOffSleepState(true);
- else if (mDesiredScreenOffPowerState == 1) //.conf file desires full-power
- {
- mCurrLevel = FULL_POWER;
- retval = true;
- }
- break;
+ case LOW_POWER:
+ case POWER_OFF:
+ if (isPowerOffSleepFeatureEnabled())
+ retval = setPowerOffSleepState(true);
+ else if (mDesiredScreenOffPowerState ==
+ 1) //.conf file desires full-power
+ {
+ mCurrLevel = FULL_POWER;
+ retval = true;
+ }
+ break;
- default:
- LOG(ERROR) << StringPrintf("%s: not handled", fn);
- break;
+ default:
+ LOG(ERROR) << StringPrintf("%s: not handled", fn);
+ break;
}
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
@@ -272,14 +274,14 @@
tNFA_STATUS stat = NFA_STATUS_FAILED;
bool retval = false;
- if (sleep) // enter power-off-sleep state
+ if (sleep) // enter power-off-sleep state
{
// make sure the current power state is ON
if (mCurrDeviceMgtPowerState != NFA_DM_PWR_MODE_OFF_SLEEP) {
SyncEventGuard guard(mPowerStateEvent);
mExpectedDeviceMgtPowerState =
- NFA_DM_PWR_MODE_OFF_SLEEP; // if power adjustment is ok, then this is
- // the expected state
+ NFA_DM_PWR_MODE_OFF_SLEEP; // if power adjustment is ok, then this is
+ // the expected state
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: try power off", fn);
stat = NFA_PowerOffSleepMode(TRUE);
if (stat == NFA_STATUS_OK) {
@@ -296,15 +298,15 @@
mCurrDeviceMgtPowerState);
goto TheEnd;
}
- } else // exit power-off-sleep state
+ } else // exit power-off-sleep state
{
// make sure the current power state is OFF
if (mCurrDeviceMgtPowerState != NFA_DM_PWR_MODE_FULL) {
SyncEventGuard guard(mPowerStateEvent);
mCurrDeviceMgtPowerState = NFA_DM_PWR_STATE_UNKNOWN;
mExpectedDeviceMgtPowerState =
- NFA_DM_PWR_MODE_FULL; // if power adjustment is ok, then this is the
- // expected state
+ NFA_DM_PWR_MODE_FULL; // if power adjustment is ok, then this is the
+ // expected state
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: try full power", fn);
stat = NFA_PowerOffSleepMode(FALSE);
@@ -349,15 +351,15 @@
** Returns: Text representation of power level.
**
*******************************************************************************/
-const char *
-PowerSwitch::deviceMgtPowerStateToString(uint8_t deviceMgtPowerState) {
+const char* PowerSwitch::deviceMgtPowerStateToString(
+ uint8_t deviceMgtPowerState) {
switch (deviceMgtPowerState) {
- case NFA_DM_PWR_MODE_FULL:
- return "DM-FULL";
- case NFA_DM_PWR_MODE_OFF_SLEEP:
- return "DM-OFF";
- default:
- return "DM-unknown????";
+ case NFA_DM_PWR_MODE_FULL:
+ return "DM-FULL";
+ case NFA_DM_PWR_MODE_OFF_SLEEP:
+ return "DM-OFF";
+ default:
+ return "DM-unknown????";
}
}
@@ -371,18 +373,18 @@
** Returns: Text representation of power level.
**
*******************************************************************************/
-const char *PowerSwitch::powerLevelToString(PowerLevel level) {
+const char* PowerSwitch::powerLevelToString(PowerLevel level) {
switch (level) {
- case UNKNOWN_LEVEL:
- return "PS-UNKNOWN";
- case FULL_POWER:
- return "PS-FULL";
- case LOW_POWER:
- return "PS-LOW-POWER";
- case POWER_OFF:
- return "PS-POWER-OFF";
- default:
- return "PS-unknown????";
+ case UNKNOWN_LEVEL:
+ return "PS-UNKNOWN";
+ case FULL_POWER:
+ return "PS-FULL";
+ case LOW_POWER:
+ return "PS-LOW-POWER";
+ case POWER_OFF:
+ return "PS-POWER-OFF";
+ default:
+ return "PS-unknown????";
}
}
@@ -396,17 +398,17 @@
** Returns: Text representation of power level.
**
*******************************************************************************/
-const char *
-PowerSwitch::screenOffPowerStateToString(ScreenOffPowerState state) {
+const char* PowerSwitch::screenOffPowerStateToString(
+ ScreenOffPowerState state) {
switch (state) {
- case POWER_STATE_OFF:
- return "SOPS-POWER_OFF";
- case POWER_STATE_FULL:
- return "SOPS-FULL";
- case POWER_STATE_CARD_EMULATION:
- return "SOPS-CARD_EMULATION";
- default:
- return "SOPS-unknown????";
+ case POWER_STATE_OFF:
+ return "SOPS-POWER_OFF";
+ case POWER_STATE_FULL:
+ return "SOPS-FULL";
+ case POWER_STATE_CARD_EMULATION:
+ return "SOPS-CARD_EMULATION";
+ default:
+ return "SOPS-unknown????";
}
}
@@ -438,27 +440,27 @@
**
*******************************************************************************/
void PowerSwitch::deviceManagementCallback(uint8_t event,
- tNFA_DM_CBACK_DATA *eventData) {
+ tNFA_DM_CBACK_DATA* eventData) {
static const char fn[] = "PowerSwitch::deviceManagementCallback";
switch (event) {
- case NFA_DM_PWR_MODE_CHANGE_EVT: {
- tNFA_DM_PWR_MODE_CHANGE &power_mode = eventData->power_mode;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_DM_PWR_MODE_CHANGE_EVT; status=0x%X; device mgt power "
- "state=%s (0x%X)",
- fn, power_mode.status,
- sPowerSwitch.deviceMgtPowerStateToString(power_mode.power_mode),
- power_mode.power_mode);
- SyncEventGuard guard(sPowerSwitch.mPowerStateEvent);
- if (power_mode.status == NFA_STATUS_OK) {
- // the event data does not contain the newly configured power mode,
- // so this code assigns the expected value
- sPowerSwitch.mCurrDeviceMgtPowerState =
- sPowerSwitch.mExpectedDeviceMgtPowerState;
- }
- sPowerSwitch.mPowerStateEvent.notifyOne();
- } break;
+ case NFA_DM_PWR_MODE_CHANGE_EVT: {
+ tNFA_DM_PWR_MODE_CHANGE& power_mode = eventData->power_mode;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_DM_PWR_MODE_CHANGE_EVT; status=0x%X; device mgt power "
+ "state=%s (0x%X)",
+ fn, power_mode.status,
+ sPowerSwitch.deviceMgtPowerStateToString(power_mode.power_mode),
+ power_mode.power_mode);
+ SyncEventGuard guard(sPowerSwitch.mPowerStateEvent);
+ if (power_mode.status == NFA_STATUS_OK) {
+ // the event data does not contain the newly configured power mode,
+ // so this code assigns the expected value
+ sPowerSwitch.mCurrDeviceMgtPowerState =
+ sPowerSwitch.mExpectedDeviceMgtPowerState;
+ }
+ sPowerSwitch.mPowerStateEvent.notifyOne();
+ } break;
}
}
diff --git a/nci/jni/PowerSwitch.h b/nci/jni/PowerSwitch.h
index 11e18f5..b596cff 100644
--- a/nci/jni/PowerSwitch.h
+++ b/nci/jni/PowerSwitch.h
@@ -29,7 +29,7 @@
**
*****************************************************************************/
class PowerSwitch {
-public:
+ public:
/*******************************************************************************
**
** Description: UNKNOWN_LEVEL: power level is unknown because the stack is
@@ -124,7 +124,7 @@
** Returns: Reference to this object.
**
*******************************************************************************/
- static PowerSwitch &getInstance();
+ static PowerSwitch& getInstance();
/*******************************************************************************
**
@@ -217,7 +217,7 @@
**
*******************************************************************************/
static void deviceManagementCallback(uint8_t event,
- tNFA_DM_CBACK_DATA *eventData);
+ tNFA_DM_CBACK_DATA* eventData);
/*******************************************************************************
**
@@ -230,17 +230,17 @@
*******************************************************************************/
bool isPowerOffSleepFeatureEnabled();
-private:
+ private:
PowerLevel mCurrLevel;
- uint8_t mCurrDeviceMgtPowerState; // device management power state; such as
- // NFA_BRCM_PWR_MODE_???
- uint8_t mExpectedDeviceMgtPowerState; // device management power state; such
- // as NFA_BRCM_PWR_MODE_???
- int mDesiredScreenOffPowerState; // read from .conf file; 0=power-off-sleep;
- // 1=full power; 2=CE4 power
- static PowerSwitch sPowerSwitch; // singleton object
+ uint8_t mCurrDeviceMgtPowerState; // device management power state; such as
+ // NFA_BRCM_PWR_MODE_???
+ uint8_t mExpectedDeviceMgtPowerState; // device management power state; such
+ // as NFA_BRCM_PWR_MODE_???
+ int mDesiredScreenOffPowerState; // read from .conf file; 0=power-off-sleep;
+ // 1=full power; 2=CE4 power
+ static PowerSwitch sPowerSwitch; // singleton object
static const uint8_t NFA_DM_PWR_STATE_UNKNOWN =
- -1; // device management power state power state is unknown
+ -1; // device management power state power state is unknown
SyncEvent mPowerStateEvent;
PowerActivity mCurrActivity;
Mutex mMutex;
@@ -267,7 +267,7 @@
** Returns: Text representation of power level.
**
*******************************************************************************/
- const char *deviceMgtPowerStateToString(uint8_t deviceMgtPowerState);
+ const char* deviceMgtPowerStateToString(uint8_t deviceMgtPowerState);
/*******************************************************************************
**
@@ -279,7 +279,7 @@
** Returns: Text representation of power level.
**
*******************************************************************************/
- const char *powerLevelToString(PowerLevel level);
+ const char* powerLevelToString(PowerLevel level);
/*******************************************************************************
**
@@ -291,5 +291,5 @@
** Returns: Text representation of screen-off power state.
**
*******************************************************************************/
- const char *screenOffPowerStateToString(ScreenOffPowerState state);
+ const char* screenOffPowerStateToString(ScreenOffPowerState state);
};
diff --git a/nci/jni/RouteDataSet.cpp b/nci/jni/RouteDataSet.cpp
index f98b267..9a81202 100644
--- a/nci/jni/RouteDataSet.cpp
+++ b/nci/jni/RouteDataSet.cpp
@@ -18,11 +18,11 @@
* Import and export general routing data using a XML file.
*/
#include "RouteDataSet.h"
-#include "_OverrideLog.h"
-#include "libxml/xmlmemory.h"
#include <base/logging.h>
#include <errno.h>
#include <sys/stat.h>
+#include "_OverrideLog.h"
+#include "libxml/xmlmemory.h"
extern char bcm_nfc_location[];
@@ -37,7 +37,7 @@
** Returns: None.
**
*******************************************************************************/
-AidBuffer::AidBuffer(std::string &aid) : mBuffer(NULL), mBufferLen(0) {
+AidBuffer::AidBuffer(std::string& aid) : mBuffer(NULL), mBufferLen(0) {
unsigned int num = 0;
const char delimiter = ':';
std::string::size_type pos1 = 0;
@@ -76,7 +76,7 @@
/*******************************************************************************/
/*******************************************************************************/
-const char *RouteDataSet::sConfigFile = "/param/route.xml";
+const char* RouteDataSet::sConfigFile = "/param/route.xml";
/*******************************************************************************
**
@@ -171,43 +171,42 @@
<< StringPrintf("%s: root=%s", fn, node1->name);
node1 = node1->xmlChildrenNode;
- while (node1) // loop through all elements in <Routes ...
+ while (node1) // loop through all elements in <Routes ...
{
- if (xmlStrcmp(node1->name, (const xmlChar *)"Route") == 0) {
- xmlChar *value = xmlGetProp(node1, (const xmlChar *)"Type");
+ if (xmlStrcmp(node1->name, (const xmlChar*)"Route") == 0) {
+ xmlChar* value = xmlGetProp(node1, (const xmlChar*)"Type");
if (value &&
- (xmlStrcmp(value, (const xmlChar *)"SecElemSelectedRoutes") == 0)) {
+ (xmlStrcmp(value, (const xmlChar*)"SecElemSelectedRoutes") == 0)) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: found SecElemSelectedRoutes", fn);
xmlNodePtr node2 = node1->xmlChildrenNode;
- while (node2) // loop all elements in <Route
- // Type="SecElemSelectedRoutes" ...
+ while (node2) // loop all elements in <Route
+ // Type="SecElemSelectedRoutes" ...
{
- if (xmlStrcmp(node2->name, (const xmlChar *)"Proto") == 0)
+ if (xmlStrcmp(node2->name, (const xmlChar*)"Proto") == 0)
importProtocolRoute(node2, mSecElemRouteDatabase);
- else if (xmlStrcmp(node2->name, (const xmlChar *)"Tech") == 0)
+ else if (xmlStrcmp(node2->name, (const xmlChar*)"Tech") == 0)
importTechnologyRoute(node2, mSecElemRouteDatabase);
node2 = node2->next;
- } // loop all elements in <Route Type="SecElemSelectedRoutes" ...
+ } // loop all elements in <Route Type="SecElemSelectedRoutes" ...
} else if (value &&
- (xmlStrcmp(value, (const xmlChar *)"DefaultRoutes") == 0)) {
+ (xmlStrcmp(value, (const xmlChar*)"DefaultRoutes") == 0)) {
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: found DefaultRoutes", fn);
xmlNodePtr node2 = node1->xmlChildrenNode;
- while (node2) // loop all elements in <Route Type="DefaultRoutes" ...
+ while (node2) // loop all elements in <Route Type="DefaultRoutes" ...
{
- if (xmlStrcmp(node2->name, (const xmlChar *)"Proto") == 0)
+ if (xmlStrcmp(node2->name, (const xmlChar*)"Proto") == 0)
importProtocolRoute(node2, mDefaultRouteDatabase);
- else if (xmlStrcmp(node2->name, (const xmlChar *)"Tech") == 0)
+ else if (xmlStrcmp(node2->name, (const xmlChar*)"Tech") == 0)
importTechnologyRoute(node2, mDefaultRouteDatabase);
node2 = node2->next;
- } // loop all elements in <Route Type="DefaultRoutes" ...
+ } // loop all elements in <Route Type="DefaultRoutes" ...
}
- if (value)
- xmlFree(value);
- } // check <Route ...
+ if (value) xmlFree(value);
+ } // check <Route ...
node1 = node1->next;
- } // loop through all elements in <Routes ...
+ } // loop through all elements in <Routes ...
retval = true;
TheEnd:
@@ -228,9 +227,9 @@
** Returns: True if ok.
**
*******************************************************************************/
-bool RouteDataSet::saveToFile(const char *routesXml) {
+bool RouteDataSet::saveToFile(const char* routesXml) {
static const char fn[] = "RouteDataSet::saveToFile";
- FILE *fh = NULL;
+ FILE* fh = NULL;
size_t actualWritten = 0;
bool retval = false;
std::string filename(bcm_nfc_location);
@@ -248,14 +247,12 @@
fclose(fh);
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: wrote %zu bytes", fn, actualWritten);
- if (retval == false)
- LOG(ERROR) << StringPrintf("%s: error during write", fn);
+ if (retval == false) LOG(ERROR) << StringPrintf("%s: error during write", fn);
// set file permission to
// owner read, write; group read; other read
stat = chmod(filename.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
- if (stat == -1)
- LOG(ERROR) << StringPrintf("%s: error during chmod", fn);
+ if (stat == -1) LOG(ERROR) << StringPrintf("%s: error during chmod", fn);
return retval;
}
@@ -269,8 +266,8 @@
** Returns: True if ok.
**
*******************************************************************************/
-bool RouteDataSet::loadFromFile(std::string &routesXml) {
- FILE *fh = NULL;
+bool RouteDataSet::loadFromFile(std::string& routesXml) {
+ FILE* fh = NULL;
size_t actual = 0;
char buffer[1024];
std::string filename(bcm_nfc_location);
@@ -285,8 +282,7 @@
while (true) {
actual = fread(buffer, sizeof(char), sizeof(buffer), fh);
- if (actual == 0)
- break;
+ if (actual == 0) break;
routesXml.append(buffer, actual);
}
fclose(fh);
@@ -306,28 +302,28 @@
** Returns: None.
**
*******************************************************************************/
-void RouteDataSet::importProtocolRoute(xmlNodePtr &element,
- Database &database) {
- const xmlChar *id = (const xmlChar *)"Id";
- const xmlChar *secElem = (const xmlChar *)"SecElem";
- const xmlChar *trueString = (const xmlChar *)"true";
- const xmlChar *switchOn = (const xmlChar *)"SwitchOn";
- const xmlChar *switchOff = (const xmlChar *)"SwitchOff";
- const xmlChar *batteryOff = (const xmlChar *)"BatteryOff";
- RouteDataForProtocol *data = new RouteDataForProtocol;
- xmlChar *value = NULL;
+void RouteDataSet::importProtocolRoute(xmlNodePtr& element,
+ Database& database) {
+ const xmlChar* id = (const xmlChar*)"Id";
+ const xmlChar* secElem = (const xmlChar*)"SecElem";
+ const xmlChar* trueString = (const xmlChar*)"true";
+ const xmlChar* switchOn = (const xmlChar*)"SwitchOn";
+ const xmlChar* switchOff = (const xmlChar*)"SwitchOff";
+ const xmlChar* batteryOff = (const xmlChar*)"BatteryOff";
+ RouteDataForProtocol* data = new RouteDataForProtocol;
+ xmlChar* value = NULL;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: element=%s", "RouteDataSet::importProtocolRoute", element->name);
value = xmlGetProp(element, id);
if (value) {
- if (xmlStrcmp(value, (const xmlChar *)"T1T") == 0)
+ if (xmlStrcmp(value, (const xmlChar*)"T1T") == 0)
data->mProtocol = NFA_PROTOCOL_MASK_T1T;
- else if (xmlStrcmp(value, (const xmlChar *)"T2T") == 0)
+ else if (xmlStrcmp(value, (const xmlChar*)"T2T") == 0)
data->mProtocol = NFA_PROTOCOL_MASK_T2T;
- else if (xmlStrcmp(value, (const xmlChar *)"T3T") == 0)
+ else if (xmlStrcmp(value, (const xmlChar*)"T3T") == 0)
data->mProtocol = NFA_PROTOCOL_MASK_T3T;
- else if (xmlStrcmp(value, (const xmlChar *)"IsoDep") == 0)
+ else if (xmlStrcmp(value, (const xmlChar*)"IsoDep") == 0)
data->mProtocol = NFA_PROTOCOL_MASK_ISO_DEP;
xmlFree(value);
DLOG_IF(INFO, nfc_debug_enabled)
@@ -337,7 +333,7 @@
value = xmlGetProp(element, secElem);
if (value) {
- data->mNfaEeHandle = strtol((char *)value, NULL, 16);
+ data->mNfaEeHandle = strtol((char*)value, NULL, 16);
xmlFree(value);
data->mNfaEeHandle = data->mNfaEeHandle | NFA_HANDLE_GROUP_EE;
DLOG_IF(INFO, nfc_debug_enabled)
@@ -376,26 +372,26 @@
** Returns: None.
**
*******************************************************************************/
-void RouteDataSet::importTechnologyRoute(xmlNodePtr &element,
- Database &database) {
- const xmlChar *id = (const xmlChar *)"Id";
- const xmlChar *secElem = (const xmlChar *)"SecElem";
- const xmlChar *trueString = (const xmlChar *)"true";
- const xmlChar *switchOn = (const xmlChar *)"SwitchOn";
- const xmlChar *switchOff = (const xmlChar *)"SwitchOff";
- const xmlChar *batteryOff = (const xmlChar *)"BatteryOff";
- RouteDataForTechnology *data = new RouteDataForTechnology;
- xmlChar *value = NULL;
+void RouteDataSet::importTechnologyRoute(xmlNodePtr& element,
+ Database& database) {
+ const xmlChar* id = (const xmlChar*)"Id";
+ const xmlChar* secElem = (const xmlChar*)"SecElem";
+ const xmlChar* trueString = (const xmlChar*)"true";
+ const xmlChar* switchOn = (const xmlChar*)"SwitchOn";
+ const xmlChar* switchOff = (const xmlChar*)"SwitchOff";
+ const xmlChar* batteryOff = (const xmlChar*)"BatteryOff";
+ RouteDataForTechnology* data = new RouteDataForTechnology;
+ xmlChar* value = NULL;
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
"%s: element=%s", "RouteDataSet::importTechnologyRoute", element->name);
value = xmlGetProp(element, id);
if (value) {
- if (xmlStrcmp(value, (const xmlChar *)"NfcA") == 0)
+ if (xmlStrcmp(value, (const xmlChar*)"NfcA") == 0)
data->mTechnology = NFA_TECHNOLOGY_MASK_A;
- else if (xmlStrcmp(value, (const xmlChar *)"NfcB") == 0)
+ else if (xmlStrcmp(value, (const xmlChar*)"NfcB") == 0)
data->mTechnology = NFA_TECHNOLOGY_MASK_B;
- else if (xmlStrcmp(value, (const xmlChar *)"NfcF") == 0)
+ else if (xmlStrcmp(value, (const xmlChar*)"NfcF") == 0)
data->mTechnology = NFA_TECHNOLOGY_MASK_F;
xmlFree(value);
DLOG_IF(INFO, nfc_debug_enabled)
@@ -405,7 +401,7 @@
value = xmlGetProp(element, secElem);
if (value) {
- data->mNfaEeHandle = strtol((char *)value, NULL, 16);
+ data->mNfaEeHandle = strtol((char*)value, NULL, 16);
xmlFree(value);
data->mNfaEeHandle = data->mNfaEeHandle | NFA_HANDLE_GROUP_EE;
DLOG_IF(INFO, nfc_debug_enabled)
@@ -462,12 +458,12 @@
** Returns: Pointer to database.
**
*******************************************************************************/
-RouteDataSet::Database *RouteDataSet::getDatabase(DatabaseSelection selection) {
+RouteDataSet::Database* RouteDataSet::getDatabase(DatabaseSelection selection) {
switch (selection) {
- case DefaultRouteDatabase:
- return &mDefaultRouteDatabase;
- case SecElemRouteDatabase:
- return &mSecElemRouteDatabase;
+ case DefaultRouteDatabase:
+ return &mDefaultRouteDatabase;
+ case SecElemRouteDatabase:
+ return &mSecElemRouteDatabase;
}
return NULL;
}
@@ -483,25 +479,25 @@
*******************************************************************************/
void RouteDataSet::printDiagnostic() {
static const char fn[] = "RouteDataSet::printDiagnostic";
- Database *db = getDatabase(DefaultRouteDatabase);
+ Database* db = getDatabase(DefaultRouteDatabase);
DLOG_IF(INFO, nfc_debug_enabled)
<< StringPrintf("%s: default route database", fn);
for (Database::iterator iter = db->begin(); iter != db->end(); iter++) {
- RouteData *routeData = *iter;
+ RouteData* routeData = *iter;
switch (routeData->mRouteType) {
- case RouteData::ProtocolRoute: {
- RouteDataForProtocol *proto = (RouteDataForProtocol *)routeData;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: ee h=0x%X; protocol=0x%X", fn,
- proto->mNfaEeHandle, proto->mProtocol);
- } break;
- case RouteData::TechnologyRoute: {
- RouteDataForTechnology *tech = (RouteDataForTechnology *)routeData;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: ee h=0x%X; technology=0x%X", fn,
- tech->mNfaEeHandle, tech->mTechnology);
- } break;
+ case RouteData::ProtocolRoute: {
+ RouteDataForProtocol* proto = (RouteDataForProtocol*)routeData;
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: ee h=0x%X; protocol=0x%X", fn,
+ proto->mNfaEeHandle, proto->mProtocol);
+ } break;
+ case RouteData::TechnologyRoute: {
+ RouteDataForTechnology* tech = (RouteDataForTechnology*)routeData;
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: ee h=0x%X; technology=0x%X", fn,
+ tech->mNfaEeHandle, tech->mTechnology);
+ } break;
}
}
@@ -509,20 +505,20 @@
<< StringPrintf("%s: sec elem route database", fn);
db = getDatabase(SecElemRouteDatabase);
for (Database::iterator iter2 = db->begin(); iter2 != db->end(); iter2++) {
- RouteData *routeData = *iter2;
+ RouteData* routeData = *iter2;
switch (routeData->mRouteType) {
- case RouteData::ProtocolRoute: {
- RouteDataForProtocol *proto = (RouteDataForProtocol *)routeData;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: ee h=0x%X; protocol=0x%X", fn,
- proto->mNfaEeHandle, proto->mProtocol);
- } break;
- case RouteData::TechnologyRoute: {
- RouteDataForTechnology *tech = (RouteDataForTechnology *)routeData;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: ee h=0x%X; technology=0x%X", fn,
- tech->mNfaEeHandle, tech->mTechnology);
- } break;
+ case RouteData::ProtocolRoute: {
+ RouteDataForProtocol* proto = (RouteDataForProtocol*)routeData;
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: ee h=0x%X; protocol=0x%X", fn,
+ proto->mNfaEeHandle, proto->mProtocol);
+ } break;
+ case RouteData::TechnologyRoute: {
+ RouteDataForTechnology* tech = (RouteDataForTechnology*)routeData;
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: ee h=0x%X; technology=0x%X", fn,
+ tech->mNfaEeHandle, tech->mTechnology);
+ } break;
}
}
}
diff --git a/nci/jni/RouteDataSet.h b/nci/jni/RouteDataSet.h
index c0e9d2b..057de66 100644
--- a/nci/jni/RouteDataSet.h
+++ b/nci/jni/RouteDataSet.h
@@ -33,11 +33,11 @@
**
*****************************************************************************/
class RouteData {
-public:
+ public:
enum RouteType { ProtocolRoute, TechnologyRoute };
RouteType mRouteType;
-protected:
+ protected:
RouteData(RouteType routeType) : mRouteType(routeType) {}
};
@@ -49,16 +49,20 @@
**
*****************************************************************************/
class RouteDataForProtocol : public RouteData {
-public:
- int mNfaEeHandle; // for example 0x4f3, 0x4f4
+ public:
+ int mNfaEeHandle; // for example 0x4f3, 0x4f4
bool mSwitchOn;
bool mSwitchOff;
bool mBatteryOff;
tNFA_PROTOCOL_MASK mProtocol;
RouteDataForProtocol()
- : RouteData(ProtocolRoute), mNfaEeHandle(NFA_HANDLE_INVALID),
- mSwitchOn(false), mSwitchOff(false), mBatteryOff(false), mProtocol(0) {}
+ : RouteData(ProtocolRoute),
+ mNfaEeHandle(NFA_HANDLE_INVALID),
+ mSwitchOn(false),
+ mSwitchOff(false),
+ mBatteryOff(false),
+ mProtocol(0) {}
};
/*****************************************************************************
@@ -69,16 +73,19 @@
**
*****************************************************************************/
class RouteDataForTechnology : public RouteData {
-public:
- int mNfaEeHandle; // for example 0x4f3, 0x4f4
+ public:
+ int mNfaEeHandle; // for example 0x4f3, 0x4f4
bool mSwitchOn;
bool mSwitchOff;
bool mBatteryOff;
tNFA_TECHNOLOGY_MASK mTechnology;
RouteDataForTechnology()
- : RouteData(TechnologyRoute), mNfaEeHandle(NFA_HANDLE_INVALID),
- mSwitchOn(false), mSwitchOff(false), mBatteryOff(false),
+ : RouteData(TechnologyRoute),
+ mNfaEeHandle(NFA_HANDLE_INVALID),
+ mSwitchOn(false),
+ mSwitchOff(false),
+ mBatteryOff(false),
mTechnology(0) {}
};
@@ -94,7 +101,7 @@
**
*****************************************************************************/
class AidBuffer {
-public:
+ public:
/*******************************************************************************
**
** Function: AidBuffer
@@ -107,7 +114,7 @@
** Returns: None.
**
*******************************************************************************/
- AidBuffer(std::string &aid);
+ AidBuffer(std::string& aid);
/*******************************************************************************
**
@@ -120,11 +127,11 @@
*******************************************************************************/
~AidBuffer();
- uint8_t *buffer() { return mBuffer; };
+ uint8_t* buffer() { return mBuffer; };
int length() { return mBufferLen; };
-private:
- uint8_t *mBuffer;
+ private:
+ uint8_t* mBuffer;
uint32_t mBufferLen;
};
@@ -140,8 +147,8 @@
**
*****************************************************************************/
class RouteDataSet {
-public:
- typedef std::vector<RouteData *> Database;
+ public:
+ typedef std::vector<RouteData*> Database;
enum DatabaseSelection { DefaultRouteDatabase, SecElemRouteDatabase };
/*******************************************************************************
@@ -187,7 +194,7 @@
** Returns: Pointer to database.
**
*******************************************************************************/
- Database *getDatabase(DatabaseSelection selection);
+ Database* getDatabase(DatabaseSelection selection);
/*******************************************************************************
**
@@ -199,7 +206,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- static bool saveToFile(const char *routesXml);
+ static bool saveToFile(const char* routesXml);
/*******************************************************************************
**
@@ -211,7 +218,7 @@
** Returns: True if ok.
**
*******************************************************************************/
- static bool loadFromFile(std::string &routesXml);
+ static bool loadFromFile(std::string& routesXml);
/*******************************************************************************
**
@@ -235,10 +242,10 @@
*******************************************************************************/
void printDiagnostic();
-private:
- Database mSecElemRouteDatabase; // routes when NFC service selects sec elem
- Database mDefaultRouteDatabase; // routes when NFC service deselects sec elem
- static const char *sConfigFile;
+ private:
+ Database mSecElemRouteDatabase; // routes when NFC service selects sec elem
+ Database mDefaultRouteDatabase; // routes when NFC service deselects sec elem
+ static const char* sConfigFile;
static const bool sDebug = false;
/*******************************************************************************
@@ -263,7 +270,7 @@
** Returns: None.
**
*******************************************************************************/
- void importProtocolRoute(xmlNodePtr &element, Database &database);
+ void importProtocolRoute(xmlNodePtr& element, Database& database);
/*******************************************************************************
**
@@ -276,5 +283,5 @@
** Returns: None.
**
*******************************************************************************/
- void importTechnologyRoute(xmlNodePtr &element, Database &database);
+ void importTechnologyRoute(xmlNodePtr& element, Database& database);
};
diff --git a/nci/jni/RoutingManager.cpp b/nci/jni/RoutingManager.cpp
index a92ca83..7d6e8e4 100644
--- a/nci/jni/RoutingManager.cpp
+++ b/nci/jni/RoutingManager.cpp
@@ -19,27 +19,27 @@
*/
#include "RoutingManager.h"
+#include <base/logging.h>
+#include <nativehelper/JNIHelp.h>
+#include <nativehelper/ScopedLocalRef.h>
#include "JavaClassConstants.h"
#include "_OverrideLog.h"
#include "config.h"
#include "nfa_ce_api.h"
#include "nfa_ee_api.h"
-#include <base/logging.h>
-#include <nativehelper/JNIHelp.h>
-#include <nativehelper/ScopedLocalRef.h>
extern bool gActivated;
extern SyncEvent gDeactivatedEvent;
const JNINativeMethod RoutingManager::sMethods[] = {
{"doGetDefaultRouteDestination", "()I",
- (void *)RoutingManager::
+ (void*)RoutingManager::
com_android_nfc_cardemulation_doGetDefaultRouteDestination},
{"doGetDefaultOffHostRouteDestination", "()I",
- (void *)RoutingManager::
+ (void*)RoutingManager::
com_android_nfc_cardemulation_doGetDefaultOffHostRouteDestination},
{"doGetAidMatchingMode", "()I",
- (void *)
+ (void*)
RoutingManager::com_android_nfc_cardemulation_doGetAidMatchingMode}};
static const int MAX_NUM_EE = 5;
@@ -102,7 +102,7 @@
RoutingManager::~RoutingManager() { NFA_EeDeregister(nfaEeCallback); }
-bool RoutingManager::initialize(nfc_jni_native_data *native) {
+bool RoutingManager::initialize(nfc_jni_native_data* native) {
static const char fn[] = "RoutingManager::initialize()";
mNativeData = native;
@@ -140,13 +140,13 @@
tNFA_HANDLE eeHandle = mEeInfo.ee_disc_info[i].ee_handle;
tNFA_TECHNOLOGY_MASK seTechMask = 0;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s EE[%u] Handle: 0x%04x techA: 0x%02x techB: "
- "0x%02x techF: 0x%02x techBprime: 0x%02x",
- fn, i, eeHandle, mEeInfo.ee_disc_info[i].la_protocol,
- mEeInfo.ee_disc_info[i].lb_protocol,
- mEeInfo.ee_disc_info[i].lf_protocol,
- mEeInfo.ee_disc_info[i].lbp_protocol);
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s EE[%u] Handle: 0x%04x techA: 0x%02x techB: "
+ "0x%02x techF: 0x%02x techBprime: 0x%02x",
+ fn, i, eeHandle, mEeInfo.ee_disc_info[i].la_protocol,
+ mEeInfo.ee_disc_info[i].lb_protocol,
+ mEeInfo.ee_disc_info[i].lf_protocol,
+ mEeInfo.ee_disc_info[i].lbp_protocol);
if ((mActiveSe != 0) && (eeHandle == (mActiveSe | NFA_HANDLE_GROUP_EE))) {
if (mEeInfo.ee_disc_info[i].la_protocol != 0)
seTechMask |= NFA_TECHNOLOGY_MASK_A;
@@ -193,7 +193,7 @@
return true;
}
-RoutingManager &RoutingManager::getInstance() {
+RoutingManager& RoutingManager::getInstance() {
static RoutingManager manager;
return manager;
}
@@ -326,12 +326,12 @@
}
}
-bool RoutingManager::addAidRouting(const uint8_t *aid, uint8_t aidLen,
+bool RoutingManager::addAidRouting(const uint8_t* aid, uint8_t aidLen,
int route, int aidInfo) {
static const char fn[] = "RoutingManager::addAidRouting";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
tNFA_STATUS nfaStat =
- NFA_EeAddAidRouting(route, aidLen, (uint8_t *)aid, 0x01, aidInfo);
+ NFA_EeAddAidRouting(route, aidLen, (uint8_t*)aid, 0x01, aidInfo);
if (nfaStat == NFA_STATUS_OK) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: routed AID", fn);
return true;
@@ -341,10 +341,10 @@
}
}
-bool RoutingManager::removeAidRouting(const uint8_t *aid, uint8_t aidLen) {
+bool RoutingManager::removeAidRouting(const uint8_t* aid, uint8_t aidLen) {
static const char fn[] = "RoutingManager::removeAidRouting";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: enter", fn);
- tNFA_STATUS nfaStat = NFA_EeRemoveAidRouting(aidLen, (uint8_t *)aid);
+ tNFA_STATUS nfaStat = NFA_EeRemoveAidRouting(aidLen, (uint8_t*)aid);
if (nfaStat == NFA_STATUS_OK) {
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: removed AID", fn);
return true;
@@ -362,7 +362,7 @@
SyncEventGuard guard(mEeUpdateEvent);
nfaStat = NFA_EeUpdateNow();
if (nfaStat == NFA_STATUS_OK) {
- mEeUpdateEvent.wait(); // wait for NFA_EE_UPDATED_EVT
+ mEeUpdateEvent.wait(); // wait for NFA_EE_UPDATED_EVT
}
}
return (nfaStat == NFA_STATUS_OK);
@@ -370,8 +370,7 @@
void RoutingManager::onNfccShutdown() {
static const char fn[] = "RoutingManager:onNfccShutdown";
- if (mActiveSe == 0x00)
- return;
+ if (mActiveSe == 0x00) return;
tNFA_STATUS nfaStat = NFA_STATUS_FAILED;
uint8_t actualNumEe = MAX_NUM_EE;
@@ -393,7 +392,7 @@
SyncEventGuard guard(mEeSetModeEvent);
if ((nfaStat = NFA_EeModeSet(eeInfo[xx].ee_handle,
NFA_EE_MD_DEACTIVATE)) == NFA_STATUS_OK) {
- mEeSetModeEvent.wait(); // wait for NFA_EE_MODE_SET_EVT
+ mEeSetModeEvent.wait(); // wait for NFA_EE_MODE_SET_EVT
} else {
LOG(ERROR) << StringPrintf("Failed to set EE inactive");
}
@@ -406,7 +405,7 @@
}
void RoutingManager::notifyActivated(uint8_t technology) {
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
ScopedAttach attach(mNativeData->vm, &e);
if (e == NULL) {
LOG(ERROR) << StringPrintf("jni env is null");
@@ -424,7 +423,7 @@
void RoutingManager::notifyDeactivated(uint8_t technology) {
mRxDataBuffer.clear();
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
ScopedAttach attach(mNativeData->vm, &e);
if (e == NULL) {
LOG(ERROR) << StringPrintf("jni env is null");
@@ -440,18 +439,18 @@
}
}
-void RoutingManager::handleData(uint8_t technology, const uint8_t *data,
+void RoutingManager::handleData(uint8_t technology, const uint8_t* data,
uint32_t dataLen, tNFA_STATUS status) {
if (status == NFC_STATUS_CONTINUE) {
if (dataLen > 0) {
mRxDataBuffer.insert(mRxDataBuffer.end(), &data[0],
- &data[dataLen]); // append data; more to come
+ &data[dataLen]); // append data; more to come
}
- return; // expect another NFA_CE_DATA_EVT to come
+ return; // expect another NFA_CE_DATA_EVT to come
} else if (status == NFA_STATUS_OK) {
if (dataLen > 0) {
mRxDataBuffer.insert(mRxDataBuffer.end(), &data[0],
- &data[dataLen]); // append data
+ &data[dataLen]); // append data
}
// entire data packet has been received; no more NFA_CE_DATA_EVT
} else if (status == NFA_STATUS_FAILED) {
@@ -460,7 +459,7 @@
}
{
- JNIEnv *e = NULL;
+ JNIEnv* e = NULL;
ScopedAttach attach(mNativeData->vm, &e);
if (e == NULL) {
LOG(ERROR) << StringPrintf("jni env is null");
@@ -475,7 +474,7 @@
}
e->SetByteArrayRegion((jbyteArray)dataJavaArray.get(), 0,
- mRxDataBuffer.size(), (jbyte *)(&mRxDataBuffer[0]));
+ mRxDataBuffer.size(), (jbyte*)(&mRxDataBuffer[0]));
if (e->ExceptionCheck()) {
e->ExceptionClear();
LOG(ERROR) << StringPrintf("fail fill array");
@@ -495,47 +494,47 @@
}
void RoutingManager::stackCallback(uint8_t event,
- tNFA_CONN_EVT_DATA *eventData) {
+ tNFA_CONN_EVT_DATA* eventData) {
static const char fn[] = "RoutingManager::stackCallback";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: event=0x%X", fn, event);
- RoutingManager &routingManager = RoutingManager::getInstance();
+ RoutingManager& routingManager = RoutingManager::getInstance();
switch (event) {
- case NFA_CE_REGISTERED_EVT: {
- tNFA_CE_REGISTERED &ce_registered = eventData->ce_registered;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_CE_REGISTERED_EVT; status=0x%X; h=0x%X", fn,
- ce_registered.status, ce_registered.handle);
- } break;
+ case NFA_CE_REGISTERED_EVT: {
+ tNFA_CE_REGISTERED& ce_registered = eventData->ce_registered;
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_CE_REGISTERED_EVT; status=0x%X; h=0x%X", fn,
+ ce_registered.status, ce_registered.handle);
+ } break;
- case NFA_CE_DEREGISTERED_EVT: {
- tNFA_CE_DEREGISTERED &ce_deregistered = eventData->ce_deregistered;
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_CE_DEREGISTERED_EVT; h=0x%X", fn, ce_deregistered.handle);
- } break;
+ case NFA_CE_DEREGISTERED_EVT: {
+ tNFA_CE_DEREGISTERED& ce_deregistered = eventData->ce_deregistered;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_CE_DEREGISTERED_EVT; h=0x%X", fn, ce_deregistered.handle);
+ } break;
- case NFA_CE_ACTIVATED_EVT: {
- routingManager.notifyActivated(NFA_TECHNOLOGY_MASK_A);
- } break;
+ case NFA_CE_ACTIVATED_EVT: {
+ routingManager.notifyActivated(NFA_TECHNOLOGY_MASK_A);
+ } break;
- case NFA_DEACTIVATED_EVT:
- case NFA_CE_DEACTIVATED_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_DEACTIVATED_EVT, NFA_CE_DEACTIVATED_EVT", fn);
- routingManager.notifyDeactivated(NFA_TECHNOLOGY_MASK_A);
- SyncEventGuard g(gDeactivatedEvent);
- gActivated = false; // guard this variable from multi-threaded access
- gDeactivatedEvent.notifyOne();
- } break;
+ case NFA_DEACTIVATED_EVT:
+ case NFA_CE_DEACTIVATED_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_DEACTIVATED_EVT, NFA_CE_DEACTIVATED_EVT", fn);
+ routingManager.notifyDeactivated(NFA_TECHNOLOGY_MASK_A);
+ SyncEventGuard g(gDeactivatedEvent);
+ gActivated = false; // guard this variable from multi-threaded access
+ gDeactivatedEvent.notifyOne();
+ } break;
- case NFA_CE_DATA_EVT: {
- tNFA_CE_DATA &ce_data = eventData->ce_data;
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_CE_DATA_EVT; stat=0x%X; h=0x%X; data len=%u",
- fn, ce_data.status, ce_data.handle, ce_data.len);
- getInstance().handleData(NFA_TECHNOLOGY_MASK_A, ce_data.p_data, ce_data.len,
- ce_data.status);
- } break;
+ case NFA_CE_DATA_EVT: {
+ tNFA_CE_DATA& ce_data = eventData->ce_data;
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: NFA_CE_DATA_EVT; stat=0x%X; h=0x%X; data len=%u",
+ fn, ce_data.status, ce_data.handle, ce_data.len);
+ getInstance().handleData(NFA_TECHNOLOGY_MASK_A, ce_data.p_data,
+ ce_data.len, ce_data.status);
+ } break;
}
}
/*******************************************************************************
@@ -550,115 +549,115 @@
**
*******************************************************************************/
void RoutingManager::nfaEeCallback(tNFA_EE_EVT event,
- tNFA_EE_CBACK_DATA *eventData) {
+ tNFA_EE_CBACK_DATA* eventData) {
static const char fn[] = "RoutingManager::nfaEeCallback";
- RoutingManager &routingManager = RoutingManager::getInstance();
+ RoutingManager& routingManager = RoutingManager::getInstance();
switch (event) {
- case NFA_EE_REGISTER_EVT: {
- SyncEventGuard guard(routingManager.mEeRegisterEvent);
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_REGISTER_EVT; status=%u", fn, eventData->ee_register);
- routingManager.mEeRegisterEvent.notifyOne();
- } break;
-
- case NFA_EE_MODE_SET_EVT: {
- SyncEventGuard guard(routingManager.mEeSetModeEvent);
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_MODE_SET_EVT; status: 0x%04X handle: 0x%04X ", fn,
- eventData->mode_set.status, eventData->mode_set.ee_handle);
- routingManager.mEeSetModeEvent.notifyOne();
- } break;
-
- case NFA_EE_SET_TECH_CFG_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_SET_TECH_CFG_EVT; status=0x%X", fn, eventData->status);
- SyncEventGuard guard(routingManager.mRoutingEvent);
- routingManager.mRoutingEvent.notifyOne();
- } break;
-
- case NFA_EE_SET_PROTO_CFG_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_SET_PROTO_CFG_EVT; status=0x%X", fn, eventData->status);
- SyncEventGuard guard(routingManager.mRoutingEvent);
- routingManager.mRoutingEvent.notifyOne();
- } break;
-
- case NFA_EE_ACTION_EVT: {
- tNFA_EE_ACTION &action = eventData->action;
- if (action.trigger == NFC_EE_TRIG_SELECT)
+ case NFA_EE_REGISTER_EVT: {
+ SyncEventGuard guard(routingManager.mEeRegisterEvent);
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=select (0x%X)", fn,
- action.ee_handle, action.trigger);
- else if (action.trigger == NFC_EE_TRIG_APP_INIT) {
- tNFC_APP_INIT &app_init = action.param.app_init;
+ "%s: NFA_EE_REGISTER_EVT; status=%u", fn, eventData->ee_register);
+ routingManager.mEeRegisterEvent.notifyOne();
+ } break;
+
+ case NFA_EE_MODE_SET_EVT: {
+ SyncEventGuard guard(routingManager.mEeSetModeEvent);
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_MODE_SET_EVT; status: 0x%04X handle: 0x%04X ", fn,
+ eventData->mode_set.status, eventData->mode_set.ee_handle);
+ routingManager.mEeSetModeEvent.notifyOne();
+ } break;
+
+ case NFA_EE_SET_TECH_CFG_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_SET_TECH_CFG_EVT; status=0x%X", fn, eventData->status);
+ SyncEventGuard guard(routingManager.mRoutingEvent);
+ routingManager.mRoutingEvent.notifyOne();
+ } break;
+
+ case NFA_EE_SET_PROTO_CFG_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_SET_PROTO_CFG_EVT; status=0x%X", fn, eventData->status);
+ SyncEventGuard guard(routingManager.mRoutingEvent);
+ routingManager.mRoutingEvent.notifyOne();
+ } break;
+
+ case NFA_EE_ACTION_EVT: {
+ tNFA_EE_ACTION& action = eventData->action;
+ if (action.trigger == NFC_EE_TRIG_SELECT)
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=select (0x%X)", fn,
+ action.ee_handle, action.trigger);
+ else if (action.trigger == NFC_EE_TRIG_APP_INIT) {
+ tNFC_APP_INIT& app_init = action.param.app_init;
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=app-init "
+ "(0x%X); aid len=%u; data len=%u",
+ fn, action.ee_handle, action.trigger, app_init.len_aid,
+ app_init.len_data);
+ } else if (action.trigger == NFC_EE_TRIG_RF_PROTOCOL)
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf protocol (0x%X)", fn,
+ action.ee_handle, action.trigger);
+ else if (action.trigger == NFC_EE_TRIG_RF_TECHNOLOGY)
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf tech (0x%X)", fn,
+ action.ee_handle, action.trigger);
+ else
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_ACTION_EVT; h=0x%X; unknown trigger (0x%X)", fn,
+ action.ee_handle, action.trigger);
+ } break;
+
+ case NFA_EE_DISCOVER_REQ_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_DISCOVER_REQ_EVT; status=0x%X; num ee=%u", __func__,
+ eventData->discover_req.status, eventData->discover_req.num_ee);
+ SyncEventGuard guard(routingManager.mEeInfoEvent);
+ memcpy(&routingManager.mEeInfo, &eventData->discover_req,
+ sizeof(routingManager.mEeInfo));
+ routingManager.mReceivedEeInfo = true;
+ routingManager.mEeInfoEvent.notifyOne();
+ } break;
+
+ case NFA_EE_NO_CB_ERR_EVT:
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_NO_CB_ERR_EVT status=%u", fn, eventData->status);
+ break;
+
+ case NFA_EE_ADD_AID_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_ADD_AID_EVT status=%u", fn, eventData->status);
+ } break;
+
+ case NFA_EE_REMOVE_AID_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_REMOVE_AID_EVT status=%u", fn, eventData->status);
+ } break;
+
+ case NFA_EE_NEW_EE_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: NFA_EE_NEW_EE_EVT h=0x%X; status=%u", fn,
+ eventData->new_ee.ee_handle, eventData->new_ee.ee_status);
+ } break;
+
+ case NFA_EE_UPDATED_EVT: {
DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=app-init "
- "(0x%X); aid len=%u; data len=%u",
- fn, action.ee_handle, action.trigger,
- app_init.len_aid, app_init.len_data);
- } else if (action.trigger == NFC_EE_TRIG_RF_PROTOCOL)
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf protocol (0x%X)", fn,
- action.ee_handle, action.trigger);
- else if (action.trigger == NFC_EE_TRIG_RF_TECHNOLOGY)
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_ACTION_EVT; h=0x%X; trigger=rf tech (0x%X)", fn,
- action.ee_handle, action.trigger);
- else
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_ACTION_EVT; h=0x%X; unknown trigger (0x%X)", fn,
- action.ee_handle, action.trigger);
- } break;
+ << StringPrintf("%s: NFA_EE_UPDATED_EVT", fn);
+ SyncEventGuard guard(routingManager.mEeUpdateEvent);
+ routingManager.mEeUpdateEvent.notifyOne();
+ } break;
- case NFA_EE_DISCOVER_REQ_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_DISCOVER_REQ_EVT; status=0x%X; num ee=%u", __func__,
- eventData->discover_req.status, eventData->discover_req.num_ee);
- SyncEventGuard guard(routingManager.mEeInfoEvent);
- memcpy(&routingManager.mEeInfo, &eventData->discover_req,
- sizeof(routingManager.mEeInfo));
- routingManager.mReceivedEeInfo = true;
- routingManager.mEeInfoEvent.notifyOne();
- } break;
-
- case NFA_EE_NO_CB_ERR_EVT:
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_NO_CB_ERR_EVT status=%u", fn, eventData->status);
- break;
-
- case NFA_EE_ADD_AID_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_ADD_AID_EVT status=%u", fn, eventData->status);
- } break;
-
- case NFA_EE_REMOVE_AID_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_REMOVE_AID_EVT status=%u", fn, eventData->status);
- } break;
-
- case NFA_EE_NEW_EE_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
- "%s: NFA_EE_NEW_EE_EVT h=0x%X; status=%u", fn,
- eventData->new_ee.ee_handle, eventData->new_ee.ee_status);
- } break;
-
- case NFA_EE_UPDATED_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: NFA_EE_UPDATED_EVT", fn);
- SyncEventGuard guard(routingManager.mEeUpdateEvent);
- routingManager.mEeUpdateEvent.notifyOne();
- } break;
-
- default:
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: unknown event=%u ????", fn, event);
- break;
+ default:
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: unknown event=%u ????", fn, event);
+ break;
}
}
-int RoutingManager::registerT3tIdentifier(uint8_t *t3tId, uint8_t t3tIdLen) {
+int RoutingManager::registerT3tIdentifier(uint8_t* t3tId, uint8_t t3tIdLen) {
static const char fn[] = "RoutingManager::registerT3tIdentifier";
DLOG_IF(INFO, nfc_debug_enabled)
@@ -713,51 +712,51 @@
}
void RoutingManager::nfcFCeCallback(uint8_t event,
- tNFA_CONN_EVT_DATA *eventData) {
+ tNFA_CONN_EVT_DATA* eventData) {
static const char fn[] = "RoutingManager::nfcFCeCallback";
- RoutingManager &routingManager = RoutingManager::getInstance();
+ RoutingManager& routingManager = RoutingManager::getInstance();
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s: 0x%x", __func__, event);
switch (event) {
- case NFA_CE_REGISTERED_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: registerd event notified", fn);
- routingManager.mNfcFOnDhHandle = eventData->ce_registered.handle;
- SyncEventGuard guard(routingManager.mRoutingEvent);
- routingManager.mRoutingEvent.notifyOne();
- } break;
- case NFA_CE_DEREGISTERED_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: deregisterd event notified", fn);
- SyncEventGuard guard(routingManager.mRoutingEvent);
- routingManager.mRoutingEvent.notifyOne();
- } break;
- case NFA_CE_ACTIVATED_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: activated event notified", fn);
- routingManager.notifyActivated(NFA_TECHNOLOGY_MASK_F);
- } break;
- case NFA_CE_DEACTIVATED_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: deactivated event notified", fn);
- routingManager.notifyDeactivated(NFA_TECHNOLOGY_MASK_F);
- } break;
- case NFA_CE_DATA_EVT: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: data event notified", fn);
- tNFA_CE_DATA &ce_data = eventData->ce_data;
- routingManager.handleData(NFA_TECHNOLOGY_MASK_F, ce_data.p_data,
- ce_data.len, ce_data.status);
- } break;
- default: {
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: unknown event=%u ????", fn, event);
- } break;
+ case NFA_CE_REGISTERED_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: registerd event notified", fn);
+ routingManager.mNfcFOnDhHandle = eventData->ce_registered.handle;
+ SyncEventGuard guard(routingManager.mRoutingEvent);
+ routingManager.mRoutingEvent.notifyOne();
+ } break;
+ case NFA_CE_DEREGISTERED_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: deregisterd event notified", fn);
+ SyncEventGuard guard(routingManager.mRoutingEvent);
+ routingManager.mRoutingEvent.notifyOne();
+ } break;
+ case NFA_CE_ACTIVATED_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: activated event notified", fn);
+ routingManager.notifyActivated(NFA_TECHNOLOGY_MASK_F);
+ } break;
+ case NFA_CE_DEACTIVATED_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: deactivated event notified", fn);
+ routingManager.notifyDeactivated(NFA_TECHNOLOGY_MASK_F);
+ } break;
+ case NFA_CE_DATA_EVT: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: data event notified", fn);
+ tNFA_CE_DATA& ce_data = eventData->ce_data;
+ routingManager.handleData(NFA_TECHNOLOGY_MASK_F, ce_data.p_data,
+ ce_data.len, ce_data.status);
+ } break;
+ default: {
+ DLOG_IF(INFO, nfc_debug_enabled)
+ << StringPrintf("%s: unknown event=%u ????", fn, event);
+ } break;
}
}
-int RoutingManager::registerJniFunctions(JNIEnv *e) {
+int RoutingManager::registerJniFunctions(JNIEnv* e) {
static const char fn[] = "RoutingManager::registerJniFunctions";
DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf("%s", fn);
return jniRegisterNativeMethods(
@@ -766,17 +765,16 @@
}
int RoutingManager::com_android_nfc_cardemulation_doGetDefaultRouteDestination(
- JNIEnv *) {
+ JNIEnv*) {
return getInstance().mDefaultEe;
}
int RoutingManager::
- com_android_nfc_cardemulation_doGetDefaultOffHostRouteDestination(
- JNIEnv *) {
+ com_android_nfc_cardemulation_doGetDefaultOffHostRouteDestination(JNIEnv*) {
return getInstance().mOffHostEe;
}
int RoutingManager::com_android_nfc_cardemulation_doGetAidMatchingMode(
- JNIEnv *) {
+ JNIEnv*) {
return getInstance().mAidMatchingMode;
}
diff --git a/nci/jni/RoutingManager.h b/nci/jni/RoutingManager.h
index 076d983..a3d6be9 100644
--- a/nci/jni/RoutingManager.h
+++ b/nci/jni/RoutingManager.h
@@ -18,36 +18,36 @@
* Manage the listen-mode routing table.
*/
#pragma once
+#include <vector>
#include "NfcJniUtil.h"
#include "RouteDataSet.h"
#include "SyncEvent.h"
-#include <vector>
#include "nfa_api.h"
#include "nfa_ee_api.h"
class RoutingManager {
-public:
- static RoutingManager &getInstance();
- bool initialize(nfc_jni_native_data *native);
+ public:
+ static RoutingManager& getInstance();
+ bool initialize(nfc_jni_native_data* native);
void enableRoutingToHost();
void disableRoutingToHost();
- bool addAidRouting(const uint8_t *aid, uint8_t aidLen, int route,
+ bool addAidRouting(const uint8_t* aid, uint8_t aidLen, int route,
int aidInfo);
- bool removeAidRouting(const uint8_t *aid, uint8_t aidLen);
+ bool removeAidRouting(const uint8_t* aid, uint8_t aidLen);
bool commitRouting();
- int registerT3tIdentifier(uint8_t *t3tId, uint8_t t3tIdLen);
+ int registerT3tIdentifier(uint8_t* t3tId, uint8_t t3tIdLen);
void deregisterT3tIdentifier(int handle);
void onNfccShutdown();
- int registerJniFunctions(JNIEnv *e);
+ int registerJniFunctions(JNIEnv* e);
-private:
+ private:
RoutingManager();
~RoutingManager();
- RoutingManager(const RoutingManager &);
- RoutingManager &operator=(const RoutingManager &);
+ RoutingManager(const RoutingManager&);
+ RoutingManager& operator=(const RoutingManager&);
- void handleData(uint8_t technology, const uint8_t *data, uint32_t dataLen,
+ void handleData(uint8_t technology, const uint8_t* data, uint32_t dataLen,
tNFA_STATUS status);
void notifyActivated(uint8_t technology);
void notifyDeactivated(uint8_t technology);
@@ -62,20 +62,20 @@
// Every routing table entry is matched as a prefix
static const int AID_MATCHING_PREFIX_ONLY = 0x02;
- static void nfaEeCallback(tNFA_EE_EVT event, tNFA_EE_CBACK_DATA *eventData);
- static void stackCallback(uint8_t event, tNFA_CONN_EVT_DATA *eventData);
- static void nfcFCeCallback(uint8_t event, tNFA_CONN_EVT_DATA *eventData);
+ static void nfaEeCallback(tNFA_EE_EVT event, tNFA_EE_CBACK_DATA* eventData);
+ static void stackCallback(uint8_t event, tNFA_CONN_EVT_DATA* eventData);
+ static void nfcFCeCallback(uint8_t event, tNFA_CONN_EVT_DATA* eventData);
- static int
- com_android_nfc_cardemulation_doGetDefaultRouteDestination(JNIEnv *e);
- static int
- com_android_nfc_cardemulation_doGetDefaultOffHostRouteDestination(JNIEnv *e);
- static int com_android_nfc_cardemulation_doGetAidMatchingMode(JNIEnv *e);
+ static int com_android_nfc_cardemulation_doGetDefaultRouteDestination(
+ JNIEnv* e);
+ static int com_android_nfc_cardemulation_doGetDefaultOffHostRouteDestination(
+ JNIEnv* e);
+ static int com_android_nfc_cardemulation_doGetAidMatchingMode(JNIEnv* e);
std::vector<uint8_t> mRxDataBuffer;
// Fields below are final after initialize()
- nfc_jni_native_data *mNativeData;
+ nfc_jni_native_data* mNativeData;
int mDefaultEe;
int mDefaultEeNfcF;
int mOffHostEe;
diff --git a/nci/jni/SyncEvent.h b/nci/jni/SyncEvent.h
index d528217..b441759 100644
--- a/nci/jni/SyncEvent.h
+++ b/nci/jni/SyncEvent.h
@@ -22,7 +22,7 @@
#include "Mutex.h"
class SyncEvent {
-public:
+ public:
/*******************************************************************************
**
** Function: ~SyncEvent
@@ -94,7 +94,7 @@
*******************************************************************************/
void end() { mMutex.unlock(); }
-private:
+ private:
CondVar mCondVar;
Mutex mMutex;
};
@@ -110,7 +110,7 @@
**
*****************************************************************************/
class SyncEventGuard {
-public:
+ public:
/*******************************************************************************
**
** Function: SyncEventGuard
@@ -120,8 +120,8 @@
** Returns: None.
**
*******************************************************************************/
- SyncEventGuard(SyncEvent &event) : mEvent(event) {
- event.start(); // automatically start operation
+ SyncEventGuard(SyncEvent& event) : mEvent(event) {
+ event.start(); // automatically start operation
};
/*******************************************************************************
@@ -134,9 +134,9 @@
**
*******************************************************************************/
~SyncEventGuard() {
- mEvent.end(); // automatically end operation
+ mEvent.end(); // automatically end operation
};
-private:
- SyncEvent &mEvent;
+ private:
+ SyncEvent& mEvent;
};
diff --git a/nci/jni/extns/pn54x/inc/phNxpExtns.h b/nci/jni/extns/pn54x/inc/phNxpExtns.h
index 5bbce9c..8984aed 100644
--- a/nci/jni/extns/pn54x/inc/phNxpExtns.h
+++ b/nci/jni/extns/pn54x/inc/phNxpExtns.h
@@ -22,29 +22,29 @@
#include <phNfcStatus.h>
#include <sys/types.h>
-NFCSTATUS EXTNS_Init(tNFA_DM_CBACK *p_dm_cback, tNFA_CONN_CBACK *p_conn_cback);
+NFCSTATUS EXTNS_Init(tNFA_DM_CBACK* p_dm_cback, tNFA_CONN_CBACK* p_conn_cback);
void EXTNS_Close(void);
NFCSTATUS EXTNS_MfcInit(tNFA_ACTIVATED activationData);
NFCSTATUS EXTNS_MfcCheckNDef(void);
NFCSTATUS EXTNS_MfcReadNDef(void);
NFCSTATUS EXTNS_MfcPresenceCheck(void);
-NFCSTATUS EXTNS_MfcWriteNDef(uint8_t *pBuf, uint32_t len);
-NFCSTATUS EXTNS_MfcFormatTag(uint8_t *key, uint8_t len);
+NFCSTATUS EXTNS_MfcWriteNDef(uint8_t* pBuf, uint32_t len);
+NFCSTATUS EXTNS_MfcFormatTag(uint8_t* key, uint8_t len);
NFCSTATUS EXTNS_MfcDisconnect(void);
NFCSTATUS EXTNS_MfcActivated(void);
-NFCSTATUS EXTNS_MfcTransceive(uint8_t *p_data, uint32_t len);
+NFCSTATUS EXTNS_MfcTransceive(uint8_t* p_data, uint32_t len);
NFCSTATUS
-EXTNS_MfcRegisterNDefTypeHandler(tNFA_NDEF_CBACK *ndefHandlerCallback);
-NFCSTATUS EXTNS_MfcCallBack(uint8_t *buf, uint32_t buflen);
-NFCSTATUS EXTNS_MfcSetReadOnly(uint8_t *key, uint8_t len);
+EXTNS_MfcRegisterNDefTypeHandler(tNFA_NDEF_CBACK* ndefHandlerCallback);
+NFCSTATUS EXTNS_MfcCallBack(uint8_t* buf, uint32_t buflen);
+NFCSTATUS EXTNS_MfcSetReadOnly(uint8_t* key, uint8_t len);
void EXTNS_SetConnectFlag(bool_t flagval);
bool_t EXTNS_GetConnectFlag(void);
void EXTNS_SetDeactivateFlag(bool_t flagval);
bool_t EXTNS_GetDeactivateFlag(void);
void EXTNS_SetCallBackFlag(bool_t flagval);
bool_t EXTNS_GetCallBackFlag(void);
-NFCSTATUS EXTNS_CheckMfcResponse(uint8_t **sTransceiveData,
- uint32_t *sTransceiveDataLen);
+NFCSTATUS EXTNS_CheckMfcResponse(uint8_t** sTransceiveData,
+ uint32_t* sTransceiveDataLen);
void MfcPresenceCheckResult(NFCSTATUS status);
void MfcResetPresenceCheckStatus(void);
NFCSTATUS EXTNS_GetPresenceCheckStatus(void);
diff --git a/nci/jni/extns/pn54x/inc/phNxpExtns_Custom.h b/nci/jni/extns/pn54x/inc/phNxpExtns_Custom.h
index 2e1af01..5c3b88b 100644
--- a/nci/jni/extns/pn54x/inc/phNxpExtns_Custom.h
+++ b/nci/jni/extns/pn54x/inc/phNxpExtns_Custom.h
@@ -30,7 +30,7 @@
typedef struct {
uint8_t type[2];
uint8_t len;
- uint8_t *val;
+ uint8_t* val;
} tlv_t;
typedef enum {
@@ -65,8 +65,8 @@
** NOTE: Internally this function will use phNxpNciHal_get_version from HAL.
*******************************************************************************/
-NFCSTATUS phNxpExtns_get_version(uint32_t *hw_ver, uint32_t *fw_ver,
- uint32_t *sw_ver);
+NFCSTATUS phNxpExtns_get_version(uint32_t* hw_ver, uint32_t* fw_ver,
+ uint32_t* sw_ver);
/*******************************************************************************
**
@@ -84,7 +84,7 @@
** For extended TLV, it will use NFA_SendRawFrame.
*******************************************************************************/
-NFCSTATUS phNxpNciHal_read_tlv(tlv_t *tlv);
+NFCSTATUS phNxpNciHal_read_tlv(tlv_t* tlv);
/*******************************************************************************
**
@@ -101,7 +101,7 @@
** For extended TLV, it will use NFA_SendRawFrame.
*******************************************************************************/
-NFCSTATUS phNxpNciHal_write_tlv(tlv_t *tlv);
+NFCSTATUS phNxpNciHal_write_tlv(tlv_t* tlv);
/*******************************************************************************
**
diff --git a/nci/jni/extns/pn54x/src/common/phNciNfcTypes.h b/nci/jni/extns/pn54x/src/common/phNciNfcTypes.h
index 31a2c6b..97deb22 100644
--- a/nci/jni/extns/pn54x/src/common/phNciNfcTypes.h
+++ b/nci/jni/extns/pn54x/src/common/phNciNfcTypes.h
@@ -39,7 +39,7 @@
/* Maximum length of ATR_RES (General Bytes) length expected */
#define PH_NCINFCTYPES_MAX_ATR_LENGTH (0x30U)
#define PH_NCINFCTYPES_ATQA_LENGTH (0x02U) /* ATQA length */
-#define PH_NCINFCTYPES_MAX_HIST_BYTES \
+#define PH_NCINFCTYPES_MAX_HIST_BYTES \
(0x0FU) /* Max Historical bytes returned by Type A tag */
/*
@@ -236,7 +236,7 @@
* shall be stored and length of the payload stored in the buffer.
*/
typedef struct phNciNfc_Data {
- uint8_t *pBuff; /* Buffer to store received data packet's payload */
+ uint8_t* pBuff; /* Buffer to store received data packet's payload */
uint16_t wLen; /* Length of the payload */
} phNciNfc_Data_t, *pphNciNfc_Data_t;
diff --git a/nci/jni/extns/pn54x/src/common/phNfcCompId.h b/nci/jni/extns/pn54x/src/common/phNfcCompId.h
index 7f46045..91b7a2b 100644
--- a/nci/jni/extns/pn54x/src/common/phNfcCompId.h
+++ b/nci/jni/extns/pn54x/src/common/phNfcCompId.h
@@ -37,7 +37,7 @@
* this value except for NFCSTATUS_SUCCESS. The enumeration function uses
* CID_NFC_NONE to mark unassigned "References".
*/
-#define CID_NFC_NONE \
+#define CID_NFC_NONE \
0x00 /* Unassigned or doesn't apply (see #NFCSTATUS_SUCCESS) */
#define CID_NFC_TML 0x01 /* Transport Mapping Layer */
#define CID_NFC_LLC 0x07 /* Logical Link Control Layer */
diff --git a/nci/jni/extns/pn54x/src/common/phNfcStatus.h b/nci/jni/extns/pn54x/src/common/phNfcStatus.h
index 40b3d21..3414d11 100644
--- a/nci/jni/extns/pn54x/src/common/phNfcStatus.h
+++ b/nci/jni/extns/pn54x/src/common/phNfcStatus.h
@@ -42,10 +42,10 @@
* statements, e.g.: NFCSTATUS status = PHNFCSTVAL(phNfcCompID, phNfcStatus);
* ... if (status == PHNFCSTVAL(phNfcCompID, phNfcStatus)) ...
*/
-#define PHNFCSTVAL(phNfcCompID, phNfcStatus) \
- (((phNfcStatus) == (NFCSTATUS_SUCCESS)) \
- ? (NFCSTATUS_SUCCESS) \
- : ((((NFCSTATUS)(phNfcStatus)) & (PHNFCSTBLOWER)) | \
+#define PHNFCSTVAL(phNfcCompID, phNfcStatus) \
+ (((phNfcStatus) == (NFCSTATUS_SUCCESS)) \
+ ? (NFCSTATUS_SUCCESS) \
+ : ((((NFCSTATUS)(phNfcStatus)) & (PHNFCSTBLOWER)) | \
(((uint16_t)(phNfcCompID)) << (PHNFCSTSHL8))))
/*
diff --git a/nci/jni/extns/pn54x/src/common/phNfcTypes.h b/nci/jni/extns/pn54x/src/common/phNfcTypes.h
index 96fe756..19d4fe5 100644
--- a/nci/jni/extns/pn54x/src/common/phNfcTypes.h
+++ b/nci/jni/extns/pn54x/src/common/phNfcTypes.h
@@ -34,7 +34,7 @@
typedef uint16_t NFCSTATUS; /* Return values */
#define PHNFC_MAX_UID_LENGTH 0x0AU /* Maximum UID length expected */
-#define PHNFC_MAX_ATR_LENGTH \
+#define PHNFC_MAX_ATR_LENGTH \
0x30U /* Maximum ATR_RES (General Bytes) length expected */
#define PHNFC_NFCID_LENGTH 0x0AU /* Maximum length of NFCID 1.3*/
#define PHNFC_ATQA_LENGTH 0x02U /* ATQA length */
@@ -43,7 +43,7 @@
* NFC Data structure
*/
typedef struct phNfc_sData {
- uint8_t *buffer; /* Buffer to store data */
+ uint8_t* buffer; /* Buffer to store data */
uint32_t length; /* Buffer length */
} phNfc_sData_t;
@@ -79,14 +79,14 @@
* This type of API is called from ClientApplication ( main thread) to notify
* specific callback.
*/
-typedef void (*pphLibNfc_DeferredCallback_t)(void *);
+typedef void (*pphLibNfc_DeferredCallback_t)(void*);
/*
* Deferred parameter declaration.
* This type of data is passed as parameter from ClientApplication (main thread)
* to the callback.
*/
-typedef void *pphLibNfc_DeferredParameter_t;
+typedef void* pphLibNfc_DeferredParameter_t;
/*
* Possible Hardware Configuration exposed to upper layer.
@@ -94,7 +94,7 @@
* the controller is connected to.
*/
typedef struct phLibNfc_sConfig {
- uint8_t *pLogFile; /* Log File Name*/
+ uint8_t* pLogFile; /* Log File Name*/
/* Hardware communication link to the controller */
phLibNfc_eConfigLinkType nLinkType;
/* The client ID (thread ID or message queue ID) */
@@ -107,7 +107,7 @@
*/
typedef struct phLibNfc_Message {
uint32_t eMsgType; /* Type of the message to be posted*/
- void *pMsgData; /* Pointer to message specific data block in case any*/
+ void* pMsgData; /* Pointer to message specific data block in case any*/
uint32_t Size; /* Size of the datablock*/
} phLibNfc_Message_t, *pphLibNfc_Message_t;
@@ -272,8 +272,8 @@
uint8_t addr; /* Start Block Number */
uint8_t NumBlock; /* Number of Blocks to perform operation */
/* For Felica only*/
- uint16_t *ServiceCodeList; /* 2 Byte service Code List */
- uint16_t *Blocklist; /* 2 Byte Block list */
+ uint16_t* ServiceCodeList; /* 2 Byte service Code List */
+ uint16_t* Blocklist; /* 2 Byte Block list */
phNfc_sData_t sSendData; /* Send data */
phNfc_sData_t sRecvData; /* Recv data */
/* For EPC-GEN */
diff --git a/nci/jni/extns/pn54x/src/log/phNxpLog.cpp b/nci/jni/extns/pn54x/src/log/phNxpLog.cpp
index 8fab52c..e89358d 100644
--- a/nci/jni/extns/pn54x/src/log/phNxpLog.cpp
+++ b/nci/jni/extns/pn54x/src/log/phNxpLog.cpp
@@ -25,16 +25,16 @@
using android::base::StringPrintf;
-const char *NXPLOG_ITEM_EXTNS = "NxpExtns";
-const char *NXPLOG_ITEM_NCIHAL = "NxpHal";
-const char *NXPLOG_ITEM_NCIX = "NxpNciX";
-const char *NXPLOG_ITEM_NCIR = "NxpNciR";
-const char *NXPLOG_ITEM_FWDNLD = "NxpFwDnld";
-const char *NXPLOG_ITEM_TML = "NxpTml";
+const char* NXPLOG_ITEM_EXTNS = "NxpExtns";
+const char* NXPLOG_ITEM_NCIHAL = "NxpHal";
+const char* NXPLOG_ITEM_NCIX = "NxpNciX";
+const char* NXPLOG_ITEM_NCIR = "NxpNciR";
+const char* NXPLOG_ITEM_FWDNLD = "NxpFwDnld";
+const char* NXPLOG_ITEM_TML = "NxpTml";
#ifdef NXP_HCI_REQ
-const char *NXPLOG_ITEM_HCPX = "NxpHcpX";
-const char *NXPLOG_ITEM_HCPR = "NxpHcpR";
+const char* NXPLOG_ITEM_HCPX = "NxpHcpX";
+const char* NXPLOG_ITEM_HCPR = "NxpHcpR";
#endif /*NXP_HCI_REQ*/
/* global log level structure */
@@ -251,14 +251,14 @@
phNxpLog_SetDnldLogLevel(level);
phNxpLog_SetNciTxLogLevel(level);
- DLOG_IF(INFO, nfc_debug_enabled)
- << StringPrintf("%s: global =%u, Fwdnld =%u, extns =%u, \
+ DLOG_IF(INFO, nfc_debug_enabled) << StringPrintf(
+ "%s: global =%u, Fwdnld =%u, extns =%u, \
hal =%u, tml =%u, ncir =%u, \
ncix =%u",
- __func__, gLog_level.global_log_level,
- gLog_level.dnld_log_level, gLog_level.extns_log_level,
- gLog_level.hal_log_level, gLog_level.tml_log_level,
- gLog_level.ncir_log_level, gLog_level.ncix_log_level);
+ __func__, gLog_level.global_log_level, gLog_level.dnld_log_level,
+ gLog_level.extns_log_level, gLog_level.hal_log_level,
+ gLog_level.tml_log_level, gLog_level.ncir_log_level,
+ gLog_level.ncix_log_level);
return;
}
diff --git a/nci/jni/extns/pn54x/src/log/phNxpLog.h b/nci/jni/extns/pn54x/src/log/phNxpLog.h
index a89b003..b1bf53d 100644
--- a/nci/jni/extns/pn54x/src/log/phNxpLog.h
+++ b/nci/jni/extns/pn54x/src/log/phNxpLog.h
@@ -79,24 +79,24 @@
/* ################################################################################################################
*/
-extern const char *NXPLOG_ITEM_EXTNS; /* Android logging tag for NxpExtns */
-extern const char *NXPLOG_ITEM_NCIHAL; /* Android logging tag for NxpNciHal */
-extern const char *NXPLOG_ITEM_NCIX; /* Android logging tag for NxpNciX */
-extern const char *NXPLOG_ITEM_NCIR; /* Android logging tag for NxpNciR */
-extern const char *NXPLOG_ITEM_FWDNLD; /* Android logging tag for NxpFwDnld */
-extern const char *NXPLOG_ITEM_TML; /* Android logging tag for NxpTml */
+extern const char* NXPLOG_ITEM_EXTNS; /* Android logging tag for NxpExtns */
+extern const char* NXPLOG_ITEM_NCIHAL; /* Android logging tag for NxpNciHal */
+extern const char* NXPLOG_ITEM_NCIX; /* Android logging tag for NxpNciX */
+extern const char* NXPLOG_ITEM_NCIR; /* Android logging tag for NxpNciR */
+extern const char* NXPLOG_ITEM_FWDNLD; /* Android logging tag for NxpFwDnld */
+extern const char* NXPLOG_ITEM_TML; /* Android logging tag for NxpTml */
#ifdef NXP_HCI_REQ
-extern const char *NXPLOG_ITEM_HCPX; /* Android logging tag for NxpHcpX */
-extern const char *NXPLOG_ITEM_HCPR; /* Android logging tag for NxpHcpR */
+extern const char* NXPLOG_ITEM_HCPX; /* Android logging tag for NxpHcpX */
+extern const char* NXPLOG_ITEM_HCPR; /* Android logging tag for NxpHcpR */
#endif /*NXP_HCI_REQ*/
/* ######################################## Defines used for Logging data
* ######################################### */
#ifdef NXP_VRBS_REQ
-#define NXPLOG_FUNC_ENTRY(COMP) \
+#define NXPLOG_FUNC_ENTRY(COMP) \
LOG_PRI(ANDROID_LOG_VERBOSE, (COMP), "+:%s", (__func__))
-#define NXPLOG_FUNC_EXIT(COMP) \
+#define NXPLOG_FUNC_EXIT(COMP) \
LOG_PRI(ANDROID_LOG_VERBOSE, (COMP), "-:%s", (__func__))
#endif /*NXP_VRBS_REQ*/
@@ -108,20 +108,20 @@
*/
/* Logging APIs used by NxpNciHal module */
#if (ENABLE_HAL_TRACES == TRUE)
-#define NXPLOG_NCIHAL_D(...) \
- { \
- if (gLog_level.hal_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_NCIHAL, __VA_ARGS__); \
+#define NXPLOG_NCIHAL_D(...) \
+ { \
+ if (gLog_level.hal_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_NCIHAL, __VA_ARGS__); \
}
-#define NXPLOG_NCIHAL_W(...) \
- { \
- if (gLog_level.hal_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_NCIHAL, __VA_ARGS__); \
+#define NXPLOG_NCIHAL_W(...) \
+ { \
+ if (gLog_level.hal_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_NCIHAL, __VA_ARGS__); \
}
-#define NXPLOG_NCIHAL_E(...) \
- { \
- if (gLog_level.hal_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_NCIHAL, __VA_ARGS__); \
+#define NXPLOG_NCIHAL_E(...) \
+ { \
+ if (gLog_level.hal_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_NCIHAL, __VA_ARGS__); \
}
#else
#define NXPLOG_NCIHAL_D(...)
@@ -131,20 +131,20 @@
/* Logging APIs used by NxpNciX module */
#if (ENABLE_NCIX_TRACES == TRUE)
-#define NXPLOG_NCIX_D(...) \
- { \
- if (gLog_level.ncix_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_NCIX, __VA_ARGS__); \
+#define NXPLOG_NCIX_D(...) \
+ { \
+ if (gLog_level.ncix_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_NCIX, __VA_ARGS__); \
}
-#define NXPLOG_NCIX_W(...) \
- { \
- if (gLog_level.ncix_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_NCIX, __VA_ARGS__); \
+#define NXPLOG_NCIX_W(...) \
+ { \
+ if (gLog_level.ncix_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_NCIX, __VA_ARGS__); \
}
-#define NXPLOG_NCIX_E(...) \
- { \
- if (gLog_level.ncix_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_NCIX, __VA_ARGS__); \
+#define NXPLOG_NCIX_E(...) \
+ { \
+ if (gLog_level.ncix_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_NCIX, __VA_ARGS__); \
}
#else
#define NXPLOG_NCIX_D(...)
@@ -154,20 +154,20 @@
/* Logging APIs used by NxpNciR module */
#if (ENABLE_NCIR_TRACES == TRUE)
-#define NXPLOG_NCIR_D(...) \
- { \
- if (gLog_level.ncir_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_NCIR, __VA_ARGS__); \
+#define NXPLOG_NCIR_D(...) \
+ { \
+ if (gLog_level.ncir_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_NCIR, __VA_ARGS__); \
}
-#define NXPLOG_NCIR_W(...) \
- { \
- if (gLog_level.ncir_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_NCIR, __VA_ARGS__); \
+#define NXPLOG_NCIR_W(...) \
+ { \
+ if (gLog_level.ncir_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_NCIR, __VA_ARGS__); \
}
-#define NXPLOG_NCIR_E(...) \
- { \
- if (gLog_level.ncir_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_NCIR, __VA_ARGS__); \
+#define NXPLOG_NCIR_E(...) \
+ { \
+ if (gLog_level.ncir_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_NCIR, __VA_ARGS__); \
}
#else
#define NXPLOG_NCIR_D(...)
@@ -177,20 +177,20 @@
/* Logging APIs used by NxpFwDnld module */
#if (ENABLE_FWDNLD_TRACES == TRUE)
-#define NXPLOG_FWDNLD_D(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_FWDNLD_D(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
-#define NXPLOG_FWDNLD_W(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_FWDNLD_W(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
-#define NXPLOG_FWDNLD_E(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_FWDNLD_E(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
#else
#define NXPLOG_FWDNLD_D(...)
@@ -200,20 +200,20 @@
/* Logging APIs used by NxpTml module */
#if (ENABLE_TML_TRACES == TRUE)
-#define NXPLOG_TML_D(...) \
- { \
- if (gLog_level.tml_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_TML, __VA_ARGS__); \
+#define NXPLOG_TML_D(...) \
+ { \
+ if (gLog_level.tml_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_TML, __VA_ARGS__); \
}
-#define NXPLOG_TML_W(...) \
- { \
- if (gLog_level.tml_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_TML, __VA_ARGS__); \
+#define NXPLOG_TML_W(...) \
+ { \
+ if (gLog_level.tml_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_TML, __VA_ARGS__); \
}
-#define NXPLOG_TML_E(...) \
- { \
- if (gLog_level.tml_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_TML, __VA_ARGS__); \
+#define NXPLOG_TML_E(...) \
+ { \
+ if (gLog_level.tml_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_TML, __VA_ARGS__); \
}
#else
#define NXPLOG_TML_D(...)
@@ -224,20 +224,20 @@
#ifdef NXP_HCI_REQ
/* Logging APIs used by NxpHcpX module */
#if (ENABLE_HCPX_TRACES == TRUE)
-#define NXPLOG_HCPX_D(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_HCPX_D(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
-#define NXPLOG_HCPX_W(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_HCPX_W(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
-#define NXPLOG_HCPX_E(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_HCPX_E(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
#else
#define NXPLOG_HCPX_D(...)
@@ -247,20 +247,20 @@
/* Logging APIs used by NxpHcpR module */
#if (ENABLE_HCPR_TRACES == TRUE)
-#define NXPLOG_HCPR_D(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_HCPR_D(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_DEBUG, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
-#define NXPLOG_HCPR_W(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_HCPR_W(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_WARN_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_WARN, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
-#define NXPLOG_HCPR_E(...) \
- { \
- if (gLog_level.dnld_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
- LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
+#define NXPLOG_HCPR_E(...) \
+ { \
+ if (gLog_level.dnld_log_level >= NXPLOG_LOG_ERROR_LOGLEVEL) \
+ LOG_PRI(ANDROID_LOG_ERROR, NXPLOG_ITEM_FWDNLD, __VA_ARGS__); \
}
#else
#define NXPLOG_HCPR_D(...)
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc.h b/nci/jni/extns/pn54x/src/mifare/phFriNfc.h
index d71c003..cbe01b5 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc.h
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc.h
@@ -59,7 +59,7 @@
* asynchronous processing the definition of the Process(ing) function can
* be arbitrary, if present at all.
*/
-typedef void (*pphFriNfc_Cr_t)(void *, NFCSTATUS);
+typedef void (*pphFriNfc_Cr_t)(void*, NFCSTATUS);
/*
* Completion Routine structure
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.cpp b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.cpp
index 6526aa7..052e2f6 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.cpp
@@ -24,48 +24,46 @@
#include <phNxpLog.h>
/* Function prototype declarations */
-static void
-phFriNfc_MfStd_H_FillSendBuf(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- uint16_t BlockNo);
-static NFCSTATUS
-phFriNfc_MfStd_H_Transceive(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_CallDisCon(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- NFCSTATUS Status);
-static NFCSTATUS
-phFriNfc_MfStd_H_CallCon(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ProCon(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ProAuth(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ProRdSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ProWrSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_WrRdAuth(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
+static void phFriNfc_MfStd_H_FillSendBuf(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt, uint16_t BlockNo);
+static NFCSTATUS phFriNfc_MfStd_H_Transceive(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_CallDisCon(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt, NFCSTATUS Status);
+static NFCSTATUS phFriNfc_MfStd_H_CallCon(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ProCon(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ProAuth(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ProRdSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ProWrSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_WrRdAuth(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
static uint32_t phFriNfc_MfStd_H_ChkAcsBit(uint16_t BlockNo,
- const uint8_t *RecvBuf,
+ const uint8_t* RecvBuf,
const uint8_t AcsBits1[],
const uint8_t AcsBits2[]);
-static void
-phFriNfc_MfStd_H_ChangeAuthSt(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
+static void phFriNfc_MfStd_H_ChangeAuthSt(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
static void phFriNfc_MfStd_H_NdefComplSect(uint8_t CardTypes, uint8_t Sector[]);
-static NFCSTATUS
-phFriNfc_MfStd_H_ProWrMADBlk(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ProErrAuth(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ErrWrSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ErrRdSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static NFCSTATUS
-phFriNfc_MfStd_H_ProUpdMADBlk(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static void
-phFriNfc_MfStd_H_StrNdefData(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static void
-phFriNfc_MfStd_H_BlkNoToWrTLV(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-static int phFriNfc_MfStd_MemCompare(void *s1, void *s2, unsigned int n);
+static NFCSTATUS phFriNfc_MfStd_H_ProWrMADBlk(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ProErrAuth(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ErrWrSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ErrRdSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static NFCSTATUS phFriNfc_MfStd_H_ProUpdMADBlk(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static void phFriNfc_MfStd_H_StrNdefData(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static void phFriNfc_MfStd_H_BlkNoToWrTLV(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+static int phFriNfc_MfStd_MemCompare(void* s1, void* s2, unsigned int n);
/*
* Enum definition contains format states
@@ -91,7 +89,7 @@
** Returns none
**
*******************************************************************************/
-void phFriNfc_MfStd_Reset(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+void phFriNfc_MfStd_Reset(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
uint8_t NfcForSectArray[] = PH_FRINFC_SMTCRDFMT_NFCFORUMSECT_KEYA_ACS_BIT,
MADSectArray[] = PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA_ACS_BIT_1K;
@@ -147,8 +145,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-NFCSTATUS phFriNfc_MfStd_Format(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- const uint8_t *ScrtKeyB) {
+NFCSTATUS phFriNfc_MfStd_Format(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
+ const uint8_t* ScrtKeyB) {
NFCSTATUS Result =
PHNFCSTVAL(CID_FRI_NFC_NDEF_SMTCRDFMT, NFCSTATUS_INVALID_PARAMETER);
uint8_t index = PH_FRINFC_MFSTD_FMT_VAL_0;
@@ -198,75 +196,75 @@
** Returns none
**
*******************************************************************************/
-void phFriNfc_MfStd_Process(void *Context, NFCSTATUS Status) {
- phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt =
- (phFriNfc_sNdefSmtCrdFmt_t *)Context;
+void phFriNfc_MfStd_Process(void* Context, NFCSTATUS Status) {
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt =
+ (phFriNfc_sNdefSmtCrdFmt_t*)Context;
/* Copy the formatting status */
NdefSmtCrdFmt->FmtProcStatus = Status;
if (Status == NFCSTATUS_SUCCESS) {
switch (NdefSmtCrdFmt->State) {
- case PH_FRINFC_MFSTD_FMT_AUTH_SECT:
- Status = phFriNfc_MfStd_H_ProAuth(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_SECT:
+ Status = phFriNfc_MfStd_H_ProAuth(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_DIS_CON:
- Status = phFriNfc_MfStd_H_CallCon(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_DIS_CON:
+ Status = phFriNfc_MfStd_H_CallCon(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_CON:
- if (MFC_FORMAT_DEF_KEY == FormatKeyState) {
- /* retry the format with other key */
- Mfc_FormatNdef(current_key, 6);
- return;
- }
- Status = phFriNfc_MfStd_H_ProCon(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_CON:
+ if (MFC_FORMAT_DEF_KEY == FormatKeyState) {
+ /* retry the format with other key */
+ Mfc_FormatNdef(current_key, 6);
+ return;
+ }
+ Status = phFriNfc_MfStd_H_ProCon(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_RD_SECT_TR:
- Status = phFriNfc_MfStd_H_ProRdSectTr(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_RD_SECT_TR:
+ Status = phFriNfc_MfStd_H_ProRdSectTr(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_WR_SECT_TR:
- Status = phFriNfc_MfStd_H_ProWrSectTr(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_WR_SECT_TR:
+ Status = phFriNfc_MfStd_H_ProWrSectTr(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_WR_MAD_BLK:
- Status = phFriNfc_MfStd_H_ProWrMADBlk(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_WR_MAD_BLK:
+ Status = phFriNfc_MfStd_H_ProWrMADBlk(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_WR_TLV:
- break;
+ case PH_FRINFC_MFSTD_FMT_WR_TLV:
+ break;
- case PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK:
- Status = phFriNfc_MfStd_H_ProUpdMADBlk(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK:
+ Status = phFriNfc_MfStd_H_ProUpdMADBlk(NdefSmtCrdFmt);
+ break;
- default:
- Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_SMTCRDFMT,
- NFCSTATUS_INVALID_DEVICE_REQUEST);
- break;
+ default:
+ Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_SMTCRDFMT,
+ NFCSTATUS_INVALID_DEVICE_REQUEST);
+ break;
}
} else {
switch (NdefSmtCrdFmt->State) {
- case PH_FRINFC_MFSTD_FMT_AUTH_SECT:
- if (MFC_FORMAT_NFC_KEY == FormatKeyState) {
- FormatKeyState = MFC_FORMAT_DEF_KEY;
- }
- Status = phFriNfc_MfStd_H_ProErrAuth(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_SECT:
+ if (MFC_FORMAT_NFC_KEY == FormatKeyState) {
+ FormatKeyState = MFC_FORMAT_DEF_KEY;
+ }
+ Status = phFriNfc_MfStd_H_ProErrAuth(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_WR_SECT_TR:
- Status = phFriNfc_MfStd_H_ErrWrSectTr(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_WR_SECT_TR:
+ Status = phFriNfc_MfStd_H_ErrWrSectTr(NdefSmtCrdFmt);
+ break;
- case PH_FRINFC_MFSTD_FMT_RD_SECT_TR:
- Status = phFriNfc_MfStd_H_ErrRdSectTr(NdefSmtCrdFmt);
- break;
+ case PH_FRINFC_MFSTD_FMT_RD_SECT_TR:
+ Status = phFriNfc_MfStd_H_ErrRdSectTr(NdefSmtCrdFmt);
+ break;
- default:
- Status = NdefSmtCrdFmt->FmtProcStatus;
- break;
+ default:
+ Status = NdefSmtCrdFmt->FmtProcStatus;
+ break;
}
}
@@ -287,9 +285,8 @@
** Returns none
**
*******************************************************************************/
-static void
-phFriNfc_MfStd_H_FillSendBuf(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- uint16_t BlockNo) {
+static void phFriNfc_MfStd_H_FillSendBuf(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt, uint16_t BlockNo) {
// void *mem = NULL;
// /*commented to eliminate unused variable warning*/
uint8_t MADSectTr1k[] =
@@ -322,140 +319,146 @@
/* Depending on the different state, fill the send buffer */
switch (NdefSmtCrdFmt->State) {
- case PH_FRINFC_MFSTD_FMT_AUTH_SECT:
- /* Depending on the authentication state, fill the send buffer */
- switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState) {
- case PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY:
- case PH_FRINFC_MFSTD_FMT_AUTH_KEYB:
- /* Fill send buffer with the default key */
- PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_DEF(mem);
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_SECT:
+ /* Depending on the authentication state, fill the send buffer */
+ switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState) {
+ case PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY:
+ case PH_FRINFC_MFSTD_FMT_AUTH_KEYB:
+ /* Fill send buffer with the default key */
+ PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_DEF(mem);
+ break;
- case PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY:
- /* Fill send buffer with NFC forum sector key */
- PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_NFCSECT_KEYA(mem);
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY:
+ /* Fill send buffer with NFC forum sector key */
+ PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_NFCSECT_KEYA(mem);
+ break;
- case PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB:
- /* Fill send buffer with NFC forum sector key */
- PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_SCRT_KEY(mem);
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB:
+ /* Fill send buffer with NFC forum sector key */
+ PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_SCRT_KEY(mem);
+ break;
- case PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY:
- default:
- /* Fill send buffer with MAD sector key */
- PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_MADSECT_KEYA(mem);
- break;
- }
- break;
-
- case PH_FRINFC_MFSTD_FMT_RD_SECT_TR:
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareRead;
-
- /* Send length is always one for read operation */
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_1;
- break;
-
- case PH_FRINFC_MFSTD_FMT_WR_SECT_TR:
- /* Fill send buffer for writing sector trailer */
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
- /* Copy the relevant sector trailer value in the buffer */
- switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock) {
- case PH_FRINFC_MFSTD_FMT_VAL_3:
- if (NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) {
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- MADSectTr1k, sizeof(MADSectTr1k));
- } else if (NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_2K_CRD) {
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- MADSectTr2k, sizeof(MADSectTr2k));
- } else {
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- MADSectTr4k, sizeof(MADSectTr4k));
+ case PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY:
+ default:
+ /* Fill send buffer with MAD sector key */
+ PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_MADSECT_KEYA(mem);
+ break;
}
break;
- case 67:
- (void)memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+
+ case PH_FRINFC_MFSTD_FMT_RD_SECT_TR:
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareRead;
+
+ /* Send length is always one for read operation */
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_1;
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_WR_SECT_TR:
+ /* Fill send buffer for writing sector trailer */
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
+ /* Copy the relevant sector trailer value in the buffer */
+ switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock) {
+ case PH_FRINFC_MFSTD_FMT_VAL_3:
+ if (NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) {
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ MADSectTr1k, sizeof(MADSectTr1k));
+ } else if (NdefSmtCrdFmt->CardType ==
+ PH_FRINFC_SMTCRDFMT_MFSTD_2K_CRD) {
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ MADSectTr2k, sizeof(MADSectTr2k));
+ } else {
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
MADSectTr4k, sizeof(MADSectTr4k));
+ }
+ break;
+ case 67:
+ (void)memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ MADSectTr4k, sizeof(MADSectTr4k));
+ break;
+ default:
+ (void)memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ NFCSectTr, sizeof(NFCSectTr));
+ break;
+ }
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_11],
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.ScrtKeyB,
+ sizeof(NdefSmtCrdFmt->AddInfo.MfStdInfo.ScrtKeyB));
+
+ /* Send length is always 17 for write operation */
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
break;
+
+ case PH_FRINFC_MFSTD_FMT_WR_TLV:
+ /* Fill send buffer for writing TLV */
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
+ /* Copy the NDEF message TLV */
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], NDEFMsgTLV,
+ sizeof(NDEFMsgTLV));
+ /* Send length is always 17 for write operation */
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_WR_MAD_BLK:
+ /* Fill send buffer for writing MAD block */
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
+ if ((BlockNo == PH_FRINFC_MFSTD_FMT_VAL_2) || (BlockNo == 65) ||
+ (BlockNo == 66)) {
+ /* MAD block number 2, 65 and 66 has 0x03, 0xE1 in the
+ * first two bytes
+ */
+ MADBlk[PH_FRINFC_MFSTD_FMT_VAL_0] = 0x03;
+ MADBlk[PH_FRINFC_MFSTD_FMT_VAL_1] = 0xE1;
+ }
+ /* Copy the MAD Block values */
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], MADBlk,
+ sizeof(MADBlk));
+ /* Send length is always 17 for write operation */
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK:
default:
- (void)memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- NFCSectTr, sizeof(NFCSectTr));
+ /* Fill send buffer for writing MAD block */
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
+ switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk) {
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_1:
+ memcpy(
+ &NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk,
+ (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_2:
+ memcpy(
+ &NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[16],
+ (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_64:
+ memcpy(
+ &NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[32],
+ (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_65:
+ memcpy(
+ &NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[48],
+ (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_66:
+ default:
+ memcpy(
+ &NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
+ &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[64],
+ (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
+ break;
+ }
break;
- }
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_11],
- NdefSmtCrdFmt->AddInfo.MfStdInfo.ScrtKeyB,
- sizeof(NdefSmtCrdFmt->AddInfo.MfStdInfo.ScrtKeyB));
-
- /* Send length is always 17 for write operation */
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
- break;
-
- case PH_FRINFC_MFSTD_FMT_WR_TLV:
- /* Fill send buffer for writing TLV */
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
- /* Copy the NDEF message TLV */
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], NDEFMsgTLV,
- sizeof(NDEFMsgTLV));
- /* Send length is always 17 for write operation */
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
- break;
-
- case PH_FRINFC_MFSTD_FMT_WR_MAD_BLK:
- /* Fill send buffer for writing MAD block */
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
- if ((BlockNo == PH_FRINFC_MFSTD_FMT_VAL_2) || (BlockNo == 65) ||
- (BlockNo == 66)) {
- /* MAD block number 2, 65 and 66 has 0x03, 0xE1 in the
- * first two bytes
- */
- MADBlk[PH_FRINFC_MFSTD_FMT_VAL_0] = 0x03;
- MADBlk[PH_FRINFC_MFSTD_FMT_VAL_1] = 0xE1;
- }
- /* Copy the MAD Block values */
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], MADBlk,
- sizeof(MADBlk));
- /* Send length is always 17 for write operation */
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
- break;
-
- case PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK:
- default:
- /* Fill send buffer for writing MAD block */
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareWrite16;
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH;
- switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk) {
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_1:
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk,
- (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
- break;
-
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_2:
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[16],
- (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
- break;
-
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_64:
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[32],
- (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
- break;
-
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_65:
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[48],
- (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
- break;
-
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_66:
- default:
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1],
- &NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSectBlk[64],
- (PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH - PH_FRINFC_MFSTD_FMT_VAL_1));
- break;
- }
- break;
}
return;
@@ -472,8 +475,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_Transceive(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_Transceive(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/*set the completion routines for the card operations*/
@@ -501,9 +504,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_CallDisCon(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- NFCSTATUS Status) {
+static NFCSTATUS phFriNfc_MfStd_H_CallDisCon(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt, NFCSTATUS Status) {
NFCSTATUS Result = Status;
/*Set Ndef State*/
@@ -523,8 +525,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_CallCon(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_CallCon(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/*Set Ndef State*/
NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_CON;
@@ -543,8 +545,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ProCon(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ProCon(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t Buffer[1] = {PH_FRINFC_MFSTD_FMT_NDEF_COMPL};
uint8_t index = PH_FRINFC_MFSTD_FMT_VAL_1;
@@ -572,100 +574,102 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ProAuth(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ProAuth(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Depending on the authentication key check the */
switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState) {
- case PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY:
- if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock ==
- PH_FRINFC_MFSTD_FMT_VAL_3) &&
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag ==
- PH_FRINFC_MFSTD_FMT_VAL_0)) {
- /* Authenticate with default key for block 3 is successful,
- * so fill the MAD block of sector 0
- */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = PH_FRINFC_MFSTD_FMT_VAL_1;
- /* Write the MAD block */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
- } else if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock == 67) &&
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag ==
- PH_FRINFC_MFSTD_FMT_VAL_0)) {
- /* Authenticate with default key for block 3 is successful,
- * so fill the MAD block of sector 64
- */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 64;
- /* Write the MAD block */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
- } else {
- /* Not a MAD sector */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag = PH_FRINFC_MFSTD_FMT_VAL_0;
- /* Write the MAD block */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
- }
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY:
+ if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock ==
+ PH_FRINFC_MFSTD_FMT_VAL_3) &&
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag ==
+ PH_FRINFC_MFSTD_FMT_VAL_0)) {
+ /* Authenticate with default key for block 3 is successful,
+ * so fill the MAD block of sector 0
+ */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
+ PH_FRINFC_MFSTD_FMT_VAL_1;
+ /* Write the MAD block */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
+ } else if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock == 67) &&
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag ==
+ PH_FRINFC_MFSTD_FMT_VAL_0)) {
+ /* Authenticate with default key for block 3 is successful,
+ * so fill the MAD block of sector 64
+ */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 64;
+ /* Write the MAD block */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
+ } else {
+ /* Not a MAD sector */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag =
+ PH_FRINFC_MFSTD_FMT_VAL_0;
+ /* Write the MAD block */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
+ }
+ break;
- case PH_FRINFC_MFSTD_FMT_AUTH_KEYB:
- if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_1) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_2) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_64) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_65) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_66)) {
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk;
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK;
- } else {
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
- PH_FRINFC_MFSTD_FMT_NOT_A_MAD_BLK;
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
- }
+ case PH_FRINFC_MFSTD_FMT_AUTH_KEYB:
+ if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_1) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_2) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_64) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_65) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_66)) {
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk;
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK;
+ } else {
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
+ PH_FRINFC_MFSTD_FMT_NOT_A_MAD_BLK;
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
+ }
- break;
+ break;
- case PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB:
- if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_1) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_2) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_64) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_65) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_66)) {
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk;
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK;
- } else {
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
- PH_FRINFC_MFSTD_FMT_NOT_A_MAD_BLK;
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
- }
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB:
+ if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_1) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_2) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_64) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_65) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_66)) {
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk;
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_UPD_MAD_BLK;
+ } else {
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
+ PH_FRINFC_MFSTD_FMT_NOT_A_MAD_BLK;
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
+ }
+ break;
- case PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY:
- case PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY:
- default:
- if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_66) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_2)) {
- /* Updating the MAD block is complete */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
- PH_FRINFC_MFSTD_FMT_NOT_A_MAD_BLK;
- /* If Mifare 4k card, write the TLV */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_TLV;
- } else {
- /* Depending on the sector trailer, check the access bit */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_RD_SECT_TR;
- }
- break;
+ case PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY:
+ case PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY:
+ default:
+ if ((NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_66) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_2)) {
+ /* Updating the MAD block is complete */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
+ PH_FRINFC_MFSTD_FMT_NOT_A_MAD_BLK;
+ /* If Mifare 4k card, write the TLV */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_TLV;
+ } else {
+ /* Depending on the sector trailer, check the access bit */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_RD_SECT_TR;
+ }
+ break;
}
/* Call read, write or authenticate */
Result = phFriNfc_MfStd_H_WrRdAuth(NdefSmtCrdFmt);
@@ -683,8 +687,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ErrWrSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ErrWrSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NdefSmtCrdFmt->FmtProcStatus;
/* If default key A is used for authentication and if write fails, then try to
* authenticate using key B
@@ -713,8 +717,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ProRdSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ProRdSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t Buffer[1] = {PH_FRINFC_MFSTD_FMT_NDEF_COMPL},
index = PH_FRINFC_MFSTD_FMT_VAL_1,
@@ -763,8 +767,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ProWrSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ProWrSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t Buffer[1] = {PH_FRINFC_MFSTD_FMT_NDEF_COMPL},
index = PH_FRINFC_MFSTD_FMT_VAL_1,
@@ -807,7 +811,7 @@
**
*******************************************************************************/
static uint32_t phFriNfc_MfStd_H_ChkAcsBit(uint16_t BlockNo,
- const uint8_t *RecvBuf,
+ const uint8_t* RecvBuf,
const uint8_t AcsBits1[],
const uint8_t AcsBits2[]) {
uint32_t mem = PH_FRINFC_MFSTD_FMT_VAL_0;
@@ -815,11 +819,11 @@
/* Compare the access bits read from the sector trailer */
mem = (uint32_t)(((BlockNo == PH_FRINFC_MFSTD_FMT_VAL_3) || (BlockNo == 67))
? phFriNfc_MfStd_MemCompare(
- (void *)&RecvBuf[PH_FRINFC_MFSTD_FMT_VAL_6],
- (void *)AcsBits1, PH_FRINFC_MFSTD_FMT_VAL_3)
+ (void*)&RecvBuf[PH_FRINFC_MFSTD_FMT_VAL_6],
+ (void*)AcsBits1, PH_FRINFC_MFSTD_FMT_VAL_3)
: phFriNfc_MfStd_MemCompare(
- (void *)&RecvBuf[PH_FRINFC_MFSTD_FMT_VAL_6],
- (void *)AcsBits2, PH_FRINFC_MFSTD_FMT_VAL_3));
+ (void*)&RecvBuf[PH_FRINFC_MFSTD_FMT_VAL_6],
+ (void*)AcsBits2, PH_FRINFC_MFSTD_FMT_VAL_3));
return mem;
}
@@ -834,8 +838,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_WrRdAuth(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_WrRdAuth(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Fill send buffer and send length */
phFriNfc_MfStd_H_FillSendBuf(NdefSmtCrdFmt,
@@ -856,8 +860,8 @@
** Returns none
**
*******************************************************************************/
-static void
-phFriNfc_MfStd_H_ChangeAuthSt(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static void phFriNfc_MfStd_H_ChangeAuthSt(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
uint8_t SectIndex = PH_FRINFC_MFSTD_FMT_VAL_0;
if (NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState ==
@@ -964,47 +968,47 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ProWrMADBlk(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ProWrMADBlk(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock) {
- case PH_FRINFC_MFSTD_FMT_VAL_1:
- /* MAD blocks, still not completed */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
- /* MAD block number 2 */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = PH_FRINFC_MFSTD_FMT_VAL_2;
- break;
+ case PH_FRINFC_MFSTD_FMT_VAL_1:
+ /* MAD blocks, still not completed */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
+ /* MAD block number 2 */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = PH_FRINFC_MFSTD_FMT_VAL_2;
+ break;
- case PH_FRINFC_MFSTD_FMT_VAL_2:
- /* Now write to MAD block is completed */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag = PH_FRINFC_MFSTD_FMT_VAL_1;
- /* Now write the sector trailer, so change the state */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
- /* MAD block number 3 = Sector trailer */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = PH_FRINFC_MFSTD_FMT_VAL_3;
- break;
+ case PH_FRINFC_MFSTD_FMT_VAL_2:
+ /* Now write to MAD block is completed */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag = PH_FRINFC_MFSTD_FMT_VAL_1;
+ /* Now write the sector trailer, so change the state */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
+ /* MAD block number 3 = Sector trailer */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = PH_FRINFC_MFSTD_FMT_VAL_3;
+ break;
- case 64:
- /* MAD blocks, still not completed */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 65;
- break;
+ case 64:
+ /* MAD blocks, still not completed */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 65;
+ break;
- case 65:
- /* MAD blocks, still not completed */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 66;
- break;
+ case 65:
+ /* MAD blocks, still not completed */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_MAD_BLK;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 66;
+ break;
- case 66:
- default:
- /* Now write to MAD block is completed */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag = PH_FRINFC_MFSTD_FMT_VAL_1;
- /* Now write the sector trailer, so change the state */
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 67;
- break;
+ case 66:
+ default:
+ /* Now write to MAD block is completed */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.WrMADBlkFlag = PH_FRINFC_MFSTD_FMT_VAL_1;
+ /* Now write the sector trailer, so change the state */
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_WR_SECT_TR;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock = 67;
+ break;
}
/* Write the block */
Result = phFriNfc_MfStd_H_WrRdAuth(NdefSmtCrdFmt);
@@ -1023,8 +1027,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ProErrAuth(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ProErrAuth(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NdefSmtCrdFmt->FmtProcStatus;
uint8_t Buffer[1] = {PH_FRINFC_MFSTD_FMT_NDEF_COMPL},
index = PH_FRINFC_MFSTD_FMT_VAL_1;
@@ -1073,57 +1077,57 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ProUpdMADBlk(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ProUpdMADBlk(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk) {
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_1:
- /* Write the next MAD Block */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
- (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_2;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
- PH_FRINFC_MFSTD_FMT_MAD_BLK_2;
- break;
-
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_2:
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_66:
- if ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) ||
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock ==
- PH_FRINFC_MFSTD_FMT_MAD_BLK_66)) {
- /* Get the block from where the TLV has to be written */
- phFriNfc_MfStd_H_BlkNoToWrTLV(NdefSmtCrdFmt);
-
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_AUTH_SECT;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState =
- PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY;
- } else {
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_1:
/* Write the next MAD Block */
NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
- (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_64;
+ (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_2;
NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
- PH_FRINFC_MFSTD_FMT_MAD_BLK_64;
- NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_AUTH_SECT;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState =
- PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB;
- }
- break;
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_2;
+ break;
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_64:
- /* Write the next MAD Block */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
- (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_65;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
- PH_FRINFC_MFSTD_FMT_MAD_BLK_65;
- break;
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_2:
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_66:
+ if ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) ||
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock ==
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_66)) {
+ /* Get the block from where the TLV has to be written */
+ phFriNfc_MfStd_H_BlkNoToWrTLV(NdefSmtCrdFmt);
- case PH_FRINFC_MFSTD_FMT_MAD_BLK_65:
- default:
- /* Write the next MAD Block */
- NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
- (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_66;
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
- PH_FRINFC_MFSTD_FMT_MAD_BLK_66;
- break;
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_AUTH_SECT;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState =
+ PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY;
+ } else {
+ /* Write the next MAD Block */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
+ (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_64;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_64;
+ NdefSmtCrdFmt->State = PH_FRINFC_MFSTD_FMT_AUTH_SECT;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState =
+ PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB;
+ }
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_64:
+ /* Write the next MAD Block */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
+ (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_65;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_65;
+ break;
+
+ case PH_FRINFC_MFSTD_FMT_MAD_BLK_65:
+ default:
+ /* Write the next MAD Block */
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.UpdMADBlk =
+ (uint8_t)PH_FRINFC_MFSTD_FMT_MAD_BLK_66;
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock =
+ PH_FRINFC_MFSTD_FMT_MAD_BLK_66;
+ break;
}
Result = phFriNfc_MfStd_H_WrRdAuth(NdefSmtCrdFmt);
return Result;
@@ -1139,8 +1143,8 @@
** Returns none
**
*******************************************************************************/
-static void
-phFriNfc_MfStd_H_StrNdefData(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static void phFriNfc_MfStd_H_StrNdefData(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
uint8_t SectIndex = PH_FRINFC_MFSTD_FMT_VAL_1,
index = PH_FRINFC_MFSTD_FMT_VAL_0;
@@ -1219,8 +1223,8 @@
** Returns none
**
*******************************************************************************/
-static void
-phFriNfc_MfStd_H_BlkNoToWrTLV(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static void phFriNfc_MfStd_H_BlkNoToWrTLV(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
uint8_t SectIndex = (uint8_t)PH_FRINFC_MFSTD_FMT_VAL_1;
while (((SectIndex < (uint8_t)PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_4K) &&
(NdefSmtCrdFmt->CardType ==
@@ -1258,8 +1262,8 @@
** Other values if an error has occurred
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_MfStd_H_ErrRdSectTr(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt) {
+static NFCSTATUS phFriNfc_MfStd_H_ErrRdSectTr(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt) {
NFCSTATUS Result = NdefSmtCrdFmt->FmtProcStatus;
uint8_t Buffer[1] = {PH_FRINFC_MFSTD_FMT_NDEF_COMPL},
index = PH_FRINFC_MFSTD_FMT_VAL_1,
@@ -1314,10 +1318,10 @@
** Not 0 if different
**
*******************************************************************************/
-static int phFriNfc_MfStd_MemCompare(void *s1, void *s2, unsigned int n) {
+static int phFriNfc_MfStd_MemCompare(void* s1, void* s2, unsigned int n) {
int8_t diff = 0;
- int8_t *char_1 = (int8_t *)s1;
- int8_t *char_2 = (int8_t *)s2;
+ int8_t* char_1 = (int8_t*)s1;
+ int8_t* char_2 = (int8_t*)s2;
if (NULL == s1 || NULL == s2) {
LOG(ERROR) << StringPrintf("NULL pointer passed to memcompare");
} else {
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.h b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.h
index 35b2c52..eabcf04 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.h
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifStdFormat.h
@@ -32,14 +32,14 @@
* Mifare standard -progress states
*/
#define PH_FRINFC_MFSTD_FMT_RESET_INIT 0 /* Reset state */
-#define PH_FRINFC_MFSTD_FMT_AUTH_SECT \
+#define PH_FRINFC_MFSTD_FMT_AUTH_SECT \
1 /* Sector authentication is in progress */
#define PH_FRINFC_MFSTD_FMT_DIS_CON 2 /* Disconnect is in progress */
#define PH_FRINFC_MFSTD_FMT_CON 3 /* Connect is in progress */
#define PH_FRINFC_MFSTD_FMT_POLL 4 /* Poll is in progress */
-#define PH_FRINFC_MFSTD_FMT_RD_SECT_TR \
+#define PH_FRINFC_MFSTD_FMT_RD_SECT_TR \
5 /* Read sector trailer is in progress */
-#define PH_FRINFC_MFSTD_FMT_WR_SECT_TR \
+#define PH_FRINFC_MFSTD_FMT_WR_SECT_TR \
6 /* Write sector trailer is in progress */
#define PH_FRINFC_MFSTD_FMT_WR_TLV 7 /* Write sector trailer is in progress */
#define PH_FRINFC_MFSTD_FMT_WR_MAD_BLK 8 /* Write MAD is in progress */
@@ -48,16 +48,16 @@
/*
* Mifare standard -Authenticate states
*/
-#define PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY \
+#define PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY \
0 /* Trying to authenticate with the default key */
-#define PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY \
+#define PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY \
1 /* Trying to authenticate with the MAD key */
-#define PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY \
+#define PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY \
2 /* Trying to authenticate with the NFC forum key */
-#define PH_FRINFC_MFSTD_FMT_AUTH_KEYB \
- 3 /* Trying to authenticate with key B \
+#define PH_FRINFC_MFSTD_FMT_AUTH_KEYB \
+ 3 /* Trying to authenticate with key B \
*/
-#define PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB \
+#define PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB \
4 /* Trying to authenticate with secret key B */
/*
@@ -66,23 +66,23 @@
#define PH_FRINFC_MFSTD_FMT_NOT_A_MAD_BLK 0 /* Not a MAD block */
#define PH_FRINFC_MFSTD_FMT_MAD_BLK_1 1 /* MAD block number 1 */
#define PH_FRINFC_MFSTD_FMT_MAD_BLK_2 2 /* MAD block number 2 */
-#define PH_FRINFC_MFSTD_FMT_MAD_BLK_64 \
+#define PH_FRINFC_MFSTD_FMT_MAD_BLK_64 \
64 /* MAD block number 64 (only used for Mifare 4k card) */
-#define PH_FRINFC_MFSTD_FMT_MAD_BLK_65 \
+#define PH_FRINFC_MFSTD_FMT_MAD_BLK_65 \
65 /* MAD block number 65 (only used for Mifare 4k card) */
-#define PH_FRINFC_MFSTD_FMT_MAD_BLK_66 \
+#define PH_FRINFC_MFSTD_FMT_MAD_BLK_66 \
66 /* MAD block number 66 (only used for Mifare 4k card) */
/*
* Mifare standard - Update MAD block flag
*/
-#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA_ACS_BIT_1K \
+#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA_ACS_BIT_1K \
{ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0x78, 0x77, 0x88, 0xC1 }
-#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA_ACS_BIT_2K \
+#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA_ACS_BIT_2K \
{ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0x78, 0x77, 0x88, 0xC1 }
-#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA_ACS_BIT_4K \
+#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA_ACS_BIT_4K \
{ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0x78, 0x77, 0x88, 0xC2 }
-#define PH_FRINFC_SMTCRDFMT_NFCFORUMSECT_KEYA_ACS_BIT \
+#define PH_FRINFC_SMTCRDFMT_NFCFORUMSECT_KEYA_ACS_BIT \
{ 0xD3, 0xF7, 0xD3, 0xF7, 0xD3, 0xF7, 0x7F, 0x07, 0x88, 0x40 }
/*
@@ -105,22 +105,22 @@
#define PH_FRINFC_MFSTD_FMT_MAD_SECT_ACS8 0x88 /* MAD sector access bits 8 */
#define PH_FRINFC_MFSTD_FMT_MAD_SECT_GPB 0xC1 /* MAD sector GPB */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RW6 \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RW6 \
0x7F /* NFC forum sector access bits 6 for read write */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RW7 \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RW7 \
0x07 /* NFC forum sector access bits 7 for read write */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RW8 \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RW8 \
0x88 /* NFC forum sector access bits 8 for read write */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_GPB_RW \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_GPB_RW \
0x40 /* NFC forum sector GPB for read write */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RO6 \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RO6 \
0x07 /* NFC forum sector access bits 6 for read only */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RO7 \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RO7 \
0x8F /* NFC forum sector access bits 7 for read only */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RO8 \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_ACS_RO8 \
0x0F /* NFC forum sector access bits 8 for read only */
-#define PH_FRINFC_MFSTD_FMT_NFC_SECT_GPB_R0 \
+#define PH_FRINFC_MFSTD_FMT_NFC_SECT_GPB_R0 \
0x43 /* NFC forum sector GPB for read only */
/*
@@ -144,15 +144,15 @@
/*
* Mifare standard - NDEF information constants
*/
-#define PH_FRINFC_MFSTD_FMT_NON_NDEF_COMPL \
- 0 /* Sector is not ndef compliant \
+#define PH_FRINFC_MFSTD_FMT_NON_NDEF_COMPL \
+ 0 /* Sector is not ndef compliant \
*/
#define PH_FRINFC_MFSTD_FMT_NDEF_COMPL 1 /* Sector is ndef compliant */
-#define PH_FRINFC_MFSTD_FMT_NDEF_INFO1 \
- 0x03 /* If sector is ndef compliant, then one of the MAD \
+#define PH_FRINFC_MFSTD_FMT_NDEF_INFO1 \
+ 0x03 /* If sector is ndef compliant, then one of the MAD \
sector byte is 0x03 */
-#define PH_FRINFC_MFSTD_FMT_NDEF_INFO2 \
- 0xE1 /* If sector is ndef compliant, then one of the MAD \
+#define PH_FRINFC_MFSTD_FMT_NDEF_INFO2 \
+ 0xE1 /* If sector is ndef compliant, then one of the MAD \
sector byte is 0xE1 */
/*
@@ -160,17 +160,17 @@
*/
#define PH_FRINFC_MFSTD_FMT_MAX_RECV_LENGTH 252 /* Maximum receive length */
#define PH_FRINFC_MFSTD_FMT_WR_SEND_LENGTH 17 /* Send length for write */
-#define PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_1K \
+#define PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_1K \
16 /* Maximum sector index for Mifare 1k = 16 */
-#define PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_2K \
+#define PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_2K \
32 /* Maximum sector index for Mifare 2k = 32 */
-#define PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_4K \
+#define PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_4K \
40 /* Maximum sector index for Mifare 4k = 40 */
-#define PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_1K \
+#define PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_1K \
64 /* Maximum Number of Blocks for Mifare 1k = 64 */
-#define PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_2K \
+#define PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_2K \
128 /* Maximum Number of Blocks for Mifare 2k = 128 */
-#define PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_4K \
+#define PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_4K \
256 /* Maximum Number of Blocks for Mifare 4k = 256*/
/*
@@ -190,131 +190,131 @@
/*
* NFC forum sector keyA to send buffer
*/
-#define PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_NFCSECT_KEYA(mem) \
- do { \
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.NFCForumSect_KeyA, \
- PH_FRINFC_MFSTD_FMT_VAL_6); \
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareAuthentA; \
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_7; \
+#define PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_NFCSECT_KEYA(mem) \
+ do { \
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.NFCForumSect_KeyA, \
+ PH_FRINFC_MFSTD_FMT_VAL_6); \
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareAuthentA; \
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_7; \
} while (0)
/*
* Copy MAD sector keyA to send buffer
*/
-#define PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_MADSECT_KEYA(mem) \
- do { \
- memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSect_KeyA, \
- PH_FRINFC_MFSTD_FMT_VAL_6); \
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareAuthentA; \
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_7; \
+#define PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_MADSECT_KEYA(mem) \
+ do { \
+ memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.MADSect_KeyA, \
+ PH_FRINFC_MFSTD_FMT_VAL_6); \
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareAuthentA; \
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_7; \
} while (0)
/*
* Copy MAD sector keyB to send buffer
*/
-#define PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_SCRT_KEY(mem) \
- do { \
- (void)memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.ScrtKeyB, \
- PH_FRINFC_MFSTD_FMT_VAL_6); \
- NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareAuthentB; \
- NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_7; \
+#define PH_FRINFC_MFSTD_FMT_AUTH_SEND_BUF_SCRT_KEY(mem) \
+ do { \
+ (void)memcpy(&NdefSmtCrdFmt->SendRecvBuf[PH_FRINFC_MFSTD_FMT_VAL_1], \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.ScrtKeyB, \
+ PH_FRINFC_MFSTD_FMT_VAL_6); \
+ NdefSmtCrdFmt->Cmd.MfCmd = phHal_eMifareAuthentB; \
+ NdefSmtCrdFmt->SendLength = PH_FRINFC_MFSTD_FMT_VAL_7; \
} while (0)
/*
* Get the next block
*/
-#define PH_FRINFC_MFSTD_FMT_CUR_BLK_INC() \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock += \
+#define PH_FRINFC_MFSTD_FMT_CUR_BLK_INC() \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock += \
((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= 127) ? 16 : 4)
/*
* Get the sector index
*/
-#define PH_FRINFC_MFSTD_FMT_SECT_INDEX_CALC \
- ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= 128) \
- ? (32 + ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock - 128) / 16)) \
+#define PH_FRINFC_MFSTD_FMT_SECT_INDEX_CALC \
+ ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= 128) \
+ ? (32 + ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock - 128) / 16)) \
: (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock / 4))
/*
* Check the sector block
*/
-#define PH_FRINFC_MFSTD_FMT_CUR_BLK_CHK \
- (((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) && \
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= \
- PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_1K)) || \
- ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_4K_CRD) && \
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= \
- PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_4K)) || \
- ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_2K_CRD) && \
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= \
+#define PH_FRINFC_MFSTD_FMT_CUR_BLK_CHK \
+ (((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) && \
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= \
+ PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_1K)) || \
+ ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_4K_CRD) && \
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= \
+ PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_4K)) || \
+ ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_2K_CRD) && \
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock >= \
PH_FRINFC_MFSTD_FMT_MAX_BLOCKS_2K)))
/*
* Get the next authenticate state
*/
-#define PH_FRINFC_MFSTD_FMT_NXT_AUTH_STATE() \
- do { \
- switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState) { \
- case PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY: { \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
- (uint8_t)((((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock <= 3) || \
- ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock > 63) && \
- (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock < 67)))) \
- ? PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY \
- : PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY); \
- } break; \
- case PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY: { \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
- PH_FRINFC_MFSTD_FMT_AUTH_KEYB; \
- } break; \
- case PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY: { \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
- PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY; \
- } break; \
- case PH_FRINFC_MFSTD_FMT_AUTH_KEYB: { \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
- PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB; \
- } break; \
- case PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB: \
- default: { \
- NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
- PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY; \
- } break; \
- } \
+#define PH_FRINFC_MFSTD_FMT_NXT_AUTH_STATE() \
+ do { \
+ switch (NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState) { \
+ case PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY: { \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = (uint8_t)( \
+ (((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock <= 3) || \
+ ((NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock > 63) && \
+ (NdefSmtCrdFmt->AddInfo.MfStdInfo.CurrentBlock < 67)))) \
+ ? PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY \
+ : PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY); \
+ } break; \
+ case PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY: { \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
+ PH_FRINFC_MFSTD_FMT_AUTH_KEYB; \
+ } break; \
+ case PH_FRINFC_MFSTD_FMT_AUTH_MAD_KEY: { \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
+ PH_FRINFC_MFSTD_FMT_AUTH_NFC_KEY; \
+ } break; \
+ case PH_FRINFC_MFSTD_FMT_AUTH_KEYB: { \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
+ PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB; \
+ } break; \
+ case PH_FRINFC_MFSTD_FMT_AUTH_SCRT_KEYB: \
+ default: { \
+ NdefSmtCrdFmt->AddInfo.MfStdInfo.AuthState = \
+ PH_FRINFC_MFSTD_FMT_AUTH_DEF_KEY; \
+ } break; \
+ } \
} while (0)
/*
* Increment the sector index
*/
-#define PH_FRINFC_MFSTD_FMT_INCR_SECT \
- do { \
- SectIndex++; \
- SectIndex = \
- (uint8_t)((SectIndex == 16) ? (SectIndex + PH_FRINFC_MFSTD_FMT_VAL_1) \
- : SectIndex); \
+#define PH_FRINFC_MFSTD_FMT_INCR_SECT \
+ do { \
+ SectIndex++; \
+ SectIndex = \
+ (uint8_t)((SectIndex == 16) ? (SectIndex + PH_FRINFC_MFSTD_FMT_VAL_1) \
+ : SectIndex); \
} while (0)
/*
* Increment the sector index
*/
-#define PH_FRINFC_MFSTD_FMT_CHK_SECT_ARRAY \
- do { \
- while ((index < PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_4K) && \
- (memcompare != PH_FRINFC_MFSTD_FMT_VAL_0)) { \
- /* Compare any one among the sectors is NDEF COMPLIANT */ \
- memcompare = (uint32_t)phFriNfc_MfStd_MemCompare( \
- &Buffer[PH_FRINFC_MFSTD_FMT_VAL_0], \
- &NdefSmtCrdFmt->AddInfo.MfStdInfo.SectCompl[index], \
- PH_FRINFC_MFSTD_FMT_VAL_1); \
- /* increment the index */ \
- index += (uint8_t)((index == (PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_1K - \
- PH_FRINFC_MFSTD_FMT_VAL_1)) \
- ? PH_FRINFC_MFSTD_FMT_VAL_2 \
- : PH_FRINFC_MFSTD_FMT_VAL_1); \
- } \
+#define PH_FRINFC_MFSTD_FMT_CHK_SECT_ARRAY \
+ do { \
+ while ((index < PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_4K) && \
+ (memcompare != PH_FRINFC_MFSTD_FMT_VAL_0)) { \
+ /* Compare any one among the sectors is NDEF COMPLIANT */ \
+ memcompare = (uint32_t)phFriNfc_MfStd_MemCompare( \
+ &Buffer[PH_FRINFC_MFSTD_FMT_VAL_0], \
+ &NdefSmtCrdFmt->AddInfo.MfStdInfo.SectCompl[index], \
+ PH_FRINFC_MFSTD_FMT_VAL_1); \
+ /* increment the index */ \
+ index += (uint8_t)((index == (PH_FRINFC_MFSTD_FMT_MAX_SECT_IND_1K - \
+ PH_FRINFC_MFSTD_FMT_VAL_1)) \
+ ? PH_FRINFC_MFSTD_FMT_VAL_2 \
+ : PH_FRINFC_MFSTD_FMT_VAL_1); \
+ } \
} while (0)
/*
@@ -340,9 +340,9 @@
} \
} while (0)
-void phFriNfc_MfStd_Reset(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt);
-NFCSTATUS phFriNfc_MfStd_Format(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- const uint8_t *ScrtKeyB);
-void phFriNfc_MfStd_Process(void *Context, NFCSTATUS Status);
+void phFriNfc_MfStd_Reset(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt);
+NFCSTATUS phFriNfc_MfStd_Format(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
+ const uint8_t* ScrtKeyB);
+void phFriNfc_MfStd_Process(void* Context, NFCSTATUS Status);
#endif /* PHFRINFC_MIFSTDFMT_H */
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
index f6f3baf..78d0ed9 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
@@ -25,104 +25,104 @@
#include <phNxpExtns_MifareStd.h>
/**************** local methods used in this file only ************************/
-static NFCSTATUS phFriNfc_MifStd_H_RdABlock(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_WrABlock(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_AuthSector(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd4k_H_CheckNdef(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_fillAIDarray(phFriNfc_NdefMap_t *NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_RdABlock(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_WrABlock(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_AuthSector(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd4k_H_CheckNdef(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_fillAIDarray(phFriNfc_NdefMap_t* NdefMap);
static uint8_t phFriNfc_MifStd_H_GetSect(uint8_t BlockNumber);
-static NFCSTATUS phFriNfc_MifStd_H_BlkChk(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_RdAcsBit(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ChkAcsBit(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ChkRdWr(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_ChkNdefCmpltSects(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_RemainTLV(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *Flag,
- uint8_t *Temp16Bytes);
-static NFCSTATUS phFriNfc_MifStd_H_ChkIntLen(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_IntLenWioutNdef(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *Flag,
- uint8_t *TempintBytes);
-static uint8_t phFriNfc_MifStd_H_UpdateTLV(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_WriteNdefLen(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_SetNdefBlkAuth(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_RdWrReset(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_RdtoWrNdefLen(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_GetActCardLen(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ChkTLVs(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *CRFlag);
-static NFCSTATUS phFriNfc_MifStd_H_GetNxtTLV(phFriNfc_NdefMap_t *NdefMap,
- uint16_t *TempLength,
- uint8_t *TL4bytesFlag);
-static NFCSTATUS phFriNfc_MifStd_H_Chk16Bytes(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_BlkChk(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_RdAcsBit(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ChkAcsBit(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ChkRdWr(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_ChkNdefCmpltSects(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_RemainTLV(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* Flag,
+ uint8_t* Temp16Bytes);
+static NFCSTATUS phFriNfc_MifStd_H_ChkIntLen(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_IntLenWioutNdef(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* Flag,
+ uint8_t* TempintBytes);
+static uint8_t phFriNfc_MifStd_H_UpdateTLV(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_WriteNdefLen(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_SetNdefBlkAuth(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_RdWrReset(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_RdtoWrNdefLen(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_GetActCardLen(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ChkTLVs(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* CRFlag);
+static NFCSTATUS phFriNfc_MifStd_H_GetNxtTLV(phFriNfc_NdefMap_t* NdefMap,
+ uint16_t* TempLength,
+ uint8_t* TL4bytesFlag);
+static NFCSTATUS phFriNfc_MifStd_H_Chk16Bytes(phFriNfc_NdefMap_t* NdefMap,
uint16_t TempLength);
-static NFCSTATUS phFriNfc_MifStd_H_ChkRemainTLVs(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *CRFlag,
- uint8_t *NDEFFlag);
-static void phFriNfc_MifStd_H_Complete(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_ChkRemainTLVs(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* CRFlag,
+ uint8_t* NDEFFlag);
+static void phFriNfc_MifStd_H_Complete(phFriNfc_NdefMap_t* NdefMap,
NFCSTATUS Result);
-static void phFriNfc_MifStd_H_Get1kStTrail(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_Get4kStTrail(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ProChkNdef(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ProAuth(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_Rd16Bytes(phFriNfc_NdefMap_t *NdefMap,
+static void phFriNfc_MifStd_H_Get1kStTrail(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_Get4kStTrail(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProChkNdef(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProAuth(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_Rd16Bytes(phFriNfc_NdefMap_t* NdefMap,
uint8_t BlockNo);
-static NFCSTATUS phFriNfc_MifStd_H_ProAcsBits(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_GPBChk(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ProStatNotValid(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_ProAcsBits(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_GPBChk(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProStatNotValid(phFriNfc_NdefMap_t* NdefMap,
NFCSTATUS status);
-static NFCSTATUS phFriNfc_MifStd_H_RdBeforeWr(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ProBytesToWr(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_fillSendBuf(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_RdBeforeWr(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProBytesToWr(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_fillSendBuf(phFriNfc_NdefMap_t* NdefMap,
uint8_t Length);
-static NFCSTATUS phFriNfc_MifStd_H_WrTLV(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ProWrTLV(phFriNfc_NdefMap_t *NdefMap);
-static uint8_t phFriNfc_MifStd_H_UpdRemTLV(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_fillTLV1(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_fillTLV2(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_CallWrNdefLen(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_BlkChk_1(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_fillTLV1_1(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd_H_fillTLV2_1(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_RdTLV(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ProRdTLV(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_WrTermTLV(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_ProWrABlock(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_CallConnect(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MifStd_H_CallDisCon(phFriNfc_NdefMap_t *NdefMap);
-static void phFriNfc_MifStd1k_H_BlkChk(phFriNfc_NdefMap_t *NdefMap,
- uint8_t SectorID, uint8_t *callbreak);
+static NFCSTATUS phFriNfc_MifStd_H_WrTLV(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProWrTLV(phFriNfc_NdefMap_t* NdefMap);
+static uint8_t phFriNfc_MifStd_H_UpdRemTLV(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_fillTLV1(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_fillTLV2(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_CallWrNdefLen(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_BlkChk_1(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_fillTLV1_1(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd_H_fillTLV2_1(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_RdTLV(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProRdTLV(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_WrTermTLV(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProWrABlock(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_CallConnect(phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_CallDisCon(phFriNfc_NdefMap_t* NdefMap);
+static void phFriNfc_MifStd1k_H_BlkChk(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t SectorID, uint8_t* callbreak);
static uint8_t phFriNfc_MifStd_H_GetSectorTrailerBlkNo(uint8_t SectorID);
-static NFCSTATUS
-phFriNfc_MifStd_H_ProSectorTrailorAcsBits(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS
-phFriNfc_MifStd_H_WrSectorTrailorBlock(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS
-phFriNfc_MifStd_H_ProWrSectorTrailor(phFriNfc_NdefMap_t *NdefMap);
-static NFCSTATUS phFriNfc_MapTool_ChkSpcVer(const phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_ProSectorTrailorAcsBits(
+ phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_WrSectorTrailorBlock(
+ phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MifStd_H_ProWrSectorTrailor(
+ phFriNfc_NdefMap_t* NdefMap);
+static NFCSTATUS phFriNfc_MapTool_ChkSpcVer(const phFriNfc_NdefMap_t* NdefMap,
uint8_t VersionIndex)
__attribute__((unused));
/* Mifare Standard Mapping - Constants */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT1 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT1 \
0xA0 /* internal Authenticate Command for MAD Sector */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT2 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT2 \
0xA1 /* internal Authenticate Command for MAD Sector */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT3 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT3 \
0xA2 /* internal Authenticate Command for MAD Sector */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT4 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT4 \
0xA3 /* internal Authenticate Command for MAD Sector */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT5 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT5 \
0xA4 /* internal Authenticate Command for MAD Sector */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT6 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_MADSECT6 \
0xA5 /* internal Authenticate Command for MAD Sector */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_NDEFSECT1 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_NDEFSECT1 \
0xD3 /* internal Authenticate Command for NDEF Sectors 1 */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_NDEFSECT2 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_AUTH_NDEFSECT2 \
0xF7 /* internal Authenticate Command for NDEF Sectors 2 */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_NDEF_COMPVAL2 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_NDEF_COMPVAL2 \
0x03 /* internal Ndef Compliant command 1 */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_NDEF_COMPVAL1 \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_NDEF_COMPVAL1 \
0xE1 /* internal Ndef Compliant command 2 */
/* Enable access bits check for the MAD sector
@@ -139,7 +139,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-NFCSTATUS phFriNfc_MapTool_SetCardState(phFriNfc_NdefMap_t *NdefMap,
+NFCSTATUS phFriNfc_MapTool_SetCardState(phFriNfc_NdefMap_t* NdefMap,
uint32_t Length) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
@@ -153,43 +153,43 @@
: PH_NDEFMAP_CARD_STATE_INITIALIZED);
} else {
switch (NdefMap->CardState) {
- case PH_NDEFMAP_CARD_STATE_INITIALIZED:
- NdefMap->CardState =
- (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
- ? NdefMap->CardState
- : PH_NDEFMAP_CARD_STATE_READ_WRITE);
- break;
+ case PH_NDEFMAP_CARD_STATE_INITIALIZED:
+ NdefMap->CardState =
+ (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
+ ? NdefMap->CardState
+ : PH_NDEFMAP_CARD_STATE_READ_WRITE);
+ break;
- case PH_NDEFMAP_CARD_STATE_READ_ONLY:
- NdefMap->CardState =
- (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
- ? NdefMap->CardState
- : PH_NDEFMAP_CARD_STATE_READ_ONLY);
- break;
+ case PH_NDEFMAP_CARD_STATE_READ_ONLY:
+ NdefMap->CardState =
+ (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
+ ? NdefMap->CardState
+ : PH_NDEFMAP_CARD_STATE_READ_ONLY);
+ break;
- case PH_NDEFMAP_CARD_STATE_READ_WRITE:
- NdefMap->CardState =
- (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
- ? NdefMap->CardState
- : PH_NDEFMAP_CARD_STATE_READ_WRITE);
- if (NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD ||
- NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_2K_CARD ||
- NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD) {
- if (NdefMap->StdMifareContainer.ReadOnlySectorIndex &&
- NdefMap->StdMifareContainer.SectorTrailerBlockNo ==
- NdefMap->StdMifareContainer.currentBlock) {
- NdefMap->CardState =
- (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
- ? NdefMap->CardState
- : PH_NDEFMAP_CARD_STATE_READ_ONLY);
+ case PH_NDEFMAP_CARD_STATE_READ_WRITE:
+ NdefMap->CardState =
+ (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
+ ? NdefMap->CardState
+ : PH_NDEFMAP_CARD_STATE_READ_WRITE);
+ if (NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD ||
+ NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_2K_CARD ||
+ NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD) {
+ if (NdefMap->StdMifareContainer.ReadOnlySectorIndex &&
+ NdefMap->StdMifareContainer.SectorTrailerBlockNo ==
+ NdefMap->StdMifareContainer.currentBlock) {
+ NdefMap->CardState =
+ (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
+ ? NdefMap->CardState
+ : PH_NDEFMAP_CARD_STATE_READ_ONLY);
+ }
}
- }
- break;
+ break;
- default:
- NdefMap->CardState = PH_NDEFMAP_CARD_STATE_INVALID;
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_NO_NDEF_SUPPORT);
- break;
+ default:
+ NdefMap->CardState = PH_NDEFMAP_CARD_STATE_INVALID;
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_NO_NDEF_SUPPORT);
+ break;
}
}
Result = ((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID)
@@ -210,7 +210,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-NFCSTATUS phFriNfc_MifareStdMap_H_Reset(phFriNfc_NdefMap_t *NdefMap) {
+NFCSTATUS phFriNfc_MifareStdMap_H_Reset(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
uint8_t index = PH_FRINFC_MIFARESTD_VAL0;
@@ -318,7 +318,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-NFCSTATUS phFriNfc_MifareStdMap_ChkNdef(phFriNfc_NdefMap_t *NdefMap) {
+NFCSTATUS phFriNfc_MifareStdMap_ChkNdef(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_PENDING;
uint8_t atq, sak;
@@ -438,9 +438,9 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-NFCSTATUS phFriNfc_MifareStdMap_RdNdef(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *PacketData,
- uint32_t *PacketDataLength,
+NFCSTATUS phFriNfc_MifareStdMap_RdNdef(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* PacketData,
+ uint32_t* PacketDataLength,
uint8_t Offset) {
NFCSTATUS status = NFCSTATUS_PENDING;
@@ -507,9 +507,9 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-NFCSTATUS phFriNfc_MifareStdMap_WrNdef(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *PacketData,
- uint32_t *PacketDataLength,
+NFCSTATUS phFriNfc_MifareStdMap_WrNdef(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* PacketData,
+ uint32_t* PacketDataLength,
uint8_t Offset) {
NFCSTATUS status = NFCSTATUS_PENDING;
@@ -609,281 +609,285 @@
* Returns void
*
******************************************************************************/
-void phFriNfc_MifareStdMap_Process(void *Context, NFCSTATUS Status) {
- phFriNfc_NdefMap_t *NdefMap;
+void phFriNfc_MifareStdMap_Process(void* Context, NFCSTATUS Status) {
+ phFriNfc_NdefMap_t* NdefMap;
uint8_t NDEFFlag = 0, CRFlag = 0, Temp16Bytes = 0, i = 0;
- NdefMap = (phFriNfc_NdefMap_t *)Context;
+ NdefMap = (phFriNfc_NdefMap_t*)Context;
if ((Status & PHNFCSTBLOWER) == (NFCSTATUS_SUCCESS & PHNFCSTBLOWER)) {
switch (NdefMap->State) {
- case PH_FRINFC_NDEFMAP_STATE_CHK_NDEF_COMP:
- Status = phFriNfc_MifStd_H_ProChkNdef(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
+ case PH_FRINFC_NDEFMAP_STATE_CHK_NDEF_COMP:
+ Status = phFriNfc_MifStd_H_ProChkNdef(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ break;
- case PH_FRINFC_NDEFMAP_STATE_READ:
- /* Receive Length for read shall always be equal to 16 */
- if ((*NdefMap->SendRecvLength == PH_FRINFC_MIFARESTD_BYTES_READ) &&
- (NdefMap->ApduBuffIndex < (uint16_t)NdefMap->ApduBufferSize)) {
- Temp16Bytes = PH_FRINFC_MIFARESTD_VAL0;
- NDEFFlag = (uint8_t)PH_FRINFC_MIFARESTD_FLAG1;
- if (NdefMap->TLVStruct.BytesRemainLinTLV != 0) {
- NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
- CRFlag = PH_FRINFC_MIFARESTD_FLAG0;
- /* To read the remaining length (L) in TLV */
- Status =
- phFriNfc_MifStd_H_RemainTLV(NdefMap, &NDEFFlag, &Temp16Bytes);
+ case PH_FRINFC_NDEFMAP_STATE_READ:
+ /* Receive Length for read shall always be equal to 16 */
+ if ((*NdefMap->SendRecvLength == PH_FRINFC_MIFARESTD_BYTES_READ) &&
+ (NdefMap->ApduBuffIndex < (uint16_t)NdefMap->ApduBufferSize)) {
+ Temp16Bytes = PH_FRINFC_MIFARESTD_VAL0;
+ NDEFFlag = (uint8_t)PH_FRINFC_MIFARESTD_FLAG1;
+ if (NdefMap->TLVStruct.BytesRemainLinTLV != 0) {
+ NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ CRFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ /* To read the remaining length (L) in TLV */
+ Status =
+ phFriNfc_MifStd_H_RemainTLV(NdefMap, &NDEFFlag, &Temp16Bytes);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ }
+
+ /* check the NDEFFlag is set. if this is not set, then
+ in the above RemainTLV function all the 16 bytes has been
+ read */
+ } else {
+ Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP,
+ NFCSTATUS_INVALID_RECEIVE_LENGTH);
+ CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ }
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_WRITE:
+ Status = phFriNfc_MifStd_H_ProWrABlock(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+
+ /* Call Completion Routine if CR Flag is Set to 1 */
+ if (CRFlag == PH_FRINFC_MIFARESTD_FLAG1) {
+ *NdefMap->WrNdefPacketLength = NdefMap->ApduBuffIndex;
+ }
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_AUTH:
+ NdefMap->StdMifareContainer.FirstReadFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ Status = phFriNfc_MifStd_H_ProAuth(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_RD_ACS_BIT:
+ Status = phFriNfc_MifStd_H_ProAcsBits(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN:
+ if (NdefMap->StdMifareContainer.RdAfterWrFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) {
+ Status = phFriNfc_MifStd_H_CallWrNdefLen(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ } else {
+ /* Check this */
+ if (NdefMap->StdMifareContainer.TempBlockNo ==
+ NdefMap->StdMifareContainer.currentBlock) {
+ memcpy(NdefMap->StdMifareContainer.internalBuf,
+ NdefMap->StdMifareContainer.Buffer,
+ NdefMap->StdMifareContainer.internalLength);
+ }
+ *NdefMap->WrNdefPacketLength = NdefMap->ApduBuffIndex;
+ NdefMap->StdMifareContainer.currentBlock =
+ NdefMap->StdMifareContainer.TempBlockNo;
+ NdefMap->CardState = (uint8_t)(
+ (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INITIALIZED)
+ ? PH_NDEFMAP_CARD_STATE_READ_WRITE
+ : NdefMap->CardState);
+ CRFlag = (uint8_t)PH_FRINFC_MIFARESTD_FLAG1;
+ }
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_RD_TO_WR_NDEF_LEN:
+ CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ Status =
+ PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_DEVICE_REQUEST);
+ if (*NdefMap->SendRecvLength == PH_FRINFC_MIFARESTD_BYTES_READ) {
+ /* Size of NdefMap->SendRecvBuf is set by phLibNfc_Gen_NdefMapReset to
+ * PH_LIBNFC_GEN_MAX_BUFFER */
+ /* We don't have to check memory here */
+ for (i = PH_FRINFC_MIFARESTD_BYTES_READ; i > 0; i--) {
+ NdefMap->SendRecvBuf[i] = NdefMap->SendRecvBuf[i - 1];
+ }
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ NdefMap->StdMifareContainer.currentBlock;
+ Status = phFriNfc_MifStd_H_WriteNdefLen(NdefMap);
CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
? PH_FRINFC_MIFARESTD_FLAG1
: PH_FRINFC_MIFARESTD_FLAG0);
}
+ break;
- /* check the NDEFFlag is set. if this is not set, then
- in the above RemainTLV function all the 16 bytes has been
- read */
- } else {
- Status =
- PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_RECEIVE_LENGTH);
- CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- }
- break;
+ case PH_FRINFC_NDEFMAP_STATE_GET_ACT_CARDSIZE:
+ NDEFFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ if (NdefMap->TLVStruct.NoLbytesinTLV > PH_FRINFC_MIFARESTD_VAL0) {
+ NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ Status = phFriNfc_MifStd_H_ChkRemainTLVs(NdefMap, &CRFlag, &NDEFFlag);
+ NdefMap->TLVStruct.NoLbytesinTLV = PH_FRINFC_MIFARESTD_VAL0;
+ }
+ if ((NDEFFlag == PH_FRINFC_MIFARESTD_FLAG1) &&
+ (CRFlag != PH_FRINFC_MIFARESTD_FLAG1)) {
+ Status = phFriNfc_MifStd_H_ChkTLVs(NdefMap, &CRFlag);
+ }
+ if (((NdefMap->StdMifareContainer.ReadNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) ||
+ (NdefMap->StdMifareContainer.WrNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1)) &&
+ (Status != NFCSTATUS_PENDING)) {
+ NdefMap->StdMifareContainer.NFCforumSectFlag =
+ PH_FRINFC_MIFARESTD_FLAG1;
+ CRFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ /* if the card state has changed to initialised and
+ read ndef is called then error is returned */
+ if (((NdefMap->StdMifareContainer.WrNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) &&
+ (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_READ_ONLY)) ||
+ ((NdefMap->StdMifareContainer.ReadNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) &&
+ (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INITIALIZED))) {
+ Status =
+ PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_NO_NDEF_SUPPORT);
+ }
+ if (NdefMap->StdMifareContainer.AuthDone ==
+ PH_FRINFC_MIFARESTD_FLAG0) {
+ Status = phFriNfc_MifStd_H_AuthSector(NdefMap);
+ } else {
+ Status = ((NdefMap->StdMifareContainer.ReadNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1)
+ ? phFriNfc_MifStd_H_RdTLV(NdefMap)
+ : phFriNfc_MifStd_H_RdBeforeWr(NdefMap));
+ }
+ NdefMap->StdMifareContainer.ReadNdefFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ NdefMap->StdMifareContainer.WrNdefFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ }
- case PH_FRINFC_NDEFMAP_STATE_WRITE:
- Status = phFriNfc_MifStd_H_ProWrABlock(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
+ if (NdefMap->StdMifareContainer.ChkNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) {
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ }
+ break;
- /* Call Completion Routine if CR Flag is Set to 1 */
- if (CRFlag == PH_FRINFC_MIFARESTD_FLAG1) {
- *NdefMap->WrNdefPacketLength = NdefMap->ApduBuffIndex;
- }
- break;
-
- case PH_FRINFC_NDEFMAP_STATE_AUTH:
- NdefMap->StdMifareContainer.FirstReadFlag = PH_FRINFC_MIFARESTD_FLAG0;
- Status = phFriNfc_MifStd_H_ProAuth(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
-
- case PH_FRINFC_NDEFMAP_STATE_RD_ACS_BIT:
- Status = phFriNfc_MifStd_H_ProAcsBits(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
-
- case PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN:
- if (NdefMap->StdMifareContainer.RdAfterWrFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) {
- Status = phFriNfc_MifStd_H_CallWrNdefLen(NdefMap);
+ case PH_FRINFC_NDEFMAP_STATE_RD_BEF_WR:
+ /* Read flag says that already part of TLV has been written */
+ Status = phFriNfc_MifStd_H_ProBytesToWr(NdefMap);
CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
? PH_FRINFC_MIFARESTD_FLAG1
: PH_FRINFC_MIFARESTD_FLAG0);
- } else {
- /* Check this */
- if (NdefMap->StdMifareContainer.TempBlockNo ==
- NdefMap->StdMifareContainer.currentBlock) {
- memcpy(NdefMap->StdMifareContainer.internalBuf,
- NdefMap->StdMifareContainer.Buffer,
- NdefMap->StdMifareContainer.internalLength);
- }
- *NdefMap->WrNdefPacketLength = NdefMap->ApduBuffIndex;
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_WR_TLV:
+ Status = phFriNfc_MifStd_H_ProWrTLV(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_RD_TLV:
+ Status = phFriNfc_MifStd_H_ProRdTLV(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_TERM_TLV:
+ phFriNfc_MifStd_H_SetNdefBlkAuth(NdefMap);
NdefMap->StdMifareContainer.currentBlock =
- NdefMap->StdMifareContainer.TempBlockNo;
- NdefMap->CardState =
- (uint8_t)((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INITIALIZED)
- ? PH_NDEFMAP_CARD_STATE_READ_WRITE
- : NdefMap->CardState);
- CRFlag = (uint8_t)PH_FRINFC_MIFARESTD_FLAG1;
- }
- break;
-
- case PH_FRINFC_NDEFMAP_STATE_RD_TO_WR_NDEF_LEN:
- CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- Status =
- PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_DEVICE_REQUEST);
- if (*NdefMap->SendRecvLength == PH_FRINFC_MIFARESTD_BYTES_READ) {
- /* Size of NdefMap->SendRecvBuf is set by phLibNfc_Gen_NdefMapReset to
- * PH_LIBNFC_GEN_MAX_BUFFER */
- /* We don't have to check memory here */
- for (i = PH_FRINFC_MIFARESTD_BYTES_READ; i > 0; i--) {
- NdefMap->SendRecvBuf[i] = NdefMap->SendRecvBuf[i - 1];
- }
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- NdefMap->StdMifareContainer.currentBlock;
- Status = phFriNfc_MifStd_H_WriteNdefLen(NdefMap);
+ NdefMap->TLVStruct.NdefTLVBlock;
+ Status = phFriNfc_MifStd_H_RdtoWrNdefLen(NdefMap);
CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
? PH_FRINFC_MIFARESTD_FLAG1
: PH_FRINFC_MIFARESTD_FLAG0);
- }
- break;
+ break;
- case PH_FRINFC_NDEFMAP_STATE_GET_ACT_CARDSIZE:
- NDEFFlag = PH_FRINFC_MIFARESTD_FLAG1;
- if (NdefMap->TLVStruct.NoLbytesinTLV > PH_FRINFC_MIFARESTD_VAL0) {
- NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
- Status = phFriNfc_MifStd_H_ChkRemainTLVs(NdefMap, &CRFlag, &NDEFFlag);
- NdefMap->TLVStruct.NoLbytesinTLV = PH_FRINFC_MIFARESTD_VAL0;
- }
- if ((NDEFFlag == PH_FRINFC_MIFARESTD_FLAG1) &&
- (CRFlag != PH_FRINFC_MIFARESTD_FLAG1)) {
- Status = phFriNfc_MifStd_H_ChkTLVs(NdefMap, &CRFlag);
- }
- if (((NdefMap->StdMifareContainer.ReadNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) ||
- (NdefMap->StdMifareContainer.WrNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1)) &&
- (Status != NFCSTATUS_PENDING)) {
- NdefMap->StdMifareContainer.NFCforumSectFlag =
- PH_FRINFC_MIFARESTD_FLAG1;
- CRFlag = PH_FRINFC_MIFARESTD_FLAG0;
- /* if the card state has changed to initialised and
- read ndef is called then error is returned */
- if (((NdefMap->StdMifareContainer.WrNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) &&
- (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_READ_ONLY)) ||
- ((NdefMap->StdMifareContainer.ReadNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) &&
- (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INITIALIZED))) {
- Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_NO_NDEF_SUPPORT);
- }
- if (NdefMap->StdMifareContainer.AuthDone == PH_FRINFC_MIFARESTD_FLAG0) {
+ case PH_FRINFC_NDEFMAP_STATE_DISCONNECT:
+ NdefMap->StdMifareContainer.PollFlag = PH_FRINFC_MIFARESTD_FLAG0;
+
+ Status = phFriNfc_MifStd_H_CallConnect(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ break;
+
+ case PH_FRINFC_NDEFMAP_STATE_CONNECT:
+ if (NdefMap->StdMifareContainer.FirstReadFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) {
+ NdefMap->StdMifareContainer.FirstReadFlag = PH_FRINFC_MIFARESTD_FLAG0;
Status = phFriNfc_MifStd_H_AuthSector(NdefMap);
+ } else if ((NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD ||
+ NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD ||
+ NdefMap->CardType ==
+ PH_FRINFC_NDEFMAP_MIFARE_STD_2K_CARD) &&
+ (NdefMap->StdMifareContainer.ReadOnlySectorIndex &&
+ NdefMap->StdMifareContainer.SectorTrailerBlockNo ==
+ NdefMap->StdMifareContainer.currentBlock)) {
+ NdefMap->StdMifareContainer.ReadOnlySectorIndex =
+ PH_FRINFC_MIFARESTD_FLAG0;
+ NdefMap->StdMifareContainer.SectorTrailerBlockNo =
+ PH_FRINFC_MIFARESTD_FLAG0;
+ NdefMap->StdMifareContainer.currentBlock = PH_FRINFC_MIFARESTD_FLAG0;
+ Status = NFCSTATUS_FAILED;
} else {
- Status = ((NdefMap->StdMifareContainer.ReadNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1)
- ? phFriNfc_MifStd_H_RdTLV(NdefMap)
- : phFriNfc_MifStd_H_RdBeforeWr(NdefMap));
+ Status =
+ ((((NdefMap->Offset == PH_FRINFC_NDEFMAP_SEEK_CUR) &&
+ (NdefMap->PrevOperation == PH_FRINFC_NDEFMAP_WRITE_OPE)) ||
+ (NdefMap->StdMifareContainer.WrLength >
+ PH_FRINFC_MIFARESTD_VAL0))
+ ? phFriNfc_MifStd_H_ProStatNotValid(NdefMap, Status)
+ : phFriNfc_MifStd_H_AuthSector(NdefMap));
}
- NdefMap->StdMifareContainer.ReadNdefFlag = PH_FRINFC_MIFARESTD_FLAG0;
- NdefMap->StdMifareContainer.WrNdefFlag = PH_FRINFC_MIFARESTD_FLAG0;
- }
-
- if (NdefMap->StdMifareContainer.ChkNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) {
CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
? PH_FRINFC_MIFARESTD_FLAG1
: PH_FRINFC_MIFARESTD_FLAG0);
- }
- break;
+ break;
- case PH_FRINFC_NDEFMAP_STATE_RD_BEF_WR:
- /* Read flag says that already part of TLV has been written */
- Status = phFriNfc_MifStd_H_ProBytesToWr(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
+ case PH_FRINFC_NDEFMAP_STATE_RD_SEC_ACS_BIT:
+ Status = phFriNfc_MifStd_H_ProSectorTrailorAcsBits(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ if ((CRFlag == PH_FRINFC_MIFARESTD_FLAG1) &&
+ (NdefMap->StdMifareContainer.WriteAcsBitFlag ==
+ PH_FRINFC_MIFARESTD_FLAG0)) {
+ Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP,
+ NFCSTATUS_INVALID_DEVICE_REQUEST);
+ }
+ break;
- case PH_FRINFC_NDEFMAP_STATE_WR_TLV:
- Status = phFriNfc_MifStd_H_ProWrTLV(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
+ case PH_FRINFC_NDEFMAP_STATE_WRITE_SEC:
+ /* Set flag for writing of Acs bit */
+ NdefMap->StdMifareContainer.WriteAcsBitFlag = PH_FRINFC_MIFARESTD_FLAG1;
- case PH_FRINFC_NDEFMAP_STATE_RD_TLV:
- Status = phFriNfc_MifStd_H_ProRdTLV(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
+ /* The first NDEF sector is already made read only,
+ set card state to read only and proceed*/
+ if (NdefMap->CardState != PH_NDEFMAP_CARD_STATE_READ_ONLY) {
+ Status = phFriNfc_MapTool_SetCardState(
+ NdefMap, NdefMap->TLVStruct.BytesRemainLinTLV);
+ if (Status != NFCSTATUS_SUCCESS) {
+ CRFlag = (uint8_t)PH_FRINFC_MIFARESTD_FLAG1;
+ }
+ }
- case PH_FRINFC_NDEFMAP_STATE_TERM_TLV:
- phFriNfc_MifStd_H_SetNdefBlkAuth(NdefMap);
- NdefMap->StdMifareContainer.currentBlock =
- NdefMap->TLVStruct.NdefTLVBlock;
- Status = phFriNfc_MifStd_H_RdtoWrNdefLen(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
+ if (CRFlag != PH_FRINFC_MIFARESTD_FLAG1) {
+ Status = phFriNfc_MifStd_H_ProWrSectorTrailor(NdefMap);
+ CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
+ ? PH_FRINFC_MIFARESTD_FLAG1
+ : PH_FRINFC_MIFARESTD_FLAG0);
+ }
+ break;
- case PH_FRINFC_NDEFMAP_STATE_DISCONNECT:
- NdefMap->StdMifareContainer.PollFlag = PH_FRINFC_MIFARESTD_FLAG0;
-
- Status = phFriNfc_MifStd_H_CallConnect(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
-
- case PH_FRINFC_NDEFMAP_STATE_CONNECT:
- if (NdefMap->StdMifareContainer.FirstReadFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) {
- NdefMap->StdMifareContainer.FirstReadFlag = PH_FRINFC_MIFARESTD_FLAG0;
- Status = phFriNfc_MifStd_H_AuthSector(NdefMap);
- } else if ((NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD ||
- NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD ||
- NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_2K_CARD) &&
- (NdefMap->StdMifareContainer.ReadOnlySectorIndex &&
- NdefMap->StdMifareContainer.SectorTrailerBlockNo ==
- NdefMap->StdMifareContainer.currentBlock)) {
- NdefMap->StdMifareContainer.ReadOnlySectorIndex =
- PH_FRINFC_MIFARESTD_FLAG0;
- NdefMap->StdMifareContainer.SectorTrailerBlockNo =
- PH_FRINFC_MIFARESTD_FLAG0;
- NdefMap->StdMifareContainer.currentBlock = PH_FRINFC_MIFARESTD_FLAG0;
- Status = NFCSTATUS_FAILED;
- } else {
- Status =
- ((((NdefMap->Offset == PH_FRINFC_NDEFMAP_SEEK_CUR) &&
- (NdefMap->PrevOperation == PH_FRINFC_NDEFMAP_WRITE_OPE)) ||
- (NdefMap->StdMifareContainer.WrLength > PH_FRINFC_MIFARESTD_VAL0))
- ? phFriNfc_MifStd_H_ProStatNotValid(NdefMap, Status)
- : phFriNfc_MifStd_H_AuthSector(NdefMap));
- }
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- break;
-
- case PH_FRINFC_NDEFMAP_STATE_RD_SEC_ACS_BIT:
- Status = phFriNfc_MifStd_H_ProSectorTrailorAcsBits(NdefMap);
- CRFlag =
- (uint8_t)((Status != NFCSTATUS_PENDING) ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- if ((CRFlag == PH_FRINFC_MIFARESTD_FLAG1) &&
- (NdefMap->StdMifareContainer.WriteAcsBitFlag ==
- PH_FRINFC_MIFARESTD_FLAG0)) {
+ default:
Status =
PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_DEVICE_REQUEST);
- }
- break;
-
- case PH_FRINFC_NDEFMAP_STATE_WRITE_SEC:
- /* Set flag for writing of Acs bit */
- NdefMap->StdMifareContainer.WriteAcsBitFlag = PH_FRINFC_MIFARESTD_FLAG1;
-
- /* The first NDEF sector is already made read only,
- set card state to read only and proceed*/
- if (NdefMap->CardState != PH_NDEFMAP_CARD_STATE_READ_ONLY) {
- Status = phFriNfc_MapTool_SetCardState(
- NdefMap, NdefMap->TLVStruct.BytesRemainLinTLV);
- if (Status != NFCSTATUS_SUCCESS) {
- CRFlag = (uint8_t)PH_FRINFC_MIFARESTD_FLAG1;
- }
- }
-
- if (CRFlag != PH_FRINFC_MIFARESTD_FLAG1) {
- Status = phFriNfc_MifStd_H_ProWrSectorTrailor(NdefMap);
- CRFlag = (uint8_t)((Status != NFCSTATUS_PENDING)
- ? PH_FRINFC_MIFARESTD_FLAG1
- : PH_FRINFC_MIFARESTD_FLAG0);
- }
- break;
-
- default:
- Status =
- PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_DEVICE_REQUEST);
- CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- break;
+ CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ break;
}
} else if (NdefMap->State == PH_FRINFC_NDEFMAP_STATE_AUTH) {
NdefMap->StdMifareContainer.PollFlag = PH_FRINFC_MIFARESTD_FLAG1;
@@ -927,7 +931,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_RdABlock(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_RdABlock(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_PENDING;
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_READ;
@@ -936,7 +940,6 @@
NdefMap->MapCompletionInfo.Context = NdefMap;
if (NdefMap->ApduBuffIndex < (uint16_t)NdefMap->ApduBufferSize) {
-
if (NdefMap->StdMifareContainer.internalLength > PH_FRINFC_MIFARESTD_VAL0) {
status = phFriNfc_MifStd_H_ChkIntLen(NdefMap);
} /* internal Length Check */
@@ -985,7 +988,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_WrABlock(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_WrABlock(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_PENDING;
uint16_t RemainingBytes = 0, BytesRemained = 0, index = 0;
@@ -1119,7 +1122,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_AuthSector(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_AuthSector(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_PENDING;
NdefMap->MapCompletionInfo.CompletionRoutine = phFriNfc_MifareStdMap_Process;
@@ -1213,7 +1216,7 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_Complete(phFriNfc_NdefMap_t *NdefMap,
+static void phFriNfc_MifStd_H_Complete(phFriNfc_NdefMap_t* NdefMap,
NFCSTATUS Result) {
/* set the state back to the Reset_Init state */
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_RESET_INIT;
@@ -1235,7 +1238,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd4k_H_CheckNdef(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd4k_H_CheckNdef(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Get the AID Block */
@@ -1263,7 +1266,7 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_fillAIDarray(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_fillAIDarray(phFriNfc_NdefMap_t* NdefMap) {
uint8_t byteindex = 0;
if ((NdefMap->StdMifareContainer.currentBlock ==
@@ -1363,7 +1366,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_BlkChk(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_BlkChk(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t SectorID = 0, callbreak = 0;
@@ -1506,7 +1509,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_RdAcsBit(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_RdAcsBit(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_RD_ACS_BIT;
@@ -1543,7 +1546,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ChkAcsBit(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ChkAcsBit(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Blocks from 0 to 3 and from 64 to 67(MAD blocks) */
@@ -1640,79 +1643,79 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ChkRdWr(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ChkRdWr(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
switch (NdefMap->PrevOperation) {
- case PH_FRINFC_NDEFMAP_CHECK_OPE:
- if (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID) {
- /* No permission to read */
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_READ_FAILED);
- } else if ((NdefMap->StdMifareContainer.currentBlock > 3) &&
- (NdefMap->StdMifareContainer.ChkNdefCompleteFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) &&
- (NdefMap->StdMifareContainer.currentBlock !=
- PH_FRINFC_MIFARESTD_MAD_BLK65) &&
- (NdefMap->StdMifareContainer.currentBlock !=
- PH_FRINFC_MIFARESTD_MAD_BLK66)) {
- Result = ((NdefMap->StdMifareContainer.ReadAcsBitFlag ==
- PH_FRINFC_MIFARESTD_FLAG0)
- ? phFriNfc_MifStd_H_RdAcsBit(NdefMap)
- : phFriNfc_MifStd_H_AuthSector(NdefMap));
- } else {
- Result = phFriNfc_MifareStdMap_ChkNdef(NdefMap);
- }
- break;
+ case PH_FRINFC_NDEFMAP_CHECK_OPE:
+ if (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID) {
+ /* No permission to read */
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_READ_FAILED);
+ } else if ((NdefMap->StdMifareContainer.currentBlock > 3) &&
+ (NdefMap->StdMifareContainer.ChkNdefCompleteFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) &&
+ (NdefMap->StdMifareContainer.currentBlock !=
+ PH_FRINFC_MIFARESTD_MAD_BLK65) &&
+ (NdefMap->StdMifareContainer.currentBlock !=
+ PH_FRINFC_MIFARESTD_MAD_BLK66)) {
+ Result = ((NdefMap->StdMifareContainer.ReadAcsBitFlag ==
+ PH_FRINFC_MIFARESTD_FLAG0)
+ ? phFriNfc_MifStd_H_RdAcsBit(NdefMap)
+ : phFriNfc_MifStd_H_AuthSector(NdefMap));
+ } else {
+ Result = phFriNfc_MifareStdMap_ChkNdef(NdefMap);
+ }
+ break;
- case PH_FRINFC_NDEFMAP_READ_OPE:
- if (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID) {
- /* No permission to Read */
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_READ_FAILED);
- } else if (NdefMap->StdMifareContainer.ReadNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) {
- Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
- } else {
- Result = phFriNfc_MifStd_H_RdABlock(NdefMap);
- }
- break;
+ case PH_FRINFC_NDEFMAP_READ_OPE:
+ if (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID) {
+ /* No permission to Read */
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_READ_FAILED);
+ } else if (NdefMap->StdMifareContainer.ReadNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) {
+ Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
+ } else {
+ Result = phFriNfc_MifStd_H_RdABlock(NdefMap);
+ }
+ break;
- case PH_FRINFC_NDEFMAP_WRITE_OPE:
- if ((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID) ||
- (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_READ_ONLY)) {
- /* No permission to Read */
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_WRITE_FAILED);
- } else if (NdefMap->StdMifareContainer.WrNdefFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) {
- Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
- } else if (NdefMap->StdMifareContainer.RdBeforeWrFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) {
- /*NdefMap->StdMifareContainer.ReadFlag =
- PH_FRINFC_MIFARESTD_FLAG0;*/
- Result = phFriNfc_MifStd_H_RdBeforeWr(NdefMap);
- } else if (NdefMap->StdMifareContainer.RdAfterWrFlag ==
- PH_FRINFC_MIFARESTD_FLAG1) {
- Result = phFriNfc_MifStd_H_RdtoWrNdefLen(NdefMap);
- } else {
- Result = (((NdefMap->TLVStruct.NdefTLVBlock ==
- NdefMap->StdMifareContainer.currentBlock) &&
- (NdefMap->Offset == PH_FRINFC_NDEFMAP_SEEK_BEGIN))
- ? phFriNfc_MifStd_H_RdBeforeWr(NdefMap)
- : phFriNfc_MifStd_H_WrABlock(NdefMap));
- }
- break;
+ case PH_FRINFC_NDEFMAP_WRITE_OPE:
+ if ((NdefMap->CardState == PH_NDEFMAP_CARD_STATE_INVALID) ||
+ (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_READ_ONLY)) {
+ /* No permission to Read */
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_WRITE_FAILED);
+ } else if (NdefMap->StdMifareContainer.WrNdefFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) {
+ Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
+ } else if (NdefMap->StdMifareContainer.RdBeforeWrFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) {
+ /*NdefMap->StdMifareContainer.ReadFlag =
+ PH_FRINFC_MIFARESTD_FLAG0;*/
+ Result = phFriNfc_MifStd_H_RdBeforeWr(NdefMap);
+ } else if (NdefMap->StdMifareContainer.RdAfterWrFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) {
+ Result = phFriNfc_MifStd_H_RdtoWrNdefLen(NdefMap);
+ } else {
+ Result = (((NdefMap->TLVStruct.NdefTLVBlock ==
+ NdefMap->StdMifareContainer.currentBlock) &&
+ (NdefMap->Offset == PH_FRINFC_NDEFMAP_SEEK_BEGIN))
+ ? phFriNfc_MifStd_H_RdBeforeWr(NdefMap)
+ : phFriNfc_MifStd_H_WrABlock(NdefMap));
+ }
+ break;
- case PH_FRINFC_NDEFMAP_GET_ACTSIZE_OPE:
- Result =
- ((NdefMap->StdMifareContainer.ReadFlag == PH_FRINFC_MIFARESTD_FLAG0)
- ? (PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_READ_FAILED))
- : phFriNfc_MifStd_H_GetActCardLen(NdefMap));
- break;
+ case PH_FRINFC_NDEFMAP_GET_ACTSIZE_OPE:
+ Result =
+ ((NdefMap->StdMifareContainer.ReadFlag == PH_FRINFC_MIFARESTD_FLAG0)
+ ? (PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_READ_FAILED))
+ : phFriNfc_MifStd_H_GetActCardLen(NdefMap));
+ break;
- default:
- /* Operation is not correct */
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_PARAMETER);
+ default:
+ /* Operation is not correct */
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_PARAMETER);
- break;
+ break;
}
return Result;
@@ -1727,7 +1730,7 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_ChkNdefCmpltSects(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_ChkNdefCmpltSects(phFriNfc_NdefMap_t* NdefMap) {
uint8_t index = 0;
uint8_t index_max_4k_2k = 0;
if (NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD) {
@@ -1789,9 +1792,9 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_RemainTLV(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *Flag,
- uint8_t *Temp16Bytes) {
+static NFCSTATUS phFriNfc_MifStd_H_RemainTLV(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* Flag,
+ uint8_t* Temp16Bytes) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t CRFlag = 0;
uint16_t RemainingBytes = 0;
@@ -1992,7 +1995,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ChkIntLen(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ChkIntLen(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t NDEFFlag = PH_FRINFC_MIFARESTD_FLAG1;
uint8_t TempintBytes = 0;
@@ -2021,9 +2024,9 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_IntLenWioutNdef(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *Flag,
- uint8_t *TempintBytes) {
+static NFCSTATUS phFriNfc_MifStd_H_IntLenWioutNdef(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* Flag,
+ uint8_t* TempintBytes) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t CRFlag = 0;
uint16_t RemainingBytes = 0;
@@ -2231,7 +2234,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_WriteNdefLen(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_WriteNdefLen(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN;
@@ -2241,7 +2244,6 @@
if (NdefMap->StdMifareContainer.currentBlock ==
NdefMap->TLVStruct.NdefTLVBlock) {
-
if (NdefMap->TLVStruct.NULLTLVCount >= PH_FRINFC_MIFARESTD_VAL2) {
phFriNfc_MifStd_H_fillTLV1(NdefMap);
} else {
@@ -2282,7 +2284,7 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_RdWrReset(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_RdWrReset(phFriNfc_NdefMap_t* NdefMap) {
NdefMap->StdMifareContainer.currentBlock = PH_FRINFC_MIFARESTD_BLK4;
NdefMap->StdMifareContainer.NdefBlocks = PH_FRINFC_MIFARESTD_VAL1;
NdefMap->TLVStruct.BytesRemainLinTLV = PH_FRINFC_MIFARESTD_VAL0;
@@ -2316,7 +2318,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_RdtoWrNdefLen(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_RdtoWrNdefLen(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_RD_TO_WR_NDEF_LEN;
@@ -2349,7 +2351,7 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_SetNdefBlkAuth(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_SetNdefBlkAuth(phFriNfc_NdefMap_t* NdefMap) {
NdefMap->TLVStruct.NdefTLVAuthFlag =
((phFriNfc_MifStd_H_GetSect(NdefMap->TLVStruct.NdefTLVBlock) ==
phFriNfc_MifStd_H_GetSect(NdefMap->StdMifareContainer.currentBlock))
@@ -2368,7 +2370,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_GetActCardLen(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_GetActCardLen(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_GET_ACT_CARDSIZE;
@@ -2391,8 +2393,8 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ChkTLVs(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *CRFlag) {
+static NFCSTATUS phFriNfc_MifStd_H_ChkTLVs(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* CRFlag) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint16_t TempLength = PH_FRINFC_MIFARESTD_VAL0,
ShiftLength = PH_FRINFC_MIFARESTD_VAL0;
@@ -2660,9 +2662,9 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_GetNxtTLV(phFriNfc_NdefMap_t *NdefMap,
- uint16_t *TempLength,
- uint8_t *TL4bytesFlag) {
+static NFCSTATUS phFriNfc_MifStd_H_GetNxtTLV(phFriNfc_NdefMap_t* NdefMap,
+ uint16_t* TempLength,
+ uint8_t* TL4bytesFlag) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint16_t LengthRemaining = PH_FRINFC_MIFARESTD_VAL0,
TempLen = PH_FRINFC_MIFARESTD_VAL0,
@@ -2738,7 +2740,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_Chk16Bytes(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_Chk16Bytes(phFriNfc_NdefMap_t* NdefMap,
uint16_t TempLength) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
@@ -2766,146 +2768,152 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ChkRemainTLVs(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *CRFlag,
- uint8_t *NDEFFlag) {
+static NFCSTATUS phFriNfc_MifStd_H_ChkRemainTLVs(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* CRFlag,
+ uint8_t* NDEFFlag) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint16_t TempLength = PH_FRINFC_MIFARESTD_VAL0,
ShiftLength = PH_FRINFC_MIFARESTD_VAL0;
uint8_t TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG0;
switch (NdefMap->TLVStruct.NoLbytesinTLV) {
- case PH_FRINFC_MIFARESTD_VAL3:
- /* if TLV is found then set card state */
- Result = ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1)
- ? phFriNfc_MapTool_SetCardState(
- NdefMap, NdefMap->SendRecvBuf[TempLength])
- : Result);
-
- Result = ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1)
- ? 1
- : Result);
-
- /* Check the length field is less than or
- equal to 0xFF if yes enter below statement
- else enter else if*/
- if ((NdefMap->SendRecvBuf[TempLength] < PH_FRINFC_MIFARESTD_NDEFTLV_L) &&
- (Result == NFCSTATUS_SUCCESS)) {
- NdefMap->StdMifareContainer.remainingSize -= PH_FRINFC_MIFARESTD_VAL2;
+ case PH_FRINFC_MIFARESTD_VAL3:
+ /* if TLV is found then set card state */
+ Result =
+ ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1)
+ ? phFriNfc_MapTool_SetCardState(NdefMap,
+ NdefMap->SendRecvBuf[TempLength])
+ : Result);
Result =
- ((NdefMap->SendRecvBuf[TempLength] >
- NdefMap->StdMifareContainer.remainingSize)
- ? (PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT))
+ ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1)
+ ? 1
: Result);
- TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG0;
- if ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1) &&
+
+ /* Check the length field is less than or
+ equal to 0xFF if yes enter below statement
+ else enter else if*/
+ if ((NdefMap->SendRecvBuf[TempLength] < PH_FRINFC_MIFARESTD_NDEFTLV_L) &&
(Result == NFCSTATUS_SUCCESS)) {
- NdefMap->TLVStruct.BytesRemainLinTLV = NdefMap->SendRecvBuf[TempLength];
- *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ NdefMap->StdMifareContainer.remainingSize -= PH_FRINFC_MIFARESTD_VAL2;
- } else if (Result == NFCSTATUS_SUCCESS) {
- TempLength++;
Result =
- phFriNfc_MifStd_H_GetNxtTLV(NdefMap, &TempLength, &TL4bytesFlag);
+ ((NdefMap->SendRecvBuf[TempLength] >
+ NdefMap->StdMifareContainer.remainingSize)
+ ? (PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT))
+ : Result);
+ TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ if ((NdefMap->TLVStruct.NdefTLVFoundFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) &&
+ (Result == NFCSTATUS_SUCCESS)) {
+ NdefMap->TLVStruct.BytesRemainLinTLV =
+ NdefMap->SendRecvBuf[TempLength];
+ *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- NdefMap->StdMifareContainer.remainingSize -=
- NdefMap->SendRecvBuf[TempLength];
- if ((TempLength >= PH_FRINFC_MIFARESTD_BYTES_READ) &&
- (*CRFlag == PH_FRINFC_MIFARESTD_FLAG0)) {
+ } else if (Result == NFCSTATUS_SUCCESS) {
+ TempLength++;
+ Result =
+ phFriNfc_MifStd_H_GetNxtTLV(NdefMap, &TempLength, &TL4bytesFlag);
+
+ NdefMap->StdMifareContainer.remainingSize -=
+ NdefMap->SendRecvBuf[TempLength];
+ if ((TempLength >= PH_FRINFC_MIFARESTD_BYTES_READ) &&
+ (*CRFlag == PH_FRINFC_MIFARESTD_FLAG0)) {
+ *NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
+ }
+ }
+
+ else {
+ /* do nothing */
+ }
+ } else if ((NdefMap->SendRecvBuf[TempLength] ==
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) &&
+ (Result == NFCSTATUS_SUCCESS)) {
+ TempLength++;
+ NdefMap->StdMifareContainer.remainingSize -= PH_FRINFC_MIFARESTD_VAL4;
+ TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ Result =
+ (((((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]) >
+ NdefMap->StdMifareContainer.remainingSize)
+ ? (PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT))
+ : Result);
+ if ((NdefMap->TLVStruct.NdefTLVFoundFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) &&
+ (Result == NFCSTATUS_SUCCESS)) {
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
+ NdefMap->TLVStruct.BytesRemainLinTLV =
+ (((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]);
+ *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ } else if (Result == NFCSTATUS_SUCCESS) {
+ TempLength++;
+
+ Result =
+ phFriNfc_MifStd_H_GetNxtTLV(NdefMap, &TempLength, &TL4bytesFlag);
+ NdefMap->StdMifareContainer.remainingSize -=
+ (((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]);
+
+ *NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
+ } else {
+ /* do nothing */
+ *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ }
+ } else {
+ /* Result = Error */
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT);
+ *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ }
+ break;
+
+ case PH_FRINFC_MIFARESTD_VAL2:
+ case PH_FRINFC_MIFARESTD_VAL1:
+ ShiftLength =
+ ((NdefMap->TLVStruct.NoLbytesinTLV == PH_FRINFC_MIFARESTD_VAL1)
+ ? ((NdefMap->TLVStruct.prevLenByteValue << 8) +
+ NdefMap->SendRecvBuf[TempLength])
+ : (((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
+ NdefMap
+ ->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]));
+ if ((((NdefMap->StdMifareContainer.NoOfNdefCompBlocks -
+ NdefMap->StdMifareContainer.NdefBlocks) *
+ PH_FRINFC_MIFARESTD_BLOCK_BYTES) +
+ (PH_FRINFC_MIFARESTD_BLOCK_BYTES - TempLength)) < ShiftLength) {
+ /* Result = Error */
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_PARAMETER);
+ *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ } else {
+ NdefMap->StdMifareContainer.remainingSize -= PH_FRINFC_MIFARESTD_VAL2;
+ if (NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1) {
+ NdefMap->TLVStruct.BytesRemainLinTLV = ShiftLength;
+ if (NdefMap->TLVStruct.BytesRemainLinTLV >
+ NdefMap->StdMifareContainer.remainingSize) {
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT);
+ }
+ *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ *NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ } else {
+ NdefMap->StdMifareContainer.remainingSize -= ShiftLength;
+ *CRFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ TempLength += PH_FRINFC_MIFARESTD_VAL2;
+ TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG1;
+ Result = ((NdefMap->TLVStruct.NdefTLVFoundFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1)
+ ? NFCSTATUS_SUCCESS
+ : phFriNfc_MifStd_H_GetNxtTLV(NdefMap, &TempLength,
+ &TL4bytesFlag));
+
*NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
}
}
+ break;
- else {
- /* do nothing */
- }
- } else if ((NdefMap->SendRecvBuf[TempLength] ==
- PH_FRINFC_MIFARESTD_NDEFTLV_L) &&
- (Result == NFCSTATUS_SUCCESS)) {
- TempLength++;
- NdefMap->StdMifareContainer.remainingSize -= PH_FRINFC_MIFARESTD_VAL4;
- TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG0;
- Result =
- (((((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]) >
- NdefMap->StdMifareContainer.remainingSize)
- ? (PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT))
- : Result);
- if ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1) &&
- (Result == NFCSTATUS_SUCCESS)) {
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
- NdefMap->TLVStruct.BytesRemainLinTLV =
- (((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]);
- *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- } else if (Result == NFCSTATUS_SUCCESS) {
- TempLength++;
-
- Result =
- phFriNfc_MifStd_H_GetNxtTLV(NdefMap, &TempLength, &TL4bytesFlag);
- NdefMap->StdMifareContainer.remainingSize -=
- (((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]);
-
- *NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
- Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
- } else {
- /* do nothing */
- *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- }
- } else {
- /* Result = Error */
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT);
- *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- }
- break;
-
- case PH_FRINFC_MIFARESTD_VAL2:
- case PH_FRINFC_MIFARESTD_VAL1:
- ShiftLength =
- ((NdefMap->TLVStruct.NoLbytesinTLV == PH_FRINFC_MIFARESTD_VAL1)
- ? ((NdefMap->TLVStruct.prevLenByteValue << 8) +
- NdefMap->SendRecvBuf[TempLength])
- : (((uint16_t)NdefMap->SendRecvBuf[TempLength] << 8) +
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]));
- if ((((NdefMap->StdMifareContainer.NoOfNdefCompBlocks -
- NdefMap->StdMifareContainer.NdefBlocks) *
- PH_FRINFC_MIFARESTD_BLOCK_BYTES) +
- (PH_FRINFC_MIFARESTD_BLOCK_BYTES - TempLength)) < ShiftLength) {
- /* Result = Error */
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_PARAMETER);
- *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- } else {
- NdefMap->StdMifareContainer.remainingSize -= PH_FRINFC_MIFARESTD_VAL2;
- if (NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1) {
- NdefMap->TLVStruct.BytesRemainLinTLV = ShiftLength;
- if (NdefMap->TLVStruct.BytesRemainLinTLV >
- NdefMap->StdMifareContainer.remainingSize) {
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT);
- }
- *CRFlag = PH_FRINFC_MIFARESTD_FLAG1;
- *NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
- } else {
- NdefMap->StdMifareContainer.remainingSize -= ShiftLength;
- *CRFlag = PH_FRINFC_MIFARESTD_FLAG0;
- TempLength += PH_FRINFC_MIFARESTD_VAL2;
- TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG1;
- Result =
- ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1)
- ? NFCSTATUS_SUCCESS
- : phFriNfc_MifStd_H_GetNxtTLV(NdefMap, &TempLength,
- &TL4bytesFlag));
-
- *NDEFFlag = PH_FRINFC_MIFARESTD_FLAG0;
- Result = phFriNfc_MifStd_H_GetActCardLen(NdefMap);
- }
- }
- break;
-
- default:
- break;
+ default:
+ break;
}
return Result;
@@ -2919,30 +2927,30 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_Get1kStTrail(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_Get1kStTrail(phFriNfc_NdefMap_t* NdefMap) {
switch ((NdefMap->StdMifareContainer.currentBlock % 4)) {
- case PH_FRINFC_MIFARESTD_VAL0:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock +
- PH_FRINFC_MIFARESTD_MAD_BLK3);
- break;
+ case PH_FRINFC_MIFARESTD_VAL0:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_MAD_BLK3);
+ break;
- case PH_FRINFC_MIFARESTD_VAL1:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock +
- PH_FRINFC_MIFARESTD_MAD_BLK2);
- break;
+ case PH_FRINFC_MIFARESTD_VAL1:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_MAD_BLK2);
+ break;
- case PH_FRINFC_MIFARESTD_VAL2:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock +
- PH_FRINFC_MIFARESTD_MAD_BLK1);
- break;
+ case PH_FRINFC_MIFARESTD_VAL2:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_MAD_BLK1);
+ break;
- default:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- NdefMap->StdMifareContainer.currentBlock;
- break;
+ default:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ NdefMap->StdMifareContainer.currentBlock;
+ break;
}
return;
@@ -2956,90 +2964,96 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_Get4kStTrail(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_Get4kStTrail(phFriNfc_NdefMap_t* NdefMap) {
switch ((NdefMap->StdMifareContainer.currentBlock % 16)) {
- case PH_FRINFC_MIFARESTD_MAD_BLK0:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK15);
- break;
+ case PH_FRINFC_MIFARESTD_MAD_BLK0:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_BLK15);
+ break;
- case PH_FRINFC_MIFARESTD_MAD_BLK1:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK14);
- break;
+ case PH_FRINFC_MIFARESTD_MAD_BLK1:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_BLK14);
+ break;
- case PH_FRINFC_MIFARESTD_MAD_BLK2:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK13);
- break;
+ case PH_FRINFC_MIFARESTD_MAD_BLK2:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_BLK13);
+ break;
- case PH_FRINFC_MIFARESTD_MAD_BLK3:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK12);
- break;
+ case PH_FRINFC_MIFARESTD_MAD_BLK3:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_BLK12);
+ break;
- case PH_FRINFC_MIFARESTD_BLK4:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK11);
- break;
+ case PH_FRINFC_MIFARESTD_BLK4:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_BLK11);
+ break;
- case PH_FRINFC_MIFARESTD_BLK5:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK10);
- break;
+ case PH_FRINFC_MIFARESTD_BLK5:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_BLK10);
+ break;
- case PH_FRINFC_MIFARESTD_BLK6:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK9);
- break;
+ case PH_FRINFC_MIFARESTD_BLK6:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK9);
+ break;
- case PH_FRINFC_MIFARESTD_BLK7:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK8);
- break;
+ case PH_FRINFC_MIFARESTD_BLK7:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK8);
+ break;
- case PH_FRINFC_MIFARESTD_BLK8:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK7);
- break;
+ case PH_FRINFC_MIFARESTD_BLK8:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK7);
+ break;
- case PH_FRINFC_MIFARESTD_BLK9:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK6);
- break;
+ case PH_FRINFC_MIFARESTD_BLK9:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK6);
+ break;
- case PH_FRINFC_MIFARESTD_BLK10:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK5);
- break;
+ case PH_FRINFC_MIFARESTD_BLK10:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK5);
+ break;
- case PH_FRINFC_MIFARESTD_BLK11:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK4);
- break;
+ case PH_FRINFC_MIFARESTD_BLK11:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_BLK4);
+ break;
- case PH_FRINFC_MIFARESTD_BLK12:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock +
- PH_FRINFC_MIFARESTD_MAD_BLK3);
- break;
+ case PH_FRINFC_MIFARESTD_BLK12:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_MAD_BLK3);
+ break;
- case PH_FRINFC_MIFARESTD_BLK13:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock +
- PH_FRINFC_MIFARESTD_MAD_BLK2);
- break;
+ case PH_FRINFC_MIFARESTD_BLK13:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_MAD_BLK2);
+ break;
- case PH_FRINFC_MIFARESTD_BLK14:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- (NdefMap->StdMifareContainer.currentBlock +
- PH_FRINFC_MIFARESTD_MAD_BLK1);
- break;
+ case PH_FRINFC_MIFARESTD_BLK14:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ (NdefMap->StdMifareContainer.currentBlock +
+ PH_FRINFC_MIFARESTD_MAD_BLK1);
+ break;
- default:
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
- NdefMap->StdMifareContainer.currentBlock;
- break;
+ default:
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL0] =
+ NdefMap->StdMifareContainer.currentBlock;
+ break;
}
return;
@@ -3054,7 +3068,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProChkNdef(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProChkNdef(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Copy remaining bytes into the AID array
@@ -3136,7 +3150,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProAuth(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProAuth(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
if (NdefMap->TLVStruct.NdefTLVAuthFlag == PH_FRINFC_MIFARESTD_FLAG1) {
@@ -3161,7 +3175,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_Rd16Bytes(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_Rd16Bytes(phFriNfc_NdefMap_t* NdefMap,
uint8_t BlockNo) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
@@ -3189,7 +3203,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProAcsBits(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProAcsBits(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t CRFlag = PH_FRINFC_MIFARESTD_FLAG0;
@@ -3314,7 +3328,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_GPBChk(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_GPBChk(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Spec version needs to be checked every time (Version check is not enabled)
@@ -3367,7 +3381,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProStatNotValid(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_ProStatNotValid(phFriNfc_NdefMap_t* NdefMap,
NFCSTATUS status) {
NFCSTATUS Result = status;
@@ -3438,35 +3452,36 @@
NdefMap->StdMifareContainer.ProprforumSectFlag =
PH_FRINFC_MIFARESTD_PROP_2ND_CONFIG;
switch (NdefMap->PrevOperation) {
- case PH_FRINFC_NDEFMAP_CHECK_OPE:
- case PH_FRINFC_NDEFMAP_GET_ACTSIZE_OPE:
- Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_NO_NDEF_SUPPORT);
- break;
-
- case PH_FRINFC_NDEFMAP_READ_OPE:
- if ((NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG1) &&
- (NdefMap->TLVStruct.NoLbytesinTLV == PH_FRINFC_MIFARESTD_VAL0)) {
- *NdefMap->NumOfBytesRead = NdefMap->ApduBuffIndex;
- Result = NFCSTATUS_SUCCESS;
- } else {
+ case PH_FRINFC_NDEFMAP_CHECK_OPE:
+ case PH_FRINFC_NDEFMAP_GET_ACTSIZE_OPE:
Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_NO_NDEF_SUPPORT);
- }
- break;
+ break;
- case PH_FRINFC_NDEFMAP_WRITE_OPE:
- default:
- /* This means the further write is not possible,
- EOF_NDEF_CONTAINER_REACHED */
- NdefMap->StdMifareContainer.ReadWriteCompleteFlag =
- PH_FRINFC_MIFARESTD_FLAG1;
- /* Write the length to the L field in the TLV */
- NdefMap->StdMifareContainer.TempBlockNo =
- NdefMap->StdMifareContainer.currentBlock;
- phFriNfc_MifStd_H_SetNdefBlkAuth(NdefMap);
- NdefMap->StdMifareContainer.currentBlock =
- NdefMap->TLVStruct.NdefTLVBlock;
- Result = phFriNfc_MifStd_H_RdtoWrNdefLen(NdefMap);
- break;
+ case PH_FRINFC_NDEFMAP_READ_OPE:
+ if ((NdefMap->TLVStruct.NdefTLVFoundFlag ==
+ PH_FRINFC_MIFARESTD_FLAG1) &&
+ (NdefMap->TLVStruct.NoLbytesinTLV == PH_FRINFC_MIFARESTD_VAL0)) {
+ *NdefMap->NumOfBytesRead = NdefMap->ApduBuffIndex;
+ Result = NFCSTATUS_SUCCESS;
+ } else {
+ Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_NO_NDEF_SUPPORT);
+ }
+ break;
+
+ case PH_FRINFC_NDEFMAP_WRITE_OPE:
+ default:
+ /* This means the further write is not possible,
+ EOF_NDEF_CONTAINER_REACHED */
+ NdefMap->StdMifareContainer.ReadWriteCompleteFlag =
+ PH_FRINFC_MIFARESTD_FLAG1;
+ /* Write the length to the L field in the TLV */
+ NdefMap->StdMifareContainer.TempBlockNo =
+ NdefMap->StdMifareContainer.currentBlock;
+ phFriNfc_MifStd_H_SetNdefBlkAuth(NdefMap);
+ NdefMap->StdMifareContainer.currentBlock =
+ NdefMap->TLVStruct.NdefTLVBlock;
+ Result = phFriNfc_MifStd_H_RdtoWrNdefLen(NdefMap);
+ break;
}
}
@@ -3482,7 +3497,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_RdBeforeWr(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_RdBeforeWr(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_RD_BEF_WR;
@@ -3504,7 +3519,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProBytesToWr(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProBytesToWr(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t TempLength = PH_FRINFC_MIFARESTD_VAL0;
@@ -3547,7 +3562,7 @@
* Returns uint8_t TempLength
*
******************************************************************************/
-static uint8_t phFriNfc_MifStd_H_UpdateTLV(phFriNfc_NdefMap_t *NdefMap) {
+static uint8_t phFriNfc_MifStd_H_UpdateTLV(phFriNfc_NdefMap_t* NdefMap) {
uint8_t TempLength = PH_FRINFC_MIFARESTD_VAL0;
TempLength =
@@ -3564,42 +3579,42 @@
}
} else {
switch ((PH_FRINFC_MIFARESTD_BYTES_READ - TempLength)) {
- case PH_FRINFC_MIFARESTD_VAL0:
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- break;
+ case PH_FRINFC_MIFARESTD_VAL0:
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ break;
- case PH_FRINFC_MIFARESTD_VAL1:
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->TLVStruct.prevLenByteValue = (uint16_t)(
- (NdefMap->SendRecvBuf[TempLength] >= PH_FRINFC_MIFARESTD_NDEFTLV_L)
- ? PH_FRINFC_MIFARESTD_VAL0
- : NdefMap->SendRecvBuf[TempLength]);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- break;
+ case PH_FRINFC_MIFARESTD_VAL1:
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->TLVStruct.prevLenByteValue = (uint16_t)(
+ (NdefMap->SendRecvBuf[TempLength] >= PH_FRINFC_MIFARESTD_NDEFTLV_L)
+ ? PH_FRINFC_MIFARESTD_VAL0
+ : NdefMap->SendRecvBuf[TempLength]);
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ break;
- case PH_FRINFC_MIFARESTD_VAL2:
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->TLVStruct.prevLenByteValue = (uint16_t)(
- (NdefMap->SendRecvBuf[TempLength] >= PH_FRINFC_MIFARESTD_NDEFTLV_L)
- ? NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]
- : NdefMap->SendRecvBuf[TempLength]);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- break;
+ case PH_FRINFC_MIFARESTD_VAL2:
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->TLVStruct.prevLenByteValue = (uint16_t)(
+ (NdefMap->SendRecvBuf[TempLength] >= PH_FRINFC_MIFARESTD_NDEFTLV_L)
+ ? NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]
+ : NdefMap->SendRecvBuf[TempLength]);
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ break;
- default:
- NdefMap->TLVStruct.prevLenByteValue = NdefMap->SendRecvBuf[TempLength];
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
- break;
+ default:
+ NdefMap->TLVStruct.prevLenByteValue = NdefMap->SendRecvBuf[TempLength];
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
+ break;
}
}
@@ -3615,7 +3630,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_fillSendBuf(phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MifStd_H_fillSendBuf(phFriNfc_NdefMap_t* NdefMap,
uint8_t Length) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint16_t RemainingBytes = PH_FRINFC_MIFARESTD_VAL0,
@@ -3702,7 +3717,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_WrTLV(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_WrTLV(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->MapCompletionInfo.CompletionRoutine = phFriNfc_MifareStdMap_Process;
@@ -3731,7 +3746,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProWrTLV(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProWrTLV(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Check that if complete TLV has been written in the
@@ -3844,7 +3859,7 @@
* Returns uint8_t TempLength : length value
*
******************************************************************************/
-static uint8_t phFriNfc_MifStd_H_UpdRemTLV(phFriNfc_NdefMap_t *NdefMap) {
+static uint8_t phFriNfc_MifStd_H_UpdRemTLV(phFriNfc_NdefMap_t* NdefMap) {
uint8_t TempLength = PH_FRINFC_MIFARESTD_VAL1;
if (NdefMap->TLVStruct.NULLTLVCount >= PH_FRINFC_MIFARESTD_VAL2) {
@@ -3853,41 +3868,45 @@
} else {
switch (
(PH_FRINFC_MIFARESTD_BLOCK_BYTES - NdefMap->TLVStruct.NdefTLVByte)) {
- case PH_FRINFC_MIFARESTD_VAL1:
- NdefMap->TLVStruct.prevLenByteValue =
- (((NdefMap->SendRecvBuf[TempLength] == PH_FRINFC_MIFARESTD_NDEFTLV_L))
- ? (((uint16_t)NdefMap
- ->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]
- << PH_FRINFC_MIFARESTD_LEFTSHIFT8) +
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL2)])
- : NdefMap->SendRecvBuf[TempLength]);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
- break;
+ case PH_FRINFC_MIFARESTD_VAL1:
+ NdefMap->TLVStruct.prevLenByteValue =
+ (((NdefMap->SendRecvBuf[TempLength] ==
+ PH_FRINFC_MIFARESTD_NDEFTLV_L))
+ ? (((uint16_t)NdefMap
+ ->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)]
+ << PH_FRINFC_MIFARESTD_LEFTSHIFT8) +
+ NdefMap
+ ->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL2)])
+ : NdefMap->SendRecvBuf[TempLength]);
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
+ break;
- case PH_FRINFC_MIFARESTD_VAL2:
- NdefMap->TLVStruct.prevLenByteValue =
- (((NdefMap->SendRecvBuf[TempLength] == PH_FRINFC_MIFARESTD_NDEFTLV_L))
- ? (((uint16_t)NdefMap->SendRecvBuf[TempLength]
- << PH_FRINFC_MIFARESTD_LEFTSHIFT8) +
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)])
- : NdefMap->SendRecvBuf[TempLength]);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
- break;
+ case PH_FRINFC_MIFARESTD_VAL2:
+ NdefMap->TLVStruct.prevLenByteValue =
+ (((NdefMap->SendRecvBuf[TempLength] ==
+ PH_FRINFC_MIFARESTD_NDEFTLV_L))
+ ? (((uint16_t)NdefMap->SendRecvBuf[TempLength]
+ << PH_FRINFC_MIFARESTD_LEFTSHIFT8) +
+ NdefMap
+ ->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)])
+ : NdefMap->SendRecvBuf[TempLength]);
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
+ break;
- case PH_FRINFC_MIFARESTD_VAL3:
- default:
- NdefMap->TLVStruct.prevLenByteValue =
- ((NdefMap->TLVStruct.prevLenByteValue
- << PH_FRINFC_MIFARESTD_LEFTSHIFT8) +
- NdefMap->SendRecvBuf[TempLength]);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
- break;
+ case PH_FRINFC_MIFARESTD_VAL3:
+ default:
+ NdefMap->TLVStruct.prevLenByteValue =
+ ((NdefMap->TLVStruct.prevLenByteValue
+ << PH_FRINFC_MIFARESTD_LEFTSHIFT8) +
+ NdefMap->SendRecvBuf[TempLength]);
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L0;
+ break;
}
}
@@ -3903,7 +3922,7 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_fillTLV1(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_fillTLV1(phFriNfc_NdefMap_t* NdefMap) {
uint8_t TempLength =
(uint8_t)(NdefMap->TLVStruct.NdefTLVByte + PH_FRINFC_MIFARESTD_VAL1);
@@ -3914,85 +3933,91 @@
NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG1;
switch (NdefMap->TLVStruct.NdefTLVByte) {
- case PH_FRINFC_MIFARESTD_VAL0:
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ case PH_FRINFC_MIFARESTD_VAL0:
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ }
+ break;
+
+ case PH_FRINFC_MIFARESTD_VAL1:
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ NdefMap->SendRecvBuf[TempLength - PH_FRINFC_MIFARESTD_VAL1] =
+ PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ }
+ break;
+
+ case PH_FRINFC_MIFARESTD_VAL15:
+ /* if "Type" of TLV present at byte 15 */
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ /* Update the null TLV, ndef TLV block and ndef TLV byte */
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte =
+ (TempLength - PH_FRINFC_MIFARESTD_VAL3);
+
+ NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL2)] =
+ PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL1)] =
+ PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ }
+ break;
+
+ default:
+ /* Already the TLV is present so just append the length field */
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ /* Update the null TLV, ndef TLV block and ndef TLV byte */
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte =
+ (TempLength - PH_FRINFC_MIFARESTD_VAL3);
+
+ NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL2)] =
+ (uint8_t)PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL1)] =
+ (uint8_t)PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ }
NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
- }
- break;
-
- case PH_FRINFC_MIFARESTD_VAL1:
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- NdefMap->SendRecvBuf[TempLength - PH_FRINFC_MIFARESTD_VAL1] =
- PH_FRINFC_MIFARESTD_NDEFTLV_L;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
- }
- break;
-
- case PH_FRINFC_MIFARESTD_VAL15:
- /* if "Type" of TLV present at byte 15 */
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- /* Update the null TLV, ndef TLV block and ndef TLV byte */
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
- NdefMap->TLVStruct.NdefTLVBlock =
- NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = (TempLength - PH_FRINFC_MIFARESTD_VAL3);
-
- NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL2)] =
- PH_FRINFC_MIFARESTD_NDEFTLV_T;
- NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL1)] =
- PH_FRINFC_MIFARESTD_NDEFTLV_L;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- }
- break;
-
- default:
- /* Already the TLV is present so just append the length field */
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- /* Update the null TLV, ndef TLV block and ndef TLV byte */
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
- NdefMap->TLVStruct.NdefTLVBlock =
- NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = (TempLength - PH_FRINFC_MIFARESTD_VAL3);
-
- NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL2)] =
- (uint8_t)PH_FRINFC_MIFARESTD_NDEFTLV_T;
- NdefMap->SendRecvBuf[(TempLength - PH_FRINFC_MIFARESTD_VAL1)] =
- (uint8_t)PH_FRINFC_MIFARESTD_NDEFTLV_L;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- NdefMap->SendRecvBuf[(TempLength + PH_FRINFC_MIFARESTD_VAL1)] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- }
- NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
- break;
+ break;
}
return;
@@ -4007,7 +4032,7 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_fillTLV2(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_fillTLV2(phFriNfc_NdefMap_t* NdefMap) {
uint8_t TempLength =
(uint8_t)(NdefMap->TLVStruct.NdefTLVByte + PH_FRINFC_MIFARESTD_VAL1);
@@ -4017,82 +4042,88 @@
: NdefMap->ApduBuffIndex);
NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG1;
switch (NdefMap->TLVStruct.NdefTLVByte) {
- case PH_FRINFC_MIFARESTD_VAL13:
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
+ case PH_FRINFC_MIFARESTD_VAL13:
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
- /* Update the null TLV, ndef TLV block and ndef TLV byte */
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
- NdefMap->TLVStruct.NdefTLVBlock =
- NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = (TempLength - PH_FRINFC_MIFARESTD_VAL1);
+ /* Update the null TLV, ndef TLV block and ndef TLV byte */
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte =
+ (TempLength - PH_FRINFC_MIFARESTD_VAL1);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- }
- break;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ }
+ break;
- case PH_FRINFC_MIFARESTD_VAL14:
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- }
- break;
+ case PH_FRINFC_MIFARESTD_VAL14:
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ }
+ break;
- case PH_FRINFC_MIFARESTD_VAL15:
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- }
- break;
+ case PH_FRINFC_MIFARESTD_VAL15:
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ }
+ break;
- default:
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
+ default:
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
- /* Update the null TLV, ndef TLV block and ndef TLV byte */
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
- NdefMap->TLVStruct.NdefTLVBlock =
- NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = (TempLength - PH_FRINFC_MIFARESTD_VAL1);
+ /* Update the null TLV, ndef TLV block and ndef TLV byte */
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte =
+ (TempLength - PH_FRINFC_MIFARESTD_VAL1);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- }
- NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
- break;
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ }
+ NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
+ break;
}
return;
@@ -4108,7 +4139,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_CallWrNdefLen(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_CallWrNdefLen(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
if (NdefMap->TLVStruct.NULLTLVCount >= PH_FRINFC_MIFARESTD_VAL2) {
@@ -4154,7 +4185,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_BlkChk_1(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_BlkChk_1(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t SectorID = PH_FRINFC_MIFARESTD_VAL0;
@@ -4219,40 +4250,42 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_fillTLV1_1(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_fillTLV1_1(phFriNfc_NdefMap_t* NdefMap) {
switch (NdefMap->TLVStruct.NdefTLVByte) {
- case PH_FRINFC_MIFARESTD_VAL0:
- /* In the first write ndef length procedure, the
- length is updated, in this case T and L = 0xFF of TLV are
- updated */
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
- NdefMap->TLVStruct.NdefTLVBlock = NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = PH_FRINFC_MIFARESTD_VAL14;
+ case PH_FRINFC_MIFARESTD_VAL0:
+ /* In the first write ndef length procedure, the
+ length is updated, in this case T and L = 0xFF of TLV are
+ updated */
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte = PH_FRINFC_MIFARESTD_VAL14;
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL15] =
- PH_FRINFC_MIFARESTD_NDEFTLV_T;
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL16] =
- PH_FRINFC_MIFARESTD_NDEFTLV_L;
- break;
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL15] =
+ PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL16] =
+ PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ break;
- case PH_FRINFC_MIFARESTD_VAL1:
- /* In the first write ndef length procedure, the
- length is updated, in this case T of TLV is
- updated */
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
- NdefMap->TLVStruct.NdefTLVBlock = NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = PH_FRINFC_MIFARESTD_VAL15;
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL16] =
- PH_FRINFC_MIFARESTD_NDEFTLV_T;
- break;
+ case PH_FRINFC_MIFARESTD_VAL1:
+ /* In the first write ndef length procedure, the
+ length is updated, in this case T of TLV is
+ updated */
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL0;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte = PH_FRINFC_MIFARESTD_VAL15;
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL16] =
+ PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ break;
- case PH_FRINFC_MIFARESTD_VAL15:
- default:
- /* In the first ndef write length, part of the L field or only T
- (if update length is less than 255) is updated */
- NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL1] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- break;
+ case PH_FRINFC_MIFARESTD_VAL15:
+ default:
+ /* In the first ndef write length, part of the L field or only T
+ (if update length is less than 255) is updated */
+ NdefMap->SendRecvBuf[PH_FRINFC_MIFARESTD_VAL1] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ break;
}
NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
@@ -4268,64 +4301,68 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd_H_fillTLV2_1(phFriNfc_NdefMap_t *NdefMap) {
+static void phFriNfc_MifStd_H_fillTLV2_1(phFriNfc_NdefMap_t* NdefMap) {
uint8_t TempLength = PH_FRINFC_MIFARESTD_VAL1;
switch (NdefMap->TLVStruct.NdefTLVByte) {
- case PH_FRINFC_MIFARESTD_VAL13:
- /* In last write ndef length, part of length (L) field of TLV
- is updated now */
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- break;
+ case PH_FRINFC_MIFARESTD_VAL13:
+ /* In last write ndef length, part of length (L) field of TLV
+ is updated now */
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ break;
- case PH_FRINFC_MIFARESTD_VAL14:
- /* In last write ndef length, part of length (L) field of TLV
- is updated now */
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- } else {
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
- NdefMap->TLVStruct.NdefTLVBlock =
- NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = (TempLength - PH_FRINFC_MIFARESTD_VAL1);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- }
- break;
+ case PH_FRINFC_MIFARESTD_VAL14:
+ /* In last write ndef length, part of length (L) field of TLV
+ is updated now */
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ } else {
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte =
+ (TempLength - PH_FRINFC_MIFARESTD_VAL1);
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ }
+ break;
- case PH_FRINFC_MIFARESTD_VAL15:
- default:
- if (NdefMap->TLVStruct.prevLenByteValue >= PH_FRINFC_MIFARESTD_NDEFTLV_L) {
- /* In last write ndef length, only T of TLV is updated and
- length (L) field of TLV is updated now */
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
- PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- } else {
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
- TempLength++;
- NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
- NdefMap->TLVStruct.NdefTLVBlock =
- NdefMap->StdMifareContainer.currentBlock;
- NdefMap->TLVStruct.NdefTLVByte = (TempLength - PH_FRINFC_MIFARESTD_VAL1);
- NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
- TempLength++;
- NdefMap->SendRecvBuf[TempLength] =
- (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
- }
- break;
+ case PH_FRINFC_MIFARESTD_VAL15:
+ default:
+ if (NdefMap->TLVStruct.prevLenByteValue >=
+ PH_FRINFC_MIFARESTD_NDEFTLV_L) {
+ /* In last write ndef length, only T of TLV is updated and
+ length (L) field of TLV is updated now */
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_L;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)(NdefMap->TLVStruct.prevLenByteValue >>
+ PH_FRINFC_MIFARESTD_RIGHTSHIFT8);
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ } else {
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NULLTLV_T;
+ TempLength++;
+ NdefMap->TLVStruct.NULLTLVCount = PH_FRINFC_MIFARESTD_VAL2;
+ NdefMap->TLVStruct.NdefTLVBlock =
+ NdefMap->StdMifareContainer.currentBlock;
+ NdefMap->TLVStruct.NdefTLVByte =
+ (TempLength - PH_FRINFC_MIFARESTD_VAL1);
+ NdefMap->SendRecvBuf[TempLength] = PH_FRINFC_MIFARESTD_NDEFTLV_T;
+ TempLength++;
+ NdefMap->SendRecvBuf[TempLength] =
+ (uint8_t)NdefMap->TLVStruct.prevLenByteValue;
+ }
+ break;
}
NdefMap->StdMifareContainer.RdAfterWrFlag = PH_FRINFC_MIFARESTD_FLAG0;
@@ -4341,7 +4378,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_RdTLV(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_RdTLV(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->State = PH_FRINFC_NDEFMAP_STATE_RD_TLV;
@@ -4362,7 +4399,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProRdTLV(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProRdTLV(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result =
PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_DEVICE_REQUEST);
uint8_t TempLength = PH_FRINFC_MIFARESTD_VAL0,
@@ -4406,7 +4443,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_WrTermTLV(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_WrTermTLV(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
uint8_t index = PH_FRINFC_MIFARESTD_VAL0;
@@ -4439,7 +4476,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_ProWrABlock(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProWrABlock(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
NdefMap->StdMifareContainer.WrLength = PH_FRINFC_MIFARESTD_VAL0;
@@ -4586,7 +4623,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_CallDisCon(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_CallDisCon(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Set Ndef State */
@@ -4608,7 +4645,7 @@
* Returns NFCSTATUS_SUCCESS
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MifStd_H_CallConnect(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_CallConnect(phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
/* Set Ndef State */
@@ -4625,8 +4662,8 @@
* Returns void
*
******************************************************************************/
-static void phFriNfc_MifStd1k_H_BlkChk(phFriNfc_NdefMap_t *NdefMap,
- uint8_t SectorID, uint8_t *callbreak) {
+static void phFriNfc_MifStd1k_H_BlkChk(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t SectorID, uint8_t* callbreak) {
/* every last block of a sector needs to be skipped */
if (((NdefMap->StdMifareContainer.currentBlock + PH_FRINFC_MIFARESTD_INC_1) %
PH_FRINFC_MIFARESTD_BLK4) == 0) {
@@ -4662,9 +4699,9 @@
*
******************************************************************************/
NFCSTATUS
-phFrinfc_MifareClassic_GetContainerSize(const phFriNfc_NdefMap_t *NdefMap,
- uint32_t *maxSize,
- uint32_t *actualSize) {
+phFrinfc_MifareClassic_GetContainerSize(const phFriNfc_NdefMap_t* NdefMap,
+ uint32_t* maxSize,
+ uint32_t* actualSize) {
NFCSTATUS result = NFCSTATUS_SUCCESS;
uint16_t valid_no_of_bytes = 0;
uint8_t sect_aid_index = 0;
@@ -4728,8 +4765,8 @@
*
******************************************************************************/
NFCSTATUS
-phFriNfc_MifareStdMap_ConvertToReadOnly(phFriNfc_NdefMap_t *NdefMap,
- const uint8_t *ScrtKeyB) {
+phFriNfc_MifareStdMap_ConvertToReadOnly(phFriNfc_NdefMap_t* NdefMap,
+ const uint8_t* ScrtKeyB) {
NFCSTATUS result = NFCSTATUS_SUCCESS;
uint8_t totalNoSectors = 0, sectorTrailerBlockNo = 0;
@@ -4855,8 +4892,8 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS
-phFriNfc_MifStd_H_ProSectorTrailorAcsBits(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProSectorTrailorAcsBits(
+ phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS Result = NFCSTATUS_SUCCESS;
if (*NdefMap->SendRecvLength == PH_FRINFC_MIFARESTD_BYTES_READ) {
@@ -4865,7 +4902,6 @@
/* check for the correct access bits */
Result = phFriNfc_MifStd_H_ChkAcsBit(NdefMap);
if (Result == NFCSTATUS_SUCCESS) {
-
if (NdefMap->CardState == PH_NDEFMAP_CARD_STATE_READ_ONLY) {
/* Go to next sector */
Result = phFriNfc_MifStd_H_ProWrSectorTrailor(NdefMap);
@@ -4892,8 +4928,8 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS
-phFriNfc_MifStd_H_WrSectorTrailorBlock(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_WrSectorTrailorBlock(
+ phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_PENDING;
NdefMap->MapCompletionInfo.CompletionRoutine = phFriNfc_MifareStdMap_Process;
@@ -4974,8 +5010,8 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS
-phFriNfc_MifStd_H_ProWrSectorTrailor(phFriNfc_NdefMap_t *NdefMap) {
+static NFCSTATUS phFriNfc_MifStd_H_ProWrSectorTrailor(
+ phFriNfc_NdefMap_t* NdefMap) {
NFCSTATUS status = NFCSTATUS_FAILED;
uint8_t sectorTrailerBlockNo = 0;
@@ -5021,7 +5057,7 @@
* In case of failure returns other failure value.
*
******************************************************************************/
-static NFCSTATUS phFriNfc_MapTool_ChkSpcVer(const phFriNfc_NdefMap_t *NdefMap,
+static NFCSTATUS phFriNfc_MapTool_ChkSpcVer(const phFriNfc_NdefMap_t* NdefMap,
uint8_t VersionIndex) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
@@ -5032,46 +5068,46 @@
status = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT);
} else {
switch (NdefMap->CardType) {
- case PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD:
- case PH_FRINFC_NDEFMAP_MIFARE_STD_2K_CARD:
- case PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD: {
- /* calculate the major and minor version number of Mifare std version
- * number */
- status =
- ((((PH_NFCFRI_MFSTDMAP_NFCDEV_MAJOR_VER_NUM ==
- PH_NFCFRI_MFSTDMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
- (PH_NFCFRI_MFSTDMAP_NFCDEV_MINOR_VER_NUM ==
- PH_NFCFRI_MFSTDMAP_GET_MINOR_TAG_VERNO(TagVerNo))) ||
- ((PH_NFCFRI_MFSTDMAP_NFCDEV_MAJOR_VER_NUM ==
- PH_NFCFRI_MFSTDMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
- (PH_NFCFRI_MFSTDMAP_NFCDEV_MINOR_VER_NUM <
- PH_NFCFRI_MFSTDMAP_GET_MINOR_TAG_VERNO(TagVerNo))))
- ? NFCSTATUS_SUCCESS
- : PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT));
- break;
- }
-
- default: {
- /* calculate the major and minor version number of T3VerNo */
- if (((PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM ==
- PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
- (PH_NFCFRI_NDEFMAP_NFCDEV_MINOR_VER_NUM ==
- PH_NFCFRI_NDEFMAP_GET_MINOR_TAG_VERNO(TagVerNo))) ||
- ((PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM ==
- PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
- (PH_NFCFRI_NDEFMAP_NFCDEV_MINOR_VER_NUM <
- PH_NFCFRI_NDEFMAP_GET_MINOR_TAG_VERNO(TagVerNo)))) {
- status = PHNFCSTVAL(CID_NFC_NONE, NFCSTATUS_SUCCESS);
- } else {
- if ((PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM <
- PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) ||
- (PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM >
- PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo))) {
- status = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT);
- }
+ case PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD:
+ case PH_FRINFC_NDEFMAP_MIFARE_STD_2K_CARD:
+ case PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD: {
+ /* calculate the major and minor version number of Mifare std version
+ * number */
+ status =
+ ((((PH_NFCFRI_MFSTDMAP_NFCDEV_MAJOR_VER_NUM ==
+ PH_NFCFRI_MFSTDMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
+ (PH_NFCFRI_MFSTDMAP_NFCDEV_MINOR_VER_NUM ==
+ PH_NFCFRI_MFSTDMAP_GET_MINOR_TAG_VERNO(TagVerNo))) ||
+ ((PH_NFCFRI_MFSTDMAP_NFCDEV_MAJOR_VER_NUM ==
+ PH_NFCFRI_MFSTDMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
+ (PH_NFCFRI_MFSTDMAP_NFCDEV_MINOR_VER_NUM <
+ PH_NFCFRI_MFSTDMAP_GET_MINOR_TAG_VERNO(TagVerNo))))
+ ? NFCSTATUS_SUCCESS
+ : PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT));
+ break;
}
- break;
- }
+
+ default: {
+ /* calculate the major and minor version number of T3VerNo */
+ if (((PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM ==
+ PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
+ (PH_NFCFRI_NDEFMAP_NFCDEV_MINOR_VER_NUM ==
+ PH_NFCFRI_NDEFMAP_GET_MINOR_TAG_VERNO(TagVerNo))) ||
+ ((PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM ==
+ PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) &&
+ (PH_NFCFRI_NDEFMAP_NFCDEV_MINOR_VER_NUM <
+ PH_NFCFRI_NDEFMAP_GET_MINOR_TAG_VERNO(TagVerNo)))) {
+ status = PHNFCSTVAL(CID_NFC_NONE, NFCSTATUS_SUCCESS);
+ } else {
+ if ((PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM <
+ PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo)) ||
+ (PH_NFCFRI_NDEFMAP_NFCDEV_MAJOR_VER_NUM >
+ PH_NFCFRI_NDEFMAP_GET_MAJOR_TAG_VERNO(TagVerNo))) {
+ status = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_FORMAT);
+ }
+ }
+ break;
+ }
}
}
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.h b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.h
index b91c2b7..a66fd9b 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.h
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.h
@@ -38,7 +38,7 @@
/* Macros to find major and minor TAG : Ex:Type1/Type2/Type3/Type4 version
* numbers */
-#define PH_NFCFRI_MFSTDMAP_GET_MAJOR_TAG_VERNO(a) \
+#define PH_NFCFRI_MFSTDMAP_GET_MAJOR_TAG_VERNO(a) \
((a) & (0x40)) /* must be 0xC0 */
#define PH_NFCFRI_MFSTDMAP_GET_MINOR_TAG_VERNO(a) ((a) & (0x30))
@@ -53,15 +53,15 @@
#define PH_FRINFC_NDEFMAP_STATE_WRITE 2 /* Write is going on*/
#define PH_FRINFC_NDEFMAP_STATE_AUTH 3 /* Authenticate is going on*/
#define PH_FRINFC_NDEFMAP_STATE_CHK_NDEF_COMP 4 /* Check Ndef is going on */
-#define PH_FRINFC_NDEFMAP_STATE_RD_ACS_BIT \
+#define PH_FRINFC_NDEFMAP_STATE_RD_ACS_BIT \
5 /* Read access bit is in progress */
#define PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN 6 /* Write NDEF TLV LEngth*/
-#define PH_FRINFC_NDEFMAP_STATE_RD_TO_WR_NDEF_LEN \
+#define PH_FRINFC_NDEFMAP_STATE_RD_TO_WR_NDEF_LEN \
7 /* read to write the Ndef TLV*/
#define PH_FRINFC_NDEFMAP_STATE_GET_ACT_CARDSIZE 8 /* Get the card size */
-#define PH_FRINFC_NDEFMAP_STATE_RD_BEF_WR \
+#define PH_FRINFC_NDEFMAP_STATE_RD_BEF_WR \
9 /* Read the NDEF TLV block before starting write */
-#define PH_FRINFC_NDEFMAP_STATE_WR_TLV \
+#define PH_FRINFC_NDEFMAP_STATE_WR_TLV \
10 /* Read the NDEF TLV block before starting write */
#define PH_FRINFC_NDEFMAP_STATE_RD_TLV 11 /* Read the NDEF TLV block */
#define PH_FRINFC_NDEFMAP_STATE_TERM_TLV 12 /* Write terminator TLV block */
@@ -69,9 +69,9 @@
#define PH_FRINFC_NDEFMAP_STATE_DISCONNECT 14 /* Disconnect in progress */
#define PH_FRINFC_NDEFMAP_STATE_CONNECT 15 /* Connect in progress */
-#define PH_FRINFC_NDEFMAP_STATE_RD_SEC_ACS_BIT \
+#define PH_FRINFC_NDEFMAP_STATE_RD_SEC_ACS_BIT \
16 /* Convert to ReadOnly in progress */
-#define PH_FRINFC_NDEFMAP_STATE_WRITE_SEC \
+#define PH_FRINFC_NDEFMAP_STATE_WRITE_SEC \
17 /* Convert to ReadOnly in progress */
/* Mifare Standard - NDEF Compliant Flags */
@@ -79,48 +79,48 @@
#define PH_FRINFC_MIFARESTD_NON_NDEF_COMP 1 /* Sector is not NDEF Compliant */
/* Mifare Standard - NDEF Compliant Flag */
-#define PH_FRINFC_MIFARESTD_PROP_1ST_CONFIG \
+#define PH_FRINFC_MIFARESTD_PROP_1ST_CONFIG \
0 /* No proprietary forum sector found */
-#define PH_FRINFC_MIFARESTD_PROP_2ND_CONFIG \
- 1 /* Here the proprietary \
- forum sector exists after NFC forum \
+#define PH_FRINFC_MIFARESTD_PROP_2ND_CONFIG \
+ 1 /* Here the proprietary \
+ forum sector exists after NFC forum \
sector */
-#define PH_FRINFC_MIFARESTD_PROP_3RD_CONFIG \
- 2 /* Here the proprietary forum sector exists before \
+#define PH_FRINFC_MIFARESTD_PROP_3RD_CONFIG \
+ 2 /* Here the proprietary forum sector exists before \
NFC forum sector */
/* Mifare Standard - NDEF Compliant Flags */
-#define PH_FRINFC_MIFARESTD_MADSECT_ACS_BYTE6 \
- 0x78 /* Access Bit for Byte 6 in \
+#define PH_FRINFC_MIFARESTD_MADSECT_ACS_BYTE6 \
+ 0x78 /* Access Bit for Byte 6 in \
MAD sector trailer */
-#define PH_FRINFC_MIFARESTD_MADSECT_ACS_BYTE7 \
- 0x77 /* Access Bit for Byte 7 in \
+#define PH_FRINFC_MIFARESTD_MADSECT_ACS_BYTE7 \
+ 0x77 /* Access Bit for Byte 7 in \
MAD sector trailer */
-#define PH_FRINFC_MIFARESTD_NFCSECT_ACS_BYTE6 \
- 0x7F /* Access Bit for Byte 6 in \
+#define PH_FRINFC_MIFARESTD_NFCSECT_ACS_BYTE6 \
+ 0x7F /* Access Bit for Byte 6 in \
NFC forum sector trailer */
-#define PH_FRINFC_MIFARESTD_NFCSECT_ACS_BYTE7 \
- 0x07 /* Access Bit for Byte 7 in \
+#define PH_FRINFC_MIFARESTD_NFCSECT_ACS_BYTE7 \
+ 0x07 /* Access Bit for Byte 7 in \
NFC forum sector trailer */
-#define PH_FRINFC_MIFARESTD_ACS_BYTE8 \
- 0x88 /* Access Bit for Byte 8 in \
+#define PH_FRINFC_MIFARESTD_ACS_BYTE8 \
+ 0x88 /* Access Bit for Byte 8 in \
all sector trailer */
-#define PH_FRINFC_MIFARESTD_NFCSECT_RDACS_BYTE6 \
- 0x0F /* Access Bit for Byte 6 in \
- NFC forum sector trailer for \
+#define PH_FRINFC_MIFARESTD_NFCSECT_RDACS_BYTE6 \
+ 0x0F /* Access Bit for Byte 6 in \
+ NFC forum sector trailer for \
Read Only State */
-#define PH_FRINFC_MIFARESTD_NFCSECT_RDACS_BYTE7 \
- 0x07 /* Access Bit for Byte 7 in \
- NFC forum sector trailer \
+#define PH_FRINFC_MIFARESTD_NFCSECT_RDACS_BYTE7 \
+ 0x07 /* Access Bit for Byte 7 in \
+ NFC forum sector trailer \
Read Only State */
-#define PH_FRINFC_MIFARESTD_NFCSECT_RDACS_BYTE8 \
- 0x8F /* Access Bit for Byte 8 in \
- NFC forum sector trailer \
+#define PH_FRINFC_MIFARESTD_NFCSECT_RDACS_BYTE8 \
+ 0x8F /* Access Bit for Byte 8 in \
+ NFC forum sector trailer \
Read Only State */
/* Mifare Standard constants */
#define MIFARE_MAX_SEND_BUF_TO_READ 1 /* Send Length for Reading a Block */
#define MIFARE_MAX_SEND_BUF_TO_WRITE 17 /* Send Length for writing a Block */
-#define MIFARE_AUTHENTICATE_CMD_LENGTH \
+#define MIFARE_AUTHENTICATE_CMD_LENGTH \
7 /* Send Length for authenticating a Block */
/* Mifare standard - Constants */
@@ -159,20 +159,20 @@
#define PH_FRINFC_MIFARESTD_BYTES_READ 16 /* Bytes read */
#define PH_FRINFC_MIFARESTD_BLOCK_BYTES 16 /* Bytes per block */
#define PH_FRINFC_MIFARESTD_SECTOR_BLOCKS 16 /* Blocks per sector */
-#define PH_FRINFC_MIFARESTD_WR_A_BLK \
- 17 /* 17 bytes (including current block) \
+#define PH_FRINFC_MIFARESTD_WR_A_BLK \
+ 17 /* 17 bytes (including current block) \
are given to transfer */
-#define PH_FRINFC_MIFARESTD4K_MAX_BLOCKS \
- 210 /* Maximum number of Mifare 4k Blocks \
+#define PH_FRINFC_MIFARESTD4K_MAX_BLOCKS \
+ 210 /* Maximum number of Mifare 4k Blocks \
excluding sector trailer */
-#define PH_FRINFC_MIFARESTD1K_MAX_BLK \
- 63 /* Maximum number of Mifare 1k blocks \
+#define PH_FRINFC_MIFARESTD1K_MAX_BLK \
+ 63 /* Maximum number of Mifare 1k blocks \
including the sector trailer*/
-#define PH_FRINFC_MIFARESTD2K_MAX_BLK \
- 127 /* Maximum number of Mifare 2k blocks \
+#define PH_FRINFC_MIFARESTD2K_MAX_BLK \
+ 127 /* Maximum number of Mifare 2k blocks \
including the sector trailer*/
-#define PH_FRINFC_MIFARESTD4K_MAX_BLK \
- 254 /* Maximum number of Mifare 4k blocks \
+#define PH_FRINFC_MIFARESTD4K_MAX_BLK \
+ 254 /* Maximum number of Mifare 4k blocks \
including the sector trailer*/
#define PH_FRINFC_MIFARESTD_FLAG1 1 /* Flag to set 1 */
#define PH_FRINFC_MIFARESTD_FLAG0 0 /* Flag to set 0 */
@@ -202,13 +202,13 @@
#define PH_FRINFC_MIFARESTD_NDEFTLV_L 0xFF /* Length of the TLV */
#define PH_FRINFC_MIFARESTD_NDEFTLV_T 0x03 /* Length of the TLV */
#define PH_FRINFC_MIFARESTD_NDEFTLV_L0 0x00 /* Length of the TLV */
-#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES0 \
+#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES0 \
0 /* Number of bytes taken by length (L) of the TLV */
-#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES1 \
+#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES1 \
1 /* Number of bytes taken by length (L) of the TLV */
-#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES2 \
+#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES2 \
2 /* Number of bytes taken by length (L) of the TLV */
-#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES3 \
+#define PH_FRINFC_MIFARESTD_NDEFTLV_LBYTES3 \
3 /* Number of bytes taken by length (L) of the TLV */
#define PH_FRINFC_MIFARESTD_PROPTLV_T 0xFD /* Type of Proprietary TLV */
#define PH_FRINFC_MIFARESTD_TERMTLV_T 0xFE /* Type of Terminator TLV */
@@ -222,23 +222,23 @@
#define PH_FRINFC_MIFARESTD_KEY_LEN 0x06 /* MIFARE Std key length */
#define PH_FRINFC_MIFARESTD_DEFAULT_KEY 0xFF /* MIFARE Std Default Key */
-NFCSTATUS phFriNfc_MifareStdMap_H_Reset(phFriNfc_NdefMap_t *NdefMap);
-NFCSTATUS phFriNfc_MifareStdMap_RdNdef(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *PacketData,
- uint32_t *PacketDataLength,
+NFCSTATUS phFriNfc_MifareStdMap_H_Reset(phFriNfc_NdefMap_t* NdefMap);
+NFCSTATUS phFriNfc_MifareStdMap_RdNdef(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* PacketData,
+ uint32_t* PacketDataLength,
uint8_t Offset);
-NFCSTATUS phFriNfc_MifareStdMap_WrNdef(phFriNfc_NdefMap_t *NdefMap,
- uint8_t *PacketData,
- uint32_t *PacketDataLength,
+NFCSTATUS phFriNfc_MifareStdMap_WrNdef(phFriNfc_NdefMap_t* NdefMap,
+ uint8_t* PacketData,
+ uint32_t* PacketDataLength,
uint8_t Offset);
-NFCSTATUS phFriNfc_MifareStdMap_ChkNdef(phFriNfc_NdefMap_t *NdefMap);
+NFCSTATUS phFriNfc_MifareStdMap_ChkNdef(phFriNfc_NdefMap_t* NdefMap);
-void phFriNfc_MifareStdMap_Process(void *Context, NFCSTATUS Status);
+void phFriNfc_MifareStdMap_Process(void* Context, NFCSTATUS Status);
extern NFCSTATUS phFrinfc_MifareClassic_GetContainerSize(
- const phFriNfc_NdefMap_t *NdefMap, uint32_t *maxSize, uint32_t *actualSize);
+ const phFriNfc_NdefMap_t* NdefMap, uint32_t* maxSize, uint32_t* actualSize);
NFCSTATUS
-phFriNfc_MifareStdMap_ConvertToReadOnly(phFriNfc_NdefMap_t *NdefMap,
- const uint8_t *ScrtKeyB);
+phFriNfc_MifareStdMap_ConvertToReadOnly(phFriNfc_NdefMap_t* NdefMap,
+ const uint8_t* ScrtKeyB);
#endif /* PHFRINFC_MIFARESTDMAP_H */
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_NdefMap.h b/nci/jni/extns/pn54x/src/mifare/phFriNfc_NdefMap.h
index 543f860..50020c4 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_NdefMap.h
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_NdefMap.h
@@ -47,7 +47,7 @@
#define PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD 7 /* Mifare Standard */
#define PH_FRINFC_NDEFMAP_MIFARE_STD_4K_CARD 8 /* Mifare Standard */
#define PH_FRINFC_NDEFMAP_MIFARE_STD_2K_CARD 11 /*internal Mifare Standard */
-#define PH_FRINFC_NDEFMAP_EMPTY_NDEF_MSG \
+#define PH_FRINFC_NDEFMAP_EMPTY_NDEF_MSG \
{ 0xD0, 0x00, 0x00 } /* Empty ndef message */
#define PH_FRINFC_NDEFMAP_MFUL_4BYTES_BUF 4 /* To store 4 bytes after write */
@@ -64,17 +64,17 @@
* types
*
*/
-#define PH_FRINFC_NDEFMAP_MIFARESTD_1KNDEF_COMPBLOCK \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_1KNDEF_COMPBLOCK \
45 /* Total Ndef Compliant blocks Mifare 1k */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_2KNDEF_COMPBLOCK \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_2KNDEF_COMPBLOCK \
90 /* Total Ndef Compliant blocks Mifare 2k */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_4KNDEF_COMPBLOCK \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_4KNDEF_COMPBLOCK \
210 /* Total Ndef Compliant blocks Mifare 4k */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_RDWR_SIZE \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_RDWR_SIZE \
16 /* Bytes read/write for one read/write operation*/
-#define PH_FRINFC_NDEFMAP_MIFARESTD_TOTALNO_BLK \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_TOTALNO_BLK \
40 /* Total number of sectors in Mifare 4k */
-#define PH_FRINFC_NDEFMAP_MIFARESTD_ST15_BYTES \
+#define PH_FRINFC_NDEFMAP_MIFARESTD_ST15_BYTES \
15 /* To store 15 bytes after reading a block */
/*
@@ -336,20 +336,20 @@
/* Completion Routine Context. */
phFriNfc_CplRt_t CompletionRoutine[PH_FRINFC_NDEFMAP_CR];
- phNfc_sTransceiveInfo_t *pTransceiveInfo;
+ phNfc_sTransceiveInfo_t* pTransceiveInfo;
/*Holds the completion routine informations of the Map Layer*/
phFriNfc_CplRt_t MapCompletionInfo;
/* Pointer to the Remote Device Information */
- phLibNfc_sRemoteDevInformation_t *psRemoteDevInfo;
+ phLibNfc_sRemoteDevInformation_t* psRemoteDevInfo;
/*Holds the Command Type(read/write)*/
phNfc_uCmdList_t Cmd;
/* Pointer to a temporary buffer. Could be
used for read/write purposes */
- uint8_t *ApduBuffer;
+ uint8_t* ApduBuffer;
/* Size allocated to the ApduBuffer. */
uint32_t ApduBufferSize;
@@ -359,19 +359,19 @@
/* Pointer to the user-provided Data Size to be written trough WrNdef
* function. */
- uint32_t *WrNdefPacketLength;
+ uint32_t* WrNdefPacketLength;
/* Holds the length of the received data. */
- uint16_t *SendRecvLength;
+ uint16_t* SendRecvLength;
/*Holds the ack of some initial commands*/
- uint8_t *SendRecvBuf;
+ uint8_t* SendRecvBuf;
/* Holds the length of the data to be sent. */
uint16_t SendLength;
/* Data Byte Count, which gives the offset to the integration.*/
- uint16_t *DataCount;
+ uint16_t* DataCount;
/* Holds the previous operation on the card*/
uint8_t PrevOperation;
@@ -411,7 +411,7 @@
to update the PacketDataLength in case of Read operation */
/* Fix for 0000238: [gk] MAP: Number of bytes actually read out is
not returned. */
- uint32_t *NumOfBytesRead;
+ uint32_t* NumOfBytesRead;
/* Flag used to tell the process function that WRITE has
requested for an internal READ.*/
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.cpp b/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.cpp
index 4a95824..5c2ad20 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.cpp
@@ -34,7 +34,7 @@
** Returns none.
**
*******************************************************************************/
-void phFriNfc_SmtCrdFmt_HCrHandler(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
+void phFriNfc_SmtCrdFmt_HCrHandler(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
NFCSTATUS Status) {
/* set the state back to the Reset_Init state*/
NdefSmtCrdFmt->State = PH_FRINFC_SMTCRDFMT_STATE_RESET_INIT;
@@ -65,10 +65,10 @@
**
*******************************************************************************/
NFCSTATUS
-phFriNfc_NdefSmtCrd_Reset(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- void *LowerDevice,
- phHal_sRemoteDevInformation_t *psRemoteDevInfo,
- uint8_t *SendRecvBuffer, uint16_t *SendRecvBuffLen) {
+phFriNfc_NdefSmtCrd_Reset(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
+ void* LowerDevice,
+ phHal_sRemoteDevInformation_t* psRemoteDevInfo,
+ uint8_t* SendRecvBuffer, uint16_t* SendRecvBuffLen) {
NFCSTATUS result = NFCSTATUS_SUCCESS;
uint8_t index;
if ((SendRecvBuffLen == NULL) || (NdefSmtCrdFmt == NULL) ||
@@ -91,7 +91,7 @@
/* Lower Device(Always Overlapped HAL Struct initialized in application
* is registered in NdefMap Lower Device)
*/
- NdefSmtCrdFmt->pTransceiveInfo = (phNfc_sTransceiveInfo *)LowerDevice;
+ NdefSmtCrdFmt->pTransceiveInfo = (phNfc_sTransceiveInfo*)LowerDevice;
/* Remote Device info received from Manual Device Discovery is registered
* here */
@@ -135,10 +135,10 @@
*function is invalid.
**
*******************************************************************************/
-NFCSTATUS phFriNfc_NdefSmtCrd_SetCR(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
+NFCSTATUS phFriNfc_NdefSmtCrd_SetCR(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
uint8_t FunctionID,
pphFriNfc_Cr_t CompletionRoutine,
- void *CompletionRoutineContext) {
+ void* CompletionRoutineContext) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
if ((NdefSmtCrdFmt == NULL) || (FunctionID >= PH_FRINFC_SMTCRDFMT_CR) ||
(CompletionRoutine == NULL) || (CompletionRoutineContext == NULL)) {
@@ -173,38 +173,39 @@
** Returns none.
**
*******************************************************************************/
-void phFriNfc_NdefSmtCrd_Process(void *Context, NFCSTATUS Status) {
+void phFriNfc_NdefSmtCrd_Process(void* Context, NFCSTATUS Status) {
if (Context != NULL) {
- phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt =
- (phFriNfc_sNdefSmtCrdFmt_t *)Context;
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt =
+ (phFriNfc_sNdefSmtCrdFmt_t*)Context;
switch (NdefSmtCrdFmt->psRemoteDevInfo->RemDevType) {
- case phNfc_eMifare_PICC:
- case phNfc_eISO14443_3A_PICC:
- if ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) ||
- (NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_4K_CRD) ||
- (NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_2K_CRD)) {
- /* Remote device is Mifare Standard card */
- phFriNfc_MfStd_Process(NdefSmtCrdFmt, Status);
+ case phNfc_eMifare_PICC:
+ case phNfc_eISO14443_3A_PICC:
+ if ((NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_1K_CRD) ||
+ (NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_4K_CRD) ||
+ (NdefSmtCrdFmt->CardType == PH_FRINFC_SMTCRDFMT_MFSTD_2K_CRD)) {
+ /* Remote device is Mifare Standard card */
+ phFriNfc_MfStd_Process(NdefSmtCrdFmt, Status);
- } else {
+ } else {
+ Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_SMTCRDFMT,
+ NFCSTATUS_INVALID_REMOTE_DEVICE);
+ }
+ break;
+ default:
+ /* Remote device opmode not recognized.
+ * Probably not NDEF compliant
+ */
Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_SMTCRDFMT,
NFCSTATUS_INVALID_REMOTE_DEVICE);
- }
- break;
- default:
- /* Remote device opmode not recognized.
- * Probably not NDEF compliant
- */
- Status = PHNFCSTVAL(CID_FRI_NFC_NDEF_SMTCRDFMT,
- NFCSTATUS_INVALID_REMOTE_DEVICE);
- /* set the state back to the Reset_Init state*/
- NdefSmtCrdFmt->State = PH_FRINFC_SMTCRDFMT_STATE_RESET_INIT;
+ /* set the state back to the Reset_Init state*/
+ NdefSmtCrdFmt->State = PH_FRINFC_SMTCRDFMT_STATE_RESET_INIT;
- /* set the completion routine*/
- NdefSmtCrdFmt->CompletionRoutine[PH_FRINFC_SMTCRDFMT_CR_INVALID_OPE]
- .CompletionRoutine(NdefSmtCrdFmt->CompletionRoutine->Context, Status);
- break;
+ /* set the completion routine*/
+ NdefSmtCrdFmt->CompletionRoutine[PH_FRINFC_SMTCRDFMT_CR_INVALID_OPE]
+ .CompletionRoutine(NdefSmtCrdFmt->CompletionRoutine->Context,
+ Status);
+ break;
}
} else {
Status =
diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.h b/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.h
index 5b65b87..6a7a653 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.h
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_SmtCrdFmt.h
@@ -28,15 +28,15 @@
#define DESFIRE_FMT_EV1
#define PH_FRI_NFC_SMTCRDFMT_NFCSTATUS_FORMAT_ERROR 9 /* Format error */
-#define PH_FRINFC_SMTCRDFMT_MSTD_DEFAULT_KEYA_OR_KEYB \
+#define PH_FRINFC_SMTCRDFMT_MSTD_DEFAULT_KEYA_OR_KEYB \
{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } /* Default Key */
-#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA \
+#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_KEYA \
{ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5 } /* Key A */
-#define PH_FRINFC_SMTCRDFMT_NFCFORUMSECT_KEYA \
+#define PH_FRINFC_SMTCRDFMT_NFCFORUMSECT_KEYA \
{ 0xD3, 0xF7, 0xD3, 0xF7, 0xD3, 0xF7 } /* NFC Forum Key */
-#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_ACCESSBITS \
+#define PH_FRINFC_SMTCRDFMT_MSTD_MADSECT_ACCESSBITS \
{ 0x78, 0x77, 0x88 } /* Access bits */
-#define PH_FRINFC_SMTCRDFMT_MSTD_NFCFORUM_ACCESSBITS \
+#define PH_FRINFC_SMTCRDFMT_MSTD_NFCFORUM_ACCESSBITS \
{ 0x7F, 0x07, 0x88 } /* NFC Forum access bits */
#define PH_FRINFC_SMTCRDFMT_MAX_TLV_TYPE_SUPPORTED 1 /* TLV support */
#define PH_FRINFC_SMTCRDFMT_MAX_SEND_RECV_BUF_SIZE 252 /* Buffer size */
@@ -55,7 +55,7 @@
};
#define PH_FRINFC_SMTCRDFMT_CR_FORMAT 0 /* Index for phFriNfc_SmtCrd_Format */
-#define PH_FRINFC_SMTCRDFMT_CR_INVALID_OPE \
+#define PH_FRINFC_SMTCRDFMT_CR_INVALID_OPE \
1 /* Index for Unknown States/Operations */
#define PH_FRINFC_SMTCRDFMT_CR 2 /* Number of completion routines */
@@ -91,21 +91,21 @@
* Context information Structure
*/
typedef struct phFriNfc_sNdefSmtCrdFmt {
- phNfc_sTransceiveInfo_t
- *pTransceiveInfo; /* Pointer to the Transceive information */
- phHal_sRemoteDevInformation_t
- *psRemoteDevInfo; /* Pointer to the Remote Device Information */
- uint8_t CardType; /* Stores the type of the smart card */
- uint8_t State; /* The state of the operation */
- uint8_t CardState; /* Stores the card state */
+ phNfc_sTransceiveInfo_t*
+ pTransceiveInfo; /* Pointer to the Transceive information */
+ phHal_sRemoteDevInformation_t*
+ psRemoteDevInfo; /* Pointer to the Remote Device Information */
+ uint8_t CardType; /* Stores the type of the smart card */
+ uint8_t State; /* The state of the operation */
+ uint8_t CardState; /* Stores the card state */
phFriNfc_CplRt_t CompletionRoutine
[PH_FRINFC_SMTCRDFMT_CR]; /* Completion Routine Context */
phFriNfc_CplRt_t SmtCrdFmtCompletionInfo; /* Holds the completion routine
informations of the Smart Card
Formatting Layer */
phHal_uCmdList_t Cmd; /* Holds the Command Type(read/write) */
- uint16_t *SendRecvLength; /* Holds the length of the received data */
- uint8_t *SendRecvBuf; /* Holds the ack of some intial commands */
+ uint16_t* SendRecvLength; /* Holds the length of the received data */
+ uint8_t* SendRecvBuf; /* Holds the ack of some intial commands */
uint16_t SendLength; /* Holds the length of the data to be sent */
NFCSTATUS
FmtProcStatus; /* Stores the output/result of the format procedure */
@@ -117,19 +117,19 @@
} phFriNfc_sNdefSmtCrdFmt_t;
NFCSTATUS
-phFriNfc_NdefSmtCrd_Reset(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- void *LowerDevice,
- phHal_sRemoteDevInformation_t *psRemoteDevInfo,
- uint8_t *SendRecvBuffer, uint16_t *SendRecvBuffLen);
+phFriNfc_NdefSmtCrd_Reset(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
+ void* LowerDevice,
+ phHal_sRemoteDevInformation_t* psRemoteDevInfo,
+ uint8_t* SendRecvBuffer, uint16_t* SendRecvBuffLen);
-NFCSTATUS phFriNfc_NdefSmtCrd_SetCR(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
+NFCSTATUS phFriNfc_NdefSmtCrd_SetCR(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
uint8_t FunctionID,
pphFriNfc_Cr_t CompletionRoutine,
- void *CompletionRoutineContext);
+ void* CompletionRoutineContext);
-void phFriNfc_NdefSmtCrd_Process(void *Context, NFCSTATUS Status);
+void phFriNfc_NdefSmtCrd_Process(void* Context, NFCSTATUS Status);
-void phFriNfc_SmtCrdFmt_HCrHandler(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
+void phFriNfc_SmtCrdFmt_HCrHandler(phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt,
NFCSTATUS Status);
#endif /* PHFRINFC_SMTCRDFMT_H */
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
index d0d6335..b1ae2ec 100644
--- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
@@ -27,8 +27,8 @@
static phNxpExtns_Context_t gphNxpExtns_Context;
phNciNfc_TransceiveInfo_t tNciTranscvInfo;
-phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt = NULL;
-phFriNfc_NdefMap_t *NdefMap = NULL;
+phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt = NULL;
+phFriNfc_NdefMap_t* NdefMap = NULL;
phLibNfc_NdefInfo_t NdefInfo;
#if (NFC_NXP_NOT_OPEN_INCLUDED == TRUE)
pthread_mutex_t SharedDataMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -36,52 +36,49 @@
uint8_t current_key[6] = {0};
phNci_mfc_auth_cmd_t gAuthCmdBuf;
static NFCSTATUS phNciNfc_SendMfReq(phNciNfc_TransceiveInfo_t tTranscvInfo,
- uint8_t *buff, uint16_t *buffSz);
-static NFCSTATUS
-phLibNfc_SendRawCmd(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
-static NFCSTATUS
-phLibNfc_SendWrt16Cmd(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
-static NFCSTATUS
-phLibNfc_SendAuthCmd(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- phNciNfc_TransceiveInfo_t *tNciTranscvInfo)
- __attribute__((unused));
+ uint8_t* buff, uint16_t* buffSz);
+static NFCSTATUS phLibNfc_SendRawCmd(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
+static NFCSTATUS phLibNfc_SendWrt16Cmd(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
+static NFCSTATUS phLibNfc_SendAuthCmd(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ phNciNfc_TransceiveInfo_t* tNciTranscvInfo) __attribute__((unused));
static NFCSTATUS phLibNfc_MapCmds(phNciNfc_RFDevType_t RemDevType,
- phNfc_sTransceiveInfo_t *pTransceiveInfo,
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
-static NFCSTATUS
-phLibNfc_MifareMap(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
-static NFCSTATUS
-phLibNfc_ChkAuthCmdMFC(phNfc_sTransceiveInfo_t *pTransceiveInfo, uint8_t *bKey);
-static NFCSTATUS phLibNfc_GetKeyNumberMFC(uint8_t *buffer, uint8_t *bKey);
-static void phLibNfc_CalSectorAddress(uint8_t *Sector_Address);
-static NFCSTATUS
-phNciNfc_MfCreateAuthCmdHdr(phNciNfc_TransceiveInfo_t tTranscvInfo,
- uint8_t bBlockAddr, uint8_t *buff,
- uint16_t *buffSz);
-static NFCSTATUS
-phNciNfc_MfCreateXchgDataHdr(phNciNfc_TransceiveInfo_t tTranscvInfo,
- uint8_t *buff, uint16_t *buffSz);
-static NFCSTATUS
-phLibNfc_SendWrt16CmdPayload(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
-static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t *RspBuffInfo,
+static NFCSTATUS phLibNfc_MifareMap(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
+static NFCSTATUS phLibNfc_ChkAuthCmdMFC(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo, uint8_t* bKey);
+static NFCSTATUS phLibNfc_GetKeyNumberMFC(uint8_t* buffer, uint8_t* bKey);
+static void phLibNfc_CalSectorAddress(uint8_t* Sector_Address);
+static NFCSTATUS phNciNfc_MfCreateAuthCmdHdr(
+ phNciNfc_TransceiveInfo_t tTranscvInfo, uint8_t bBlockAddr, uint8_t* buff,
+ uint16_t* buffSz);
+static NFCSTATUS phNciNfc_MfCreateXchgDataHdr(
+ phNciNfc_TransceiveInfo_t tTranscvInfo, uint8_t* buff, uint16_t* buffSz);
+static NFCSTATUS phLibNfc_SendWrt16CmdPayload(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf);
+static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo,
NFCSTATUS wStatus);
-static NFCSTATUS nativeNfcExtns_doTransceive(uint8_t *buff, uint16_t buffSz);
-static NFCSTATUS
-phFriNfc_NdefSmtCrd_Reset__(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- uint8_t *SendRecvBuffer, uint16_t *SendRecvBuffLen);
-static NFCSTATUS phFriNfc_ValidateParams(uint8_t *PacketData,
- uint32_t *PacketDataLength,
+static NFCSTATUS nativeNfcExtns_doTransceive(uint8_t* buff, uint16_t buffSz);
+static NFCSTATUS phFriNfc_NdefSmtCrd_Reset__(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt, uint8_t* SendRecvBuffer,
+ uint16_t* SendRecvBuffLen);
+static NFCSTATUS phFriNfc_ValidateParams(uint8_t* PacketData,
+ uint32_t* PacketDataLength,
uint8_t Offset,
- phFriNfc_NdefMap_t *pNdefMap,
+ phFriNfc_NdefMap_t* pNdefMap,
uint8_t bNdefReq);
-static void Mfc_FormatNdef_Completion_Routine(void *NdefCtxt, NFCSTATUS status);
-static void Mfc_WriteNdef_Completion_Routine(void *NdefCtxt, NFCSTATUS status);
-static void Mfc_ReadNdef_Completion_Routine(void *NdefCtxt, NFCSTATUS status);
-static void Mfc_CheckNdef_Completion_Routine(void *NdefCtxt, NFCSTATUS status);
+static void Mfc_FormatNdef_Completion_Routine(void* NdefCtxt, NFCSTATUS status);
+static void Mfc_WriteNdef_Completion_Routine(void* NdefCtxt, NFCSTATUS status);
+static void Mfc_ReadNdef_Completion_Routine(void* NdefCtxt, NFCSTATUS status);
+static void Mfc_CheckNdef_Completion_Routine(void* NdefCtxt, NFCSTATUS status);
/*******************************************************************************
**
@@ -193,59 +190,59 @@
gphNxpExtns_Context.ExtnsDeactivate = false;
gphNxpExtns_Context.ExtnsCallBack = false;
- NdefMap = (phFriNfc_NdefMap_t *)malloc(sizeof(phFriNfc_NdefMap_t));
+ NdefMap = (phFriNfc_NdefMap_t*)malloc(sizeof(phFriNfc_NdefMap_t));
if (NULL == NdefMap) {
goto clean_and_return;
}
memset(NdefMap, 0, sizeof(phFriNfc_NdefMap_t));
- NdefMap->psRemoteDevInfo = (phLibNfc_sRemoteDevInformation_t *)malloc(
+ NdefMap->psRemoteDevInfo = (phLibNfc_sRemoteDevInformation_t*)malloc(
sizeof(phLibNfc_sRemoteDevInformation_t));
if (NULL == NdefMap->psRemoteDevInfo) {
goto clean_and_return;
}
memset(NdefMap->psRemoteDevInfo, 0, sizeof(phLibNfc_sRemoteDevInformation_t));
- NdefMap->SendRecvBuf = (uint8_t *)malloc((uint32_t)(MAX_BUFF_SIZE * 2));
+ NdefMap->SendRecvBuf = (uint8_t*)malloc((uint32_t)(MAX_BUFF_SIZE * 2));
if (NULL == NdefMap->SendRecvBuf) {
goto clean_and_return;
}
memset(NdefMap->SendRecvBuf, 0, (MAX_BUFF_SIZE * 2));
- NdefMap->SendRecvLength = (uint16_t *)malloc(sizeof(uint16_t));
+ NdefMap->SendRecvLength = (uint16_t*)malloc(sizeof(uint16_t));
if (NULL == NdefMap->SendRecvLength) {
goto clean_and_return;
}
memset(NdefMap->SendRecvLength, 0, sizeof(uint16_t));
- NdefMap->DataCount = (uint16_t *)malloc(sizeof(uint16_t));
+ NdefMap->DataCount = (uint16_t*)malloc(sizeof(uint16_t));
if (NULL == NdefMap->DataCount) {
goto clean_and_return;
}
memset(NdefMap->DataCount, 0, sizeof(uint16_t));
NdefMap->pTransceiveInfo =
- (phNfc_sTransceiveInfo_t *)malloc(sizeof(phNfc_sTransceiveInfo_t));
+ (phNfc_sTransceiveInfo_t*)malloc(sizeof(phNfc_sTransceiveInfo_t));
if (NULL == NdefMap->pTransceiveInfo) {
goto clean_and_return;
}
memset(NdefMap->pTransceiveInfo, 0, sizeof(phNfc_sTransceiveInfo_t));
- tNciTranscvInfo.tSendData.pBuff = (uint8_t *)malloc((uint32_t)MAX_BUFF_SIZE);
+ tNciTranscvInfo.tSendData.pBuff = (uint8_t*)malloc((uint32_t)MAX_BUFF_SIZE);
if (NULL == tNciTranscvInfo.tSendData.pBuff) {
goto clean_and_return;
}
memset(tNciTranscvInfo.tSendData.pBuff, 0, MAX_BUFF_SIZE);
NdefMap->pTransceiveInfo->sSendData.buffer =
- (uint8_t *)malloc((uint32_t)MAX_BUFF_SIZE);
+ (uint8_t*)malloc((uint32_t)MAX_BUFF_SIZE);
if (NdefMap->pTransceiveInfo->sSendData.buffer == NULL) {
goto clean_and_return;
}
memset(NdefMap->pTransceiveInfo->sSendData.buffer, 0, MAX_BUFF_SIZE);
NdefMap->pTransceiveInfo->sSendData.length = MAX_BUFF_SIZE;
- NdefMap->pTransceiveInfo->sRecvData.buffer = (uint8_t *)malloc(
+ NdefMap->pTransceiveInfo->sRecvData.buffer = (uint8_t*)malloc(
(uint32_t)MAX_BUFF_SIZE); /* size should be same as sRecvData */
if (NdefMap->pTransceiveInfo->sRecvData.buffer == NULL) {
goto clean_and_return;
@@ -254,7 +251,7 @@
NdefMap->pTransceiveInfo->sRecvData.length = MAX_BUFF_SIZE;
NdefSmtCrdFmt =
- (phFriNfc_sNdefSmtCrdFmt_t *)malloc(sizeof(phFriNfc_sNdefSmtCrdFmt_t));
+ (phFriNfc_sNdefSmtCrdFmt_t*)malloc(sizeof(phFriNfc_sNdefSmtCrdFmt_t));
if (NdefSmtCrdFmt == NULL) {
goto clean_and_return;
}
@@ -262,17 +259,17 @@
#if (NFC_NXP_NOT_OPEN_INCLUDED == TRUE)
pthread_mutex_lock(&SharedDataMutex);
#endif
- NdefInfo.psUpperNdefMsg = (phNfc_sData_t *)malloc(sizeof(phNfc_sData_t));
+ NdefInfo.psUpperNdefMsg = (phNfc_sData_t*)malloc(sizeof(phNfc_sData_t));
if (NULL == NdefInfo.psUpperNdefMsg) {
goto clean_and_return;
}
memset(NdefInfo.psUpperNdefMsg, 0, sizeof(phNfc_sData_t));
memset(&gAuthCmdBuf, 0, sizeof(phNci_mfc_auth_cmd_t));
- gAuthCmdBuf.pauth_cmd = (phNfc_sData_t *)malloc(sizeof(phNfc_sData_t));
+ gAuthCmdBuf.pauth_cmd = (phNfc_sData_t*)malloc(sizeof(phNfc_sData_t));
if (NULL == gAuthCmdBuf.pauth_cmd) {
goto clean_and_return;
}
- gAuthCmdBuf.pauth_cmd->buffer = (uint8_t *)malloc((uint32_t)NCI_MAX_DATA_LEN);
+ gAuthCmdBuf.pauth_cmd->buffer = (uint8_t*)malloc((uint32_t)NCI_MAX_DATA_LEN);
if (NULL == gAuthCmdBuf.pauth_cmd->buffer) {
goto clean_and_return;
}
@@ -338,7 +335,7 @@
** Returns: void
**
*******************************************************************************/
-static void Mfc_CheckNdef_Completion_Routine(void *NdefCtxt, NFCSTATUS status) {
+static void Mfc_CheckNdef_Completion_Routine(void* NdefCtxt, NFCSTATUS status) {
(void)NdefCtxt;
tNFA_CONN_EVT_DATA conn_evt_data;
@@ -347,8 +344,8 @@
/* NDef Tag Detected */
conn_evt_data.ndef_detect.protocol = NFC_PROTOCOL_MIFARE;
phFrinfc_MifareClassic_GetContainerSize(
- NdefMap, (uint32_t *)&(conn_evt_data.ndef_detect.max_size),
- (uint32_t *)&(conn_evt_data.ndef_detect.cur_size));
+ NdefMap, (uint32_t*)&(conn_evt_data.ndef_detect.max_size),
+ (uint32_t*)&(conn_evt_data.ndef_detect.cur_size));
NdefInfo.NdefLength = conn_evt_data.ndef_detect.max_size;
/* update local flags */
NdefInfo.is_ndef = 1;
@@ -388,7 +385,7 @@
** Returns: void
**
*******************************************************************************/
-static void Mfc_ReadNdef_Completion_Routine(void *NdefCtxt, NFCSTATUS status) {
+static void Mfc_ReadNdef_Completion_Routine(void* NdefCtxt, NFCSTATUS status) {
(void)NdefCtxt;
tNFA_CONN_EVT_DATA conn_evt_data;
tNFA_NDEF_EVT_DATA p_data;
@@ -428,7 +425,7 @@
** Returns: void
**
*******************************************************************************/
-static void Mfc_WriteNdef_Completion_Routine(void *NdefCtxt, NFCSTATUS status) {
+static void Mfc_WriteNdef_Completion_Routine(void* NdefCtxt, NFCSTATUS status) {
(void)NdefCtxt;
tNFA_CONN_EVT_DATA conn_evt_data;
@@ -450,7 +447,7 @@
** Returns: void
**
*******************************************************************************/
-static void Mfc_FormatNdef_Completion_Routine(void *NdefCtxt,
+static void Mfc_FormatNdef_Completion_Routine(void* NdefCtxt,
NFCSTATUS status) {
(void)NdefCtxt;
tNFA_CONN_EVT_DATA conn_evt_data;
@@ -472,12 +469,11 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-static NFCSTATUS phFriNfc_ValidateParams(uint8_t *PacketData,
- uint32_t *PacketDataLength,
+static NFCSTATUS phFriNfc_ValidateParams(uint8_t* PacketData,
+ uint32_t* PacketDataLength,
uint8_t Offset,
- phFriNfc_NdefMap_t *pNdefMap,
+ phFriNfc_NdefMap_t* pNdefMap,
uint8_t bNdefReq) {
-
if ((pNdefMap == NULL) || (PacketData == NULL) ||
(PacketDataLength == NULL)) {
return NFCSTATUS_FAILED;
@@ -506,7 +502,6 @@
*pNdefMap->DataCount = 0;
} else if ((pNdefMap->bPrevReadMode == PH_FRINFC_NDEFMAP_SEEK_BEGIN) ||
(pNdefMap->bPrevReadMode == PH_FRINFC_NDEFMAP_SEEK_CUR)) {
-
} else {
return NFCSTATUS_FAILED;
}
@@ -534,7 +529,7 @@
** Returns: void
**
*******************************************************************************/
-static void Mfc_SetRdOnly_Completion_Routine(void *NdefCtxt, NFCSTATUS status) {
+static void Mfc_SetRdOnly_Completion_Routine(void* NdefCtxt, NFCSTATUS status) {
(void)NdefCtxt;
tNFA_CONN_EVT_DATA conn_evt_data;
LOG(ERROR) << StringPrintf("%s status = 0x%x", __func__, status);
@@ -556,7 +551,7 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-NFCSTATUS Mfc_SetReadOnly(uint8_t *secrtkey, uint8_t len) {
+NFCSTATUS Mfc_SetReadOnly(uint8_t* secrtkey, uint8_t len) {
DLOG_IF(INFO, gLog_level.extns_log_level >= NXPLOG_LOG_DEBUG_LOGLEVEL)
<< StringPrintf("%s Entering ", __func__);
NFCSTATUS status = NFCSTATUS_FAILED;
@@ -614,8 +609,8 @@
*******************************************************************************/
NFCSTATUS Mfc_ReadNdef(void) {
NFCSTATUS status = NFCSTATUS_FAILED;
- uint8_t *PacketData = NULL;
- uint32_t *PacketDataLength = NULL;
+ uint8_t* PacketData = NULL;
+ uint32_t* PacketDataLength = NULL;
phLibNfc_Ndef_EOffset_t Offset;
EXTNS_SetCallBackFlag(false);
@@ -635,8 +630,7 @@
status = NFCSTATUS_SUCCESS;
goto Mfc_RdNdefEnd;
} else {
- NdefInfo.psUpperNdefMsg->buffer =
- (uint8_t *)malloc(NdefInfo.NdefActualSize);
+ NdefInfo.psUpperNdefMsg->buffer = (uint8_t*)malloc(NdefInfo.NdefActualSize);
if (NULL == NdefInfo.psUpperNdefMsg->buffer) {
goto Mfc_RdNdefEnd;
}
@@ -651,7 +645,7 @@
}
PacketData = NdefInfo.psUpperNdefMsg->buffer;
- PacketDataLength = (uint32_t *)&(NdefInfo.psUpperNdefMsg->length);
+ PacketDataLength = (uint32_t*)&(NdefInfo.psUpperNdefMsg->length);
NdefMap->bCurrReadMode = Offset;
status = phFriNfc_ValidateParams(PacketData, PacketDataLength, Offset,
NdefMap, PH_FRINFC_NDEF_READ_REQ);
@@ -730,10 +724,10 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-NFCSTATUS Mfc_WriteNdef(uint8_t *p_data, uint32_t len) {
+NFCSTATUS Mfc_WriteNdef(uint8_t* p_data, uint32_t len) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
- uint8_t *PacketData = NULL;
- uint32_t *PacketDataLength = NULL;
+ uint8_t* PacketData = NULL;
+ uint32_t* PacketDataLength = NULL;
if (p_data == NULL || len == 0) {
LOG(ERROR) << StringPrintf("MFC Error: Invalid Parameters to Ndef Write");
@@ -807,10 +801,9 @@
** Returns NFCSTATUS_SUCCESS
**
*******************************************************************************/
-static NFCSTATUS
-phFriNfc_NdefSmtCrd_Reset__(phFriNfc_sNdefSmtCrdFmt_t *NdefSmtCrdFmt,
- uint8_t *SendRecvBuffer,
- uint16_t *SendRecvBuffLen) {
+static NFCSTATUS phFriNfc_NdefSmtCrd_Reset__(
+ phFriNfc_sNdefSmtCrdFmt_t* NdefSmtCrdFmt, uint8_t* SendRecvBuffer,
+ uint16_t* SendRecvBuffLen) {
// NFCSTATUS status = NFCSTATUS_FAILED; /*commented to
// eliminate unused variable warning*/
uint8_t index;
@@ -861,7 +854,7 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-NFCSTATUS Mfc_FormatNdef(uint8_t *secretkey, uint8_t len) {
+NFCSTATUS Mfc_FormatNdef(uint8_t* secretkey, uint8_t len) {
NFCSTATUS status = NFCSTATUS_FAILED;
uint8_t mif_std_key[6] = {0};
// static uint8_t Index;
@@ -994,7 +987,7 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-NFCSTATUS Mfc_Transceive(uint8_t *p_data, uint32_t len) {
+NFCSTATUS Mfc_Transceive(uint8_t* p_data, uint32_t len) {
NFCSTATUS status = NFCSTATUS_FAILED;
uint8_t i = 0x00;
@@ -1004,7 +997,6 @@
EXTNS_SetCallBackFlag(true);
if (p_data[0] == 0x60 || p_data[0] == 0x61) {
-
NdefMap->Cmd.MfCmd = (phNfc_eMifareCmdList_t)p_data[0];
NdefMap->SendRecvBuf[i++] = p_data[1];
@@ -1031,7 +1023,6 @@
NdefMap->SendRecvLength);
} else if ((p_data[0] == phNfc_eMifareInc) ||
(p_data[0] == phNfc_eMifareDec)) {
-
EXTNS_SetCallBackFlag(false);
NdefMap->Cmd.MfCmd = (phNfc_eMifareCmdList_t)p_data[0];
gphNxpExtns_Context.RawWriteCallBack = true;
@@ -1086,7 +1077,7 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-static NFCSTATUS nativeNfcExtns_doTransceive(uint8_t *buff, uint16_t buffSz) {
+static NFCSTATUS nativeNfcExtns_doTransceive(uint8_t* buff, uint16_t buffSz) {
NFCSTATUS wStatus = NFCSTATUS_PENDING;
tNFA_STATUS status =
NFA_SendRawFrame(buff, buffSz, NFA_DM_DEFAULT_PRESENCE_CHECK_START_DELAY);
@@ -1111,7 +1102,7 @@
** NFCSTATUS_FAILED - Data Reception failed
**
*******************************************************************************/
-static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t *RspBuffInfo,
+static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo,
NFCSTATUS wStatus) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
uint16_t wPldDataSize = 0;
@@ -1126,88 +1117,89 @@
RecvdExtnRspId = (phNciNfc_ExtnRespId_t)RspBuffInfo->pBuff[0];
switch (RecvdExtnRspId) {
- case phNciNfc_e_MfXchgDataRsp: {
- NFCSTATUS writeResponse = NFCSTATUS_SUCCESS;
- /* check the status byte */
- if (NFC_GetNCIVersion() == NCI_VERSION_2_0 &&
- (NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WR_TLV ||
- NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WRITE ||
- NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN ||
- NdefMap->State == PH_FRINFC_NDEFMAP_STATE_INIT)) {
- uint8_t rspAck = RspBuffInfo->pBuff[RspBuffInfo->wLen - 2];
- uint8_t rspAckMask = ((RspBuffInfo->pBuff[RspBuffInfo->wLen - 1]) &
- MAX_NUM_VALID_BITS_FOR_ACK);
- NCI_CALCULATE_ACK(rspAck, rspAckMask);
- writeResponse =
- (rspAck == T2T_RSP_ACK) ? NFCSTATUS_SUCCESS : NFC_STATUS_FAILED;
- } else {
- writeResponse = RspBuffInfo->pBuff[RspBuffInfo->wLen - 1];
- }
- if (PH_NCINFC_STATUS_OK == writeResponse) {
- status = NFCSTATUS_SUCCESS;
- uint16_t wRecvDataSz = 0;
+ case phNciNfc_e_MfXchgDataRsp: {
+ NFCSTATUS writeResponse = NFCSTATUS_SUCCESS;
+ /* check the status byte */
+ if (NFC_GetNCIVersion() == NCI_VERSION_2_0 &&
+ (NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WR_TLV ||
+ NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WRITE ||
+ NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN ||
+ NdefMap->State == PH_FRINFC_NDEFMAP_STATE_INIT)) {
+ uint8_t rspAck = RspBuffInfo->pBuff[RspBuffInfo->wLen - 2];
+ uint8_t rspAckMask = ((RspBuffInfo->pBuff[RspBuffInfo->wLen - 1]) &
+ MAX_NUM_VALID_BITS_FOR_ACK);
+ NCI_CALCULATE_ACK(rspAck, rspAckMask);
+ writeResponse =
+ (rspAck == T2T_RSP_ACK) ? NFCSTATUS_SUCCESS : NFC_STATUS_FAILED;
+ } else {
+ writeResponse = RspBuffInfo->pBuff[RspBuffInfo->wLen - 1];
+ }
+ if (PH_NCINFC_STATUS_OK == writeResponse) {
+ status = NFCSTATUS_SUCCESS;
+ uint16_t wRecvDataSz = 0;
- /* DataLen = TotalRecvdLen - (sizeof(RspId) + sizeof(Status)) */
- wPldDataSize = ((RspBuffInfo->wLen) -
- (PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE));
- wRecvDataSz = NCI_MAX_DATA_LEN;
+ /* DataLen = TotalRecvdLen - (sizeof(RspId) + sizeof(Status)) */
+ wPldDataSize = ((RspBuffInfo->wLen) -
+ (PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE));
+ wRecvDataSz = NCI_MAX_DATA_LEN;
- /* wPldDataSize = wPldDataSize-1; ==> ignoring the last status byte
- * appended with data */
- if ((wPldDataSize) <= wRecvDataSz) {
+ /* wPldDataSize = wPldDataSize-1; ==> ignoring the last status byte
+ * appended with data */
+ if ((wPldDataSize) <= wRecvDataSz) {
+ /* Extract the data part from pBuff[2] & fill it to be sent to
+ * upper layer */
+ memcpy(NdefMap->SendRecvBuf, &(RspBuffInfo->pBuff[1]),
+ (wPldDataSize));
+ /* update the number of bytes received from lower layer,excluding
+ * the status byte */
+ *(NdefMap->SendRecvLength) = wPldDataSize;
+ } else {
+ // TODO:- Map some status for remaining extra data received to be
+ // sent back to caller??
+ status = NFCSTATUS_FAILED;
+ }
+ } else {
+ status = NFCSTATUS_FAILED;
+ }
+ } break;
+
+ case phNciNfc_e_MfcAuthRsp: {
+ /* check the status byte */
+ if (PH_NCINFC_STATUS_OK == RspBuffInfo->pBuff[1]) {
+ if (gAuthCmdBuf.auth_sent == true) {
+ MfcPresenceCheckResult(NFCSTATUS_SUCCESS);
+ return NFCSTATUS_SUCCESS;
+ }
+ gAuthCmdBuf.auth_status = true;
+ status = NFCSTATUS_SUCCESS;
+
+ /* DataLen = TotalRecvdLen - (sizeof(RspId) + sizeof(Status)) */
+ wPldDataSize = ((RspBuffInfo->wLen) -
+ (PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE));
+
/* Extract the data part from pBuff[2] & fill it to be sent to upper
* layer */
- memcpy(NdefMap->SendRecvBuf, &(RspBuffInfo->pBuff[1]),
- (wPldDataSize));
+ memcpy(NdefMap->SendRecvBuf, &(RspBuffInfo->pBuff[2]),
+ wPldDataSize);
/* update the number of bytes received from lower layer,excluding
* the status byte */
*(NdefMap->SendRecvLength) = wPldDataSize;
} else {
- // TODO:- Map some status for remaining extra data received to be
- // sent back to caller??
+ if (gAuthCmdBuf.auth_sent == true) {
+ gAuthCmdBuf.auth_status = false;
+ MfcPresenceCheckResult(NFCSTATUS_FAILED);
+ return NFCSTATUS_SUCCESS;
+ } else {
+ /* Reset the stored auth command buffer */
+ memset(gAuthCmdBuf.pauth_cmd->buffer, 0, NCI_MAX_DATA_LEN);
+ gAuthCmdBuf.pauth_cmd->length = 0;
+ gAuthCmdBuf.auth_status = false;
+ }
status = NFCSTATUS_FAILED;
}
- } else {
- status = NFCSTATUS_FAILED;
- }
- } break;
+ } break;
- case phNciNfc_e_MfcAuthRsp: {
- /* check the status byte */
- if (PH_NCINFC_STATUS_OK == RspBuffInfo->pBuff[1]) {
- if (gAuthCmdBuf.auth_sent == true) {
- MfcPresenceCheckResult(NFCSTATUS_SUCCESS);
- return NFCSTATUS_SUCCESS;
- }
- gAuthCmdBuf.auth_status = true;
- status = NFCSTATUS_SUCCESS;
-
- /* DataLen = TotalRecvdLen - (sizeof(RspId) + sizeof(Status)) */
- wPldDataSize = ((RspBuffInfo->wLen) -
- (PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE));
-
- /* Extract the data part from pBuff[2] & fill it to be sent to upper
- * layer */
- memcpy(NdefMap->SendRecvBuf, &(RspBuffInfo->pBuff[2]), wPldDataSize);
- /* update the number of bytes received from lower layer,excluding the
- * status byte */
- *(NdefMap->SendRecvLength) = wPldDataSize;
- } else {
- if (gAuthCmdBuf.auth_sent == true) {
- gAuthCmdBuf.auth_status = false;
- MfcPresenceCheckResult(NFCSTATUS_FAILED);
- return NFCSTATUS_SUCCESS;
- } else {
- /* Reset the stored auth command buffer */
- memset(gAuthCmdBuf.pauth_cmd->buffer, 0, NCI_MAX_DATA_LEN);
- gAuthCmdBuf.pauth_cmd->length = 0;
- gAuthCmdBuf.auth_status = false;
- }
- status = NFCSTATUS_FAILED;
- }
- } break;
-
- default: { status = NFCSTATUS_FAILED; } break;
+ default: { status = NFCSTATUS_FAILED; } break;
}
}
}
@@ -1225,9 +1217,9 @@
** NFCSTATUS_INVALID_PARAMETER - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_SendWrt16CmdPayload(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
+static NFCSTATUS phLibNfc_SendWrt16CmdPayload(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
if ((NULL != pTransceiveInfo->sSendData.buffer) &&
@@ -1260,9 +1252,9 @@
** NFCSTATUS_INVALID_PARAMETER - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_SendIncDecCmdPayload(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
+static NFCSTATUS phLibNfc_SendIncDecCmdPayload(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
if ((NULL != pTransceiveInfo->sSendData.buffer) &&
@@ -1295,10 +1287,10 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-NFCSTATUS Mfc_RecvPacket(uint8_t *buff, uint8_t buffSz) {
+NFCSTATUS Mfc_RecvPacket(uint8_t* buff, uint8_t buffSz) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
phNciNfc_Buff_t RspBuff;
- uint8_t *pcmd_buff;
+ uint8_t* pcmd_buff;
uint16_t buffSize;
RspBuff.pBuff = buff;
@@ -1312,7 +1304,7 @@
}
if (true == gphNxpExtns_Context.writecmdFlag &&
(NFCSTATUS_SUCCESS == status)) {
- pcmd_buff = (uint8_t *)malloc((uint32_t)MAX_BUFF_SIZE);
+ pcmd_buff = (uint8_t*)malloc((uint32_t)MAX_BUFF_SIZE);
if (NULL == pcmd_buff) {
return NFCSTATUS_FAILED;
}
@@ -1331,7 +1323,7 @@
}
} else if (true == gphNxpExtns_Context.incrdecflag &&
(NFCSTATUS_SUCCESS == status)) {
- pcmd_buff = (uint8_t *)malloc((uint32_t)MAX_BUFF_SIZE);
+ pcmd_buff = (uint8_t*)malloc((uint32_t)MAX_BUFF_SIZE);
if (NULL == pcmd_buff) {
return NFCSTATUS_FAILED;
}
@@ -1375,9 +1367,8 @@
** NFCSTATUS_FAILED - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phNciNfc_MfCreateXchgDataHdr(phNciNfc_TransceiveInfo_t tTranscvInfo,
- uint8_t *buff, uint16_t *buffSz)
+static NFCSTATUS phNciNfc_MfCreateXchgDataHdr(
+ phNciNfc_TransceiveInfo_t tTranscvInfo, uint8_t* buff, uint16_t* buffSz)
{
NFCSTATUS status = NFCSTATUS_SUCCESS;
@@ -1403,10 +1394,9 @@
** NFCSTATUS_FAILED - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phNciNfc_MfCreateAuthCmdHdr(phNciNfc_TransceiveInfo_t tTranscvInfo,
- uint8_t bBlockAddr, uint8_t *buff,
- uint16_t *buffSz) {
+static NFCSTATUS phNciNfc_MfCreateAuthCmdHdr(
+ phNciNfc_TransceiveInfo_t tTranscvInfo, uint8_t bBlockAddr, uint8_t* buff,
+ uint16_t* buffSz) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
// pphNciNfc_RemoteDevInformation_t pActivDev = NULL;
// /*commented to eliminate unused variable warning*/
@@ -1462,21 +1452,21 @@
**
*******************************************************************************/
static NFCSTATUS phNciNfc_SendMfReq(phNciNfc_TransceiveInfo_t tTranscvInfo,
- uint8_t *buff, uint16_t *buffSz) {
+ uint8_t* buff, uint16_t* buffSz) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
switch (tTranscvInfo.uCmd.T2TCmd) {
- case phNciNfc_eT2TRaw: {
- status = phNciNfc_MfCreateXchgDataHdr(tTranscvInfo, buff, buffSz);
- } break;
- case phNciNfc_eT2TAuth: {
- status = phNciNfc_MfCreateAuthCmdHdr(tTranscvInfo, (tTranscvInfo.bAddr),
- buff, buffSz);
- } break;
- default: {
- status = NFCSTATUS_FAILED;
- break;
- }
+ case phNciNfc_eT2TRaw: {
+ status = phNciNfc_MfCreateXchgDataHdr(tTranscvInfo, buff, buffSz);
+ } break;
+ case phNciNfc_eT2TAuth: {
+ status = phNciNfc_MfCreateAuthCmdHdr(tTranscvInfo, (tTranscvInfo.bAddr),
+ buff, buffSz);
+ } break;
+ default: {
+ status = NFCSTATUS_FAILED;
+ break;
+ }
}
return status;
@@ -1491,7 +1481,7 @@
** Returns none
**
*******************************************************************************/
-static void phLibNfc_CalSectorAddress(uint8_t *Sector_Address) {
+static void phLibNfc_CalSectorAddress(uint8_t* Sector_Address) {
uint8_t BlockNumber = 0x00;
if (NULL != Sector_Address) {
@@ -1520,7 +1510,7 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-static NFCSTATUS phLibNfc_GetKeyNumberMFC(uint8_t *buffer, uint8_t *bKey) {
+static NFCSTATUS phLibNfc_GetKeyNumberMFC(uint8_t* buffer, uint8_t* bKey) {
int32_t sdwStat = 0X00;
NFCSTATUS wStatus = NFCSTATUS_INVALID_PARAMETER;
@@ -1578,9 +1568,8 @@
** NFCSTATUS_FAILED - otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_ChkAuthCmdMFC(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- uint8_t *bKey) {
+static NFCSTATUS phLibNfc_ChkAuthCmdMFC(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo, uint8_t* bKey) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
if (NULL != pTransceiveInfo && NULL != pTransceiveInfo->sSendData.buffer &&
@@ -1608,93 +1597,92 @@
** NFCSTATUS_INVALID_PARAMETER - otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_MifareMap(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
+static NFCSTATUS phLibNfc_MifareMap(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
uint8_t bBuffIdx = 0;
uint8_t bSectorNumber;
uint8_t bKey = 0;
switch (pTransceiveInfo->cmd.MfCmd) {
- case phNfc_eMifareRead16: {
- if ((NULL != pTransceiveInfo->sRecvData.buffer) &&
- (0 != (pTransceiveInfo->sRecvData.length))) {
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = phNfc_eMifareRead16;
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = pTransceiveInfo->addr;
- pMappedTranscvIf->tSendData.wLen = bBuffIdx;
- pMappedTranscvIf->uCmd.T2TCmd = phNciNfc_eT2TRaw;
- } else {
- status = NFCSTATUS_INVALID_PARAMETER;
- }
- } break;
-
- case phNfc_eMifareWrite16: {
- if ((NULL != pTransceiveInfo->sSendData.buffer) &&
- (0 != (pTransceiveInfo->sSendData.length))) {
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = phNfc_eMifareWrite16;
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = pTransceiveInfo->addr;
- memcpy(&(pMappedTranscvIf->tSendData.pBuff[bBuffIdx]),
- pTransceiveInfo->sSendData.buffer,
- (pTransceiveInfo->sSendData.length));
- pMappedTranscvIf->tSendData.wLen =
- bBuffIdx + pTransceiveInfo->sSendData.length;
- pMappedTranscvIf->uCmd.T2TCmd = phNciNfc_eT2TRaw;
- } else {
- status = NFCSTATUS_INVALID_PARAMETER;
- }
- } break;
-
- case phNfc_eMifareAuthentA:
- case phNfc_eMifareAuthentB: {
- if ((NULL != pTransceiveInfo->sSendData.buffer) &&
- (0 != (pTransceiveInfo->sSendData.length)) &&
- (NULL != pTransceiveInfo->sRecvData.buffer) &&
- (0 != (pTransceiveInfo->sRecvData.length))) {
- status = phLibNfc_ChkAuthCmdMFC(pTransceiveInfo, &bKey);
- if (NFCSTATUS_FAILED != status) {
- bSectorNumber = pTransceiveInfo->addr;
- phLibNfc_CalSectorAddress(&bSectorNumber);
- /*For creating extension command header pTransceiveInfo's MfCmd get
- * used*/
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] =
- pTransceiveInfo->cmd.MfCmd;
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = bSectorNumber;
- pMappedTranscvIf->uCmd.T2TCmd = phNciNfc_eT2TAuth;
- pMappedTranscvIf->bAddr = bSectorNumber;
- pMappedTranscvIf->bNumBlock = pTransceiveInfo->NumBlock;
- if (NFCSTATUS_SUCCESS == status) {
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = bKey;
- (pMappedTranscvIf->tSendData.wLen) = (uint16_t)(bBuffIdx);
-
- } else if (NFCSTATUS_INVALID_PARAMETER == status) {
- bKey = bKey | PH_NCINFC_MIFARECLASSIC_EMBEDDED_KEY;
- pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = bKey;
- memcpy(
- &pMappedTranscvIf->tSendData.pBuff[bBuffIdx],
- &pTransceiveInfo->sSendData.buffer[PHLIBNFC_MFCUIDLEN_INAUTHCMD],
- PHLIBNFC_MFC_AUTHKEYLEN);
-
- (pMappedTranscvIf->tSendData.wLen) =
- (uint16_t)(bBuffIdx + PHLIBNFC_MFC_AUTHKEYLEN);
- status = NFCSTATUS_SUCCESS;
- } else {
- /* do nothing */
- }
+ case phNfc_eMifareRead16: {
+ if ((NULL != pTransceiveInfo->sRecvData.buffer) &&
+ (0 != (pTransceiveInfo->sRecvData.length))) {
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = phNfc_eMifareRead16;
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = pTransceiveInfo->addr;
+ pMappedTranscvIf->tSendData.wLen = bBuffIdx;
+ pMappedTranscvIf->uCmd.T2TCmd = phNciNfc_eT2TRaw;
+ } else {
+ status = NFCSTATUS_INVALID_PARAMETER;
}
- } else {
+ } break;
+
+ case phNfc_eMifareWrite16: {
+ if ((NULL != pTransceiveInfo->sSendData.buffer) &&
+ (0 != (pTransceiveInfo->sSendData.length))) {
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = phNfc_eMifareWrite16;
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = pTransceiveInfo->addr;
+ memcpy(&(pMappedTranscvIf->tSendData.pBuff[bBuffIdx]),
+ pTransceiveInfo->sSendData.buffer,
+ (pTransceiveInfo->sSendData.length));
+ pMappedTranscvIf->tSendData.wLen =
+ bBuffIdx + pTransceiveInfo->sSendData.length;
+ pMappedTranscvIf->uCmd.T2TCmd = phNciNfc_eT2TRaw;
+ } else {
+ status = NFCSTATUS_INVALID_PARAMETER;
+ }
+ } break;
+
+ case phNfc_eMifareAuthentA:
+ case phNfc_eMifareAuthentB: {
+ if ((NULL != pTransceiveInfo->sSendData.buffer) &&
+ (0 != (pTransceiveInfo->sSendData.length)) &&
+ (NULL != pTransceiveInfo->sRecvData.buffer) &&
+ (0 != (pTransceiveInfo->sRecvData.length))) {
+ status = phLibNfc_ChkAuthCmdMFC(pTransceiveInfo, &bKey);
+ if (NFCSTATUS_FAILED != status) {
+ bSectorNumber = pTransceiveInfo->addr;
+ phLibNfc_CalSectorAddress(&bSectorNumber);
+ /*For creating extension command header pTransceiveInfo's MfCmd get
+ * used*/
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] =
+ pTransceiveInfo->cmd.MfCmd;
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = bSectorNumber;
+ pMappedTranscvIf->uCmd.T2TCmd = phNciNfc_eT2TAuth;
+ pMappedTranscvIf->bAddr = bSectorNumber;
+ pMappedTranscvIf->bNumBlock = pTransceiveInfo->NumBlock;
+ if (NFCSTATUS_SUCCESS == status) {
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = bKey;
+ (pMappedTranscvIf->tSendData.wLen) = (uint16_t)(bBuffIdx);
+
+ } else if (NFCSTATUS_INVALID_PARAMETER == status) {
+ bKey = bKey | PH_NCINFC_MIFARECLASSIC_EMBEDDED_KEY;
+ pMappedTranscvIf->tSendData.pBuff[bBuffIdx++] = bKey;
+ memcpy(&pMappedTranscvIf->tSendData.pBuff[bBuffIdx],
+ &pTransceiveInfo->sSendData
+ .buffer[PHLIBNFC_MFCUIDLEN_INAUTHCMD],
+ PHLIBNFC_MFC_AUTHKEYLEN);
+
+ (pMappedTranscvIf->tSendData.wLen) =
+ (uint16_t)(bBuffIdx + PHLIBNFC_MFC_AUTHKEYLEN);
+ status = NFCSTATUS_SUCCESS;
+ } else {
+ /* do nothing */
+ }
+ }
+ } else {
+ status = NFCSTATUS_INVALID_PARAMETER;
+ }
+ } break;
+
+ case phNfc_eMifareRaw: {
+ } break;
+
+ default: {
status = NFCSTATUS_INVALID_PARAMETER;
+ break;
}
- } break;
-
- case phNfc_eMifareRaw: {
-
- } break;
-
- default: {
- status = NFCSTATUS_INVALID_PARAMETER;
- break;
- }
}
return status;
@@ -1714,21 +1702,20 @@
**
*******************************************************************************/
static NFCSTATUS phLibNfc_MapCmds(phNciNfc_RFDevType_t RemDevType,
- phNfc_sTransceiveInfo_t *pTransceiveInfo,
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
-
NFCSTATUS status = NFCSTATUS_SUCCESS;
if ((NULL == pTransceiveInfo) || (NULL == pMappedTranscvIf)) {
return NFCSTATUS_FAILED;
}
switch (RemDevType) {
- case phNciNfc_eMifare1k_PICC:
- case phNciNfc_eMifare4k_PICC: {
- status = phLibNfc_MifareMap(pTransceiveInfo, pMappedTranscvIf);
- break;
- }
- default: { break; }
+ case phNciNfc_eMifare1k_PICC:
+ case phNciNfc_eMifare4k_PICC: {
+ status = phLibNfc_MifareMap(pTransceiveInfo, pMappedTranscvIf);
+ break;
+ }
+ default: { break; }
}
return status;
@@ -1744,9 +1731,9 @@
** NFCSTATUS_INVALID_PARAMETER - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_SendAuthCmd(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- phNciNfc_TransceiveInfo_t *tNciTranscvInfo) {
+static NFCSTATUS phLibNfc_SendAuthCmd(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ phNciNfc_TransceiveInfo_t* tNciTranscvInfo) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
wStatus = phLibNfc_MapCmds(phNciNfc_eMifare1k_PICC, pTransceiveInfo,
@@ -1765,9 +1752,9 @@
** NFCSTATUS_INVALID_PARAMETER - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_SendWrt16Cmd(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
+static NFCSTATUS phLibNfc_SendWrt16Cmd(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
uint8_t bBuffIdx = 0x00;
@@ -1795,10 +1782,9 @@
** NFCSTATUS_INVALID_PARAMETER - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_SendIncDecCmd(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf,
- uint8_t IncDecCmd) {
+static NFCSTATUS phLibNfc_SendIncDecCmd(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf, uint8_t IncDecCmd) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
uint8_t bBuffIdx = 0x00;
@@ -1825,9 +1811,9 @@
** NFCSTATUS_INVALID_PARAMETER - Otherwise
**
*******************************************************************************/
-static NFCSTATUS
-phLibNfc_SendRawCmd(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
+static NFCSTATUS phLibNfc_SendRawCmd(
+ phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ pphNciNfc_TransceiveInfo_t pMappedTranscvIf) {
NFCSTATUS wStatus = NFCSTATUS_SUCCESS;
// uint8_t bBuffIdx = 0x00; /*commented to
// eliminate unused variable warning*/
@@ -1855,13 +1841,13 @@
** NFCSTATUS_INVALID_PARAMETER - Otherwise
**
*******************************************************************************/
-NFCSTATUS phFriNfc_ExtnsTransceive(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- phNfc_uCmdList_t Cmd, uint8_t *SendRecvBuf,
+NFCSTATUS phFriNfc_ExtnsTransceive(phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ phNfc_uCmdList_t Cmd, uint8_t* SendRecvBuf,
uint16_t SendLength,
- uint16_t *SendRecvLength) {
+ uint16_t* SendRecvLength) {
(void)SendRecvLength;
NFCSTATUS status = NFCSTATUS_FAILED;
- uint8_t *buff = NULL;
+ uint8_t* buff = NULL;
uint16_t buffSz = 0;
uint8_t i = 0;
uint32_t length = SendLength;
@@ -1869,7 +1855,7 @@
0x00, 0x00, 0x00, 0x00,
};
- buff = (uint8_t *)malloc((uint32_t)MAX_BUFF_SIZE);
+ buff = (uint8_t*)malloc((uint32_t)MAX_BUFF_SIZE);
if (NULL == buff) {
return status;
}
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.h b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.h
index b4a8fd2..fc40157 100644
--- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.h
+++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.h
@@ -33,37 +33,37 @@
#define PHLIBNFC_MIFARESTD4K_BLK128 128 /*Block number 128 for Mifare 4k */
#define PHLIBNFC_MIFARESTD_SECTOR_NO32 32 /* Sector 32 for Mifare 4K*/
-#define PHLIBNFC_MIFARESTD_BLOCK_BYTES \
+#define PHLIBNFC_MIFARESTD_BLOCK_BYTES \
16 /* Bytes per block after block 32 for Mifare 4K*/
-#define PHLIBNFC_NO_OF_BLKPERSECTOR \
- (0x04) /* Number of blocks per sector for \
+#define PHLIBNFC_NO_OF_BLKPERSECTOR \
+ (0x04) /* Number of blocks per sector for \
* Mifare Clsssic Tag*/
-#define PHLIBNFC_MFCUIDLEN_INAUTHCMD \
+#define PHLIBNFC_MFCUIDLEN_INAUTHCMD \
0x04 /* UID length in Authentication command */
#define PHLIBNFC_MFC_AUTHKEYLEN 0x06 /* Authentication key length */
-#define PHNCINFC_AUTHENTICATION_KEY \
- (0x00U) /* Authentication key passed in extension \
+#define PHNCINFC_AUTHENTICATION_KEY \
+ (0x00U) /* Authentication key passed in extension \
command header of authentication command */
#define PHNCINFC_AUTHENTICATION_KEYB (0x61U) /* Authentication Key B */
#define PHNCINFC_ENABLE_KEY_B (0x80U) /* Enable Key B */
-#define PH_NCINFC_MIFARECLASSIC_EMBEDDED_KEY \
+#define PH_NCINFC_MIFARECLASSIC_EMBEDDED_KEY \
(0x10) /* MIFARE Classic use Embedded Key*/
#define PH_NCINFC_STATUS_OK (0x0000) /* Status OK */
#define PHNCINFC_EXTNID_SIZE (0x01U) /* Size of Mifare Extension Req/Rsp Id */
-#define PHNCINFC_EXTNSTATUS_SIZE \
+#define PHNCINFC_EXTNSTATUS_SIZE \
(0x01U) /* Size of Mifare Extension Resp Status Byte */
-#define PH_NCINFC_EXTN_INVALID_PARAM_VAL \
+#define PH_NCINFC_EXTN_INVALID_PARAM_VAL \
(0xFFU) /* Initial value of Req/Resp Param/Status */
#define PH_FRINFC_NDEF_READ_REQ (0x00U) /* NDEF Read Request */
#define PH_FRINFC_NDEF_WRITE_REQ (0x01U) /* NDEF Write Request */
-#define PH_LIBNFC_INTERNAL_CHK_NDEF_NOT_DONE \
+#define PH_LIBNFC_INTERNAL_CHK_NDEF_NOT_DONE \
(0x02U) /* Status for check NDEF not done */
#define NDEF_SENDRCV_BUF_LEN 252U /* Send receive buffer length */
@@ -71,13 +71,13 @@
#define NXP_NUMBER_OF_MFC_KEYS (0x04U)
#define NXP_MFC_KEY_SIZE (0x06U)
-#define NXP_MFC_KEYS \
- { \
- {0xA0, 0XA1, 0xA2, 0XA3, 0xA4, 0XA5}, \
- {0xD3, 0XF7, 0xD3, 0XF7, 0xD3, 0XF7}, \
- {0xFF, 0XFF, 0xFF, 0XFF, 0xFF, 0XFF}, { \
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 \
- } \
+#define NXP_MFC_KEYS \
+ { \
+ {0xA0, 0XA1, 0xA2, 0XA3, 0xA4, 0XA5}, \
+ {0xD3, 0XF7, 0xD3, 0XF7, 0xD3, 0XF7}, \
+ {0xFF, 0XFF, 0xFF, 0XFF, 0xFF, 0XFF}, { \
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 \
+ } \
} /* Key used during NDEF format */
#ifndef NCI_MAX_DATA_LEN
@@ -122,8 +122,8 @@
/* Data buffer */
typedef struct phNciNfc_Buff {
- uint8_t
- *pBuff; /* pointer to the buffer where received payload shall be stored*/
+ uint8_t*
+ pBuff; /* pointer to the buffer where received payload shall be stored*/
uint16_t wLen; /* Buffer length*/
} phNciNfc_Buff_t, *pphNciNfc_Buff_t;
@@ -144,17 +144,16 @@
* NDEF related data structures
*/
typedef struct phLibNfc_NdefInfo {
-
uint8_t NdefContinueRead;
uint32_t NdefActualSize;
uint32_t AppWrLength;
- phFriNfc_NdefMap_t *psNdefMap;
+ phFriNfc_NdefMap_t* psNdefMap;
uint16_t NdefSendRecvLen;
- phNfc_sData_t *psUpperNdefMsg;
+ phNfc_sData_t* psUpperNdefMsg;
uint32_t dwWrLength;
uint32_t NdefLength;
uint8_t is_ndef;
- phFriNfc_sNdefSmtCrdFmt_t *ndef_fmt;
+ phFriNfc_sNdefSmtCrdFmt_t* ndef_fmt;
} phLibNfc_NdefInfo_t;
/*
@@ -181,7 +180,7 @@
/*
* Mifare Callback function definition
*/
-typedef void (*CallBackMifare_t)(void *, uint16_t);
+typedef void (*CallBackMifare_t)(void*, uint16_t);
/*
* Auth Cmd Data
@@ -192,7 +191,7 @@
sem_t semPresenceCheck;
pthread_mutex_t syncmutex;
NFCSTATUS status;
- phNfc_sData_t *pauth_cmd;
+ phNfc_sData_t* pauth_cmd;
} phNci_mfc_auth_cmd_t;
/*
* Structure of callback functions from different module.
@@ -200,12 +199,12 @@
*/
typedef struct phNxpExtns_Context {
phNxpExtns_Status Extns_status;
- tNFA_DM_CBACK *p_dm_cback;
- tNFA_CONN_CBACK *p_conn_cback;
- tNFA_NDEF_CBACK *p_ndef_cback;
+ tNFA_DM_CBACK* p_dm_cback;
+ tNFA_CONN_CBACK* p_conn_cback;
+ tNFA_NDEF_CBACK* p_ndef_cback;
uint8_t writecmdFlag;
uint8_t RawWriteCallBack;
- void *CallBackCtxt;
+ void* CallBackCtxt;
CallBackMifare_t CallBackMifare;
bool_t ExtnsConnect;
bool_t ExtnsDeactivate;
@@ -214,21 +213,21 @@
uint8_t incrdecstatusflag;
} phNxpExtns_Context_t;
-NFCSTATUS phFriNfc_ExtnsTransceive(phNfc_sTransceiveInfo_t *pTransceiveInfo,
- phNfc_uCmdList_t Cmd, uint8_t *SendRecvBuf,
+NFCSTATUS phFriNfc_ExtnsTransceive(phNfc_sTransceiveInfo_t* pTransceiveInfo,
+ phNfc_uCmdList_t Cmd, uint8_t* SendRecvBuf,
uint16_t SendLength,
- uint16_t *SendRecvLength);
+ uint16_t* SendRecvLength);
NFCSTATUS phNxpExtns_MfcModuleInit(void);
NFCSTATUS phNxpExtns_MfcModuleDeInit(void);
-NFCSTATUS Mfc_WriteNdef(uint8_t *p_data, uint32_t len);
+NFCSTATUS Mfc_WriteNdef(uint8_t* p_data, uint32_t len);
NFCSTATUS Mfc_CheckNdef(void);
NFCSTATUS Mfc_ReadNdef(void);
-NFCSTATUS Mfc_FormatNdef(uint8_t *secretkey, uint8_t len);
-NFCSTATUS Mfc_Transceive(uint8_t *p_data, uint32_t len);
-NFCSTATUS Mfc_SetReadOnly(uint8_t *secrtkey, uint8_t len);
+NFCSTATUS Mfc_FormatNdef(uint8_t* secretkey, uint8_t len);
+NFCSTATUS Mfc_Transceive(uint8_t* p_data, uint32_t len);
+NFCSTATUS Mfc_SetReadOnly(uint8_t* secrtkey, uint8_t len);
void Mfc_DeactivateCbackSelect(void);
void Mfc_ActivateCback(void);
-NFCSTATUS Mfc_RecvPacket(uint8_t *buff, uint8_t buffSz);
+NFCSTATUS Mfc_RecvPacket(uint8_t* buff, uint8_t buffSz);
NFCSTATUS phNxNciExtns_MifareStd_Reconnect(void);
NFCSTATUS Mfc_PresenceCheck(void);
diff --git a/nci/jni/extns/pn54x/src/phNxpExtns.cpp b/nci/jni/extns/pn54x/src/phNxpExtns.cpp
index 5d08b7d..22cf5ea 100644
--- a/nci/jni/extns/pn54x/src/phNxpExtns.cpp
+++ b/nci/jni/extns/pn54x/src/phNxpExtns.cpp
@@ -29,11 +29,11 @@
using android::base::StringPrintf;
static phNxpExtns_Context_t gphNxpExtns_Context;
-extern phFriNfc_NdefMap_t *NdefMap;
+extern phFriNfc_NdefMap_t* NdefMap;
extern phNci_mfc_auth_cmd_t gAuthCmdBuf;
-static NFCSTATUS phNxpExtns_ProcessSysMessage(phLibNfc_Message_t *msg);
-static NFCSTATUS phNxpExtns_SendMsg(phLibNfc_Message_t *sysmsg);
+static NFCSTATUS phNxpExtns_ProcessSysMessage(phLibNfc_Message_t* msg);
+static NFCSTATUS phNxpExtns_SendMsg(phLibNfc_Message_t* sysmsg);
#ifdef ESE_NFC_SYNCHRONIZATION
/* timing calculation structure*/
@@ -55,8 +55,8 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-NFCSTATUS EXTNS_Init(tNFA_DM_CBACK *p_nfa_dm_cback,
- tNFA_CONN_CBACK *p_nfa_conn_cback) {
+NFCSTATUS EXTNS_Init(tNFA_DM_CBACK* p_nfa_dm_cback,
+ tNFA_CONN_CBACK* p_nfa_conn_cback) {
NFCSTATUS status = NFCSTATUS_FAILED;
/* reset config cache */
@@ -116,7 +116,7 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-NFCSTATUS EXTNS_MfcCallBack(uint8_t *buf, uint32_t buflen) {
+NFCSTATUS EXTNS_MfcCallBack(uint8_t* buf, uint32_t buflen) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
phLibNfc_Message_t msg;
@@ -248,7 +248,7 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-NFCSTATUS EXTNS_MfcSetReadOnly(uint8_t *key, uint8_t len) {
+NFCSTATUS EXTNS_MfcSetReadOnly(uint8_t* key, uint8_t len) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
phLibNfc_Message_t msg;
@@ -281,7 +281,7 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-NFCSTATUS EXTNS_MfcWriteNDef(uint8_t *p_data, uint32_t len) {
+NFCSTATUS EXTNS_MfcWriteNDef(uint8_t* p_data, uint32_t len) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
phLibNfc_Message_t msg;
@@ -312,7 +312,7 @@
** NFCSTATUS_FAILED otherwise
**
*****************************************************************************/
-NFCSTATUS EXTNS_MfcFormatTag(uint8_t *key, uint8_t len) {
+NFCSTATUS EXTNS_MfcFormatTag(uint8_t* key, uint8_t len) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
phLibNfc_Message_t msg;
@@ -394,7 +394,7 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-NFCSTATUS EXTNS_MfcTransceive(uint8_t *p_data, uint32_t len) {
+NFCSTATUS EXTNS_MfcTransceive(uint8_t* p_data, uint32_t len) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
phLibNfc_Message_t msg;
@@ -446,7 +446,7 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-static NFCSTATUS phNxpExtns_ProcessSysMessage(phLibNfc_Message_t *msg) {
+static NFCSTATUS phNxpExtns_ProcessSysMessage(phLibNfc_Message_t* msg) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
if (gphNxpExtns_Context.Extns_status == EXTNS_STATUS_CLOSE) {
@@ -454,56 +454,56 @@
}
switch (msg->eMsgType) {
- case PH_NXPEXTNS_RX_DATA:
- status = Mfc_RecvPacket((uint8_t *)msg->pMsgData, msg->Size);
- break;
+ case PH_NXPEXTNS_RX_DATA:
+ status = Mfc_RecvPacket((uint8_t*)msg->pMsgData, msg->Size);
+ break;
- case PH_NXPEXTNS_MIFARE_CHECK_NDEF:
- pthread_mutex_init(&gAuthCmdBuf.syncmutex, NULL);
- pthread_mutex_lock(&gAuthCmdBuf.syncmutex);
- status = Mfc_CheckNdef();
- pthread_mutex_unlock(&gAuthCmdBuf.syncmutex);
- pthread_mutex_destroy(&gAuthCmdBuf.syncmutex);
- break;
+ case PH_NXPEXTNS_MIFARE_CHECK_NDEF:
+ pthread_mutex_init(&gAuthCmdBuf.syncmutex, NULL);
+ pthread_mutex_lock(&gAuthCmdBuf.syncmutex);
+ status = Mfc_CheckNdef();
+ pthread_mutex_unlock(&gAuthCmdBuf.syncmutex);
+ pthread_mutex_destroy(&gAuthCmdBuf.syncmutex);
+ break;
- case PH_NXPEXTNS_MIFARE_READ_NDEF:
- status = Mfc_ReadNdef();
- break;
+ case PH_NXPEXTNS_MIFARE_READ_NDEF:
+ status = Mfc_ReadNdef();
+ break;
- case PH_NXPEXTNS_MIFARE_WRITE_NDEF:
- status = Mfc_WriteNdef((uint8_t *)msg->pMsgData, msg->Size);
- break;
+ case PH_NXPEXTNS_MIFARE_WRITE_NDEF:
+ status = Mfc_WriteNdef((uint8_t*)msg->pMsgData, msg->Size);
+ break;
- case PH_NXPEXTNS_MIFARE_FORMAT_NDEF:
- status = Mfc_FormatNdef((uint8_t *)msg->pMsgData, msg->Size);
- break;
+ case PH_NXPEXTNS_MIFARE_FORMAT_NDEF:
+ status = Mfc_FormatNdef((uint8_t*)msg->pMsgData, msg->Size);
+ break;
- case PH_NXPEXTNS_DISCONNECT:
- Mfc_DeactivateCbackSelect();
- break;
+ case PH_NXPEXTNS_DISCONNECT:
+ Mfc_DeactivateCbackSelect();
+ break;
- case PH_NXPEXTNS_ACTIVATED:
- Mfc_ActivateCback();
- break;
+ case PH_NXPEXTNS_ACTIVATED:
+ Mfc_ActivateCback();
+ break;
- case PH_NXPEXTNS_MIFARE_TRANSCEIVE:
- status = Mfc_Transceive((uint8_t *)msg->pMsgData, msg->Size);
- break;
+ case PH_NXPEXTNS_MIFARE_TRANSCEIVE:
+ status = Mfc_Transceive((uint8_t*)msg->pMsgData, msg->Size);
+ break;
- case PH_NXPEXTNS_MIFARE_READ_ONLY:
- status = Mfc_SetReadOnly((uint8_t *)msg->pMsgData, msg->Size);
- break;
- case PH_NXPEXTNS_MIFARE_PRESENCE_CHECK:
- pthread_mutex_init(&gAuthCmdBuf.syncmutex, NULL);
- pthread_mutex_lock(&gAuthCmdBuf.syncmutex);
- status = Mfc_PresenceCheck();
- pthread_mutex_unlock(&gAuthCmdBuf.syncmutex);
- pthread_mutex_destroy(&gAuthCmdBuf.syncmutex);
- break;
- default:
- status = NFCSTATUS_FAILED;
- LOG(ERROR) << StringPrintf("Illegal Command for Extension");
- break;
+ case PH_NXPEXTNS_MIFARE_READ_ONLY:
+ status = Mfc_SetReadOnly((uint8_t*)msg->pMsgData, msg->Size);
+ break;
+ case PH_NXPEXTNS_MIFARE_PRESENCE_CHECK:
+ pthread_mutex_init(&gAuthCmdBuf.syncmutex, NULL);
+ pthread_mutex_lock(&gAuthCmdBuf.syncmutex);
+ status = Mfc_PresenceCheck();
+ pthread_mutex_unlock(&gAuthCmdBuf.syncmutex);
+ pthread_mutex_destroy(&gAuthCmdBuf.syncmutex);
+ break;
+ default:
+ status = NFCSTATUS_FAILED;
+ LOG(ERROR) << StringPrintf("Illegal Command for Extension");
+ break;
}
return status;
@@ -519,7 +519,7 @@
** NFCSTATUS_FAILED otherwise
**
*******************************************************************************/
-static NFCSTATUS phNxpExtns_SendMsg(phLibNfc_Message_t *sysmsg) {
+static NFCSTATUS phNxpExtns_SendMsg(phLibNfc_Message_t* sysmsg) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
status = phNxpExtns_ProcessSysMessage(sysmsg);
@@ -541,8 +541,7 @@
**
*******************************************************************************/
NFCSTATUS
-EXTNS_MfcRegisterNDefTypeHandler(tNFA_NDEF_CBACK *ndefHandlerCallback) {
-
+EXTNS_MfcRegisterNDefTypeHandler(tNFA_NDEF_CBACK* ndefHandlerCallback) {
NFCSTATUS status = NFCSTATUS_FAILED;
if (NULL != ndefHandlerCallback) {
gphNxpExtns_Context.p_ndef_cback = ndefHandlerCallback;
@@ -583,7 +582,7 @@
clock_gettime(CLOCK_REALTIME, &ts);
ts.tv_sec += 0;
- ts.tv_nsec += 100 * 1000 * 1000; // 100 milisec
+ ts.tv_nsec += 100 * 1000 * 1000; // 100 milisec
if (ts.tv_nsec >= 1000 * 1000 * 1000) {
ts.tv_sec += 1;
ts.tv_nsec = ts.tv_nsec - (1000 * 1000 * 1000);
@@ -622,8 +621,8 @@
** NFCSTATUS_FAILED
**
*******************************************************************************/
-NFCSTATUS EXTNS_CheckMfcResponse(uint8_t **sTransceiveData,
- uint32_t *sTransceiveDataLen) {
+NFCSTATUS EXTNS_CheckMfcResponse(uint8_t** sTransceiveData,
+ uint32_t* sTransceiveDataLen) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
if (*sTransceiveDataLen == 3) {
diff --git a/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp b/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp
index 3af04cc..0e13ad9 100644
--- a/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp
+++ b/nci/jni/extns/pn54x/src/utils/phNxpConfig.cpp
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <list>
#include <phNxpConfig.h>
#include <stdio.h>
-#include <string>
#include <sys/stat.h>
+#include <list>
+#include <string>
#include <vector>
#include <android-base/stringprintf.h>
@@ -32,9 +32,9 @@
#endif
#if 1
-const char *transport_config_paths[] = {"/odm/etc/", "/vendor/etc/", "/etc/"};
+const char* transport_config_paths[] = {"/odm/etc/", "/vendor/etc/", "/etc/"};
#else
-const char *transport_config_paths[] = {"res/"};
+const char* transport_config_paths[] = {"res/"};
#endif
const int transport_config_path_size =
(sizeof(transport_config_paths) / sizeof(transport_config_paths[0]));
@@ -49,41 +49,41 @@
using namespace ::std;
class CNxpNfcParam : public string {
-public:
+ public:
CNxpNfcParam();
- CNxpNfcParam(const char *name, const string &value);
- CNxpNfcParam(const char *name, unsigned long value);
+ CNxpNfcParam(const char* name, const string& value);
+ CNxpNfcParam(const char* name, unsigned long value);
virtual ~CNxpNfcParam();
unsigned long numValue() const { return m_numValue; }
- const char *str_value() const { return m_str_value.c_str(); }
+ const char* str_value() const { return m_str_value.c_str(); }
size_t str_len() const { return m_str_value.length(); }
-private:
+ private:
string m_str_value;
unsigned long m_numValue;
};
-class CNxpNfcConfig : public vector<const CNxpNfcParam *> {
-public:
+class CNxpNfcConfig : public vector<const CNxpNfcParam*> {
+ public:
virtual ~CNxpNfcConfig();
- static CNxpNfcConfig &GetInstance();
- friend void readOptionalConfig(const char *optional);
+ static CNxpNfcConfig& GetInstance();
+ friend void readOptionalConfig(const char* optional);
int checkTimestamp();
- bool getValue(const char *name, char *pValue, size_t len) const;
- bool getValue(const char *name, unsigned long &rValue) const;
- bool getValue(const char *name, unsigned short &rValue) const;
- bool getValue(const char *name, char *pValue, long len, long *readlen) const;
- const CNxpNfcParam *find(const char *p_name) const;
+ bool getValue(const char* name, char* pValue, size_t len) const;
+ bool getValue(const char* name, unsigned long& rValue) const;
+ bool getValue(const char* name, unsigned short& rValue) const;
+ bool getValue(const char* name, char* pValue, long len, long* readlen) const;
+ const CNxpNfcParam* find(const char* p_name) const;
void clean();
-private:
+ private:
CNxpNfcConfig();
- bool readConfig(const char *name, bool bResetContent);
+ bool readConfig(const char* name, bool bResetContent);
void moveFromList();
void moveToList();
- void add(const CNxpNfcParam *pParam);
- list<const CNxpNfcParam *> m_list;
+ void add(const CNxpNfcParam* pParam);
+ list<const CNxpNfcParam*> m_list;
bool mValidFile;
unsigned long m_timeStamp;
@@ -118,11 +118,9 @@
**
*******************************************************************************/
inline bool isDigit(char c, int base) {
- if ('0' <= c && c <= '9')
- return true;
+ if ('0' <= c && c <= '9') return true;
if (base == 16) {
- if (('A' <= c && c <= 'F') || ('a' <= c && c <= 'f'))
- return true;
+ if (('A' <= c && c <= 'F') || ('a' <= c && c <= 'f')) return true;
}
return false;
}
@@ -137,8 +135,7 @@
**
*******************************************************************************/
inline int getDigitValue(char c, int base) {
- if ('0' <= c && c <= '9')
- return c - '0';
+ if ('0' <= c && c <= '9') return c - '0';
if (base == 16) {
if ('A' <= c && c <= 'F')
return c - 'A' + 10;
@@ -158,8 +155,8 @@
** Returns: none
**
*******************************************************************************/
-void findConfigFilePathFromTransportConfigPaths(const string &configName,
- string &filePath) {
+void findConfigFilePathFromTransportConfigPaths(const string& configName,
+ string& filePath) {
for (int i = 0; i < transport_config_path_size - 1; i++) {
filePath.assign(transport_config_paths[i]);
filePath += configName;
@@ -182,7 +179,7 @@
** Returns: 1, if there are any config data, 0 otherwise
**
*******************************************************************************/
-bool CNxpNfcConfig::readConfig(const char *name, bool bResetContent) {
+bool CNxpNfcConfig::readConfig(const char* name, bool bResetContent) {
enum {
BEGIN_LINE = 1,
TOKEN,
@@ -193,12 +190,12 @@
END_LINE
};
- FILE *fd;
+ FILE* fd;
struct stat buf;
string token;
string strValue;
unsigned long numValue = 0;
- CNxpNfcParam *pParam = NULL;
+ CNxpNfcParam* pParam = NULL;
int i = 0;
int base = 0;
char c;
@@ -227,134 +224,132 @@
while (!feof(fd) && fread(&c, 1, 1, fd) == 1) {
switch (state & 0xff) {
- case BEGIN_LINE:
- if (c == '#') {
- state = END_LINE;
- } else if (isPrintable(c)) {
- i = 0;
- token.erase();
- strValue.erase();
- state = TOKEN;
- token.push_back(c);
- }
- break;
- case TOKEN:
- if (c == '=') {
- token.push_back('\0');
- state = BEGIN_QUOTE;
- } else if (isPrintable(c)) {
- token.push_back(c);
- } else {
- state = END_LINE;
- }
- break;
- case BEGIN_QUOTE:
- if (c == '"') {
- state = STR_VALUE;
- base = 0;
- } else if (c == '0') {
- state = BEGIN_HEX;
- } else if (isDigit(c, 10)) {
- state = NUM_VALUE;
- base = 10;
- numValue = getDigitValue(c, base);
- i = 0;
- } else if (c == '{') {
- state = NUM_VALUE;
- bflag = 1;
- base = 16;
- i = 0;
- Set(IsStringValue);
- } else
- state = END_LINE;
-
- break;
- case BEGIN_HEX:
- if (c == 'x' || c == 'X') {
- state = NUM_VALUE;
- base = 16;
- numValue = 0;
- i = 0;
- break;
- } else if (isDigit(c, 10)) {
- state = NUM_VALUE;
- base = 10;
- numValue = getDigitValue(c, base);
- break;
- } else if (c != '\n' && c != '\r') {
- state = END_LINE;
- break;
- }
- // fall through to numValue to handle numValue
-
- case NUM_VALUE:
- if (isDigit(c, base)) {
- numValue *= base;
- numValue += getDigitValue(c, base);
- ++i;
- } else if (bflag == 1 &&
- (c == ' ' || c == '\r' || c == '\n' || c == '\t')) {
- break;
- } else if (base == 16 &&
- (c == ',' || c == ':' || c == '-' || c == ' ' || c == '}')) {
-
- if (c == '}') {
- bflag = 0;
+ case BEGIN_LINE:
+ if (c == '#') {
+ state = END_LINE;
+ } else if (isPrintable(c)) {
+ i = 0;
+ token.erase();
+ strValue.erase();
+ state = TOKEN;
+ token.push_back(c);
}
- if (i > 0) {
- int n = (i + 1) / 2;
- while (n-- > 0) {
- numValue = numValue >> (n * 8);
- unsigned char c = (numValue)&0xFF;
- strValue.push_back(c);
- }
- }
-
- Set(IsStringValue);
- numValue = 0;
- i = 0;
- } else {
- if (c == '\n' || c == '\r') {
- if (bflag == 0) {
- state = BEGIN_LINE;
- }
+ break;
+ case TOKEN:
+ if (c == '=') {
+ token.push_back('\0');
+ state = BEGIN_QUOTE;
+ } else if (isPrintable(c)) {
+ token.push_back(c);
} else {
- if (bflag == 0) {
- state = END_LINE;
- }
+ state = END_LINE;
}
- if (Is(IsStringValue) && base == 16 && i > 0) {
- int n = (i + 1) / 2;
- while (n-- > 0)
- strValue.push_back(((numValue >> (n * 8)) & 0xFF));
- }
- if (strValue.length() > 0)
- pParam = new CNxpNfcParam(token.c_str(), strValue);
- else
- pParam = new CNxpNfcParam(token.c_str(), numValue);
+ break;
+ case BEGIN_QUOTE:
+ if (c == '"') {
+ state = STR_VALUE;
+ base = 0;
+ } else if (c == '0') {
+ state = BEGIN_HEX;
+ } else if (isDigit(c, 10)) {
+ state = NUM_VALUE;
+ base = 10;
+ numValue = getDigitValue(c, base);
+ i = 0;
+ } else if (c == '{') {
+ state = NUM_VALUE;
+ bflag = 1;
+ base = 16;
+ i = 0;
+ Set(IsStringValue);
+ } else
+ state = END_LINE;
- add(pParam);
- strValue.erase();
- numValue = 0;
- }
- break;
- case STR_VALUE:
- if (c == '"') {
- strValue.push_back('\0');
- state = END_LINE;
- pParam = new CNxpNfcParam(token.c_str(), strValue);
- add(pParam);
- } else if (isPrintable(c)) {
- strValue.push_back(c);
- }
- break;
- case END_LINE:
- if (c == '\n' || c == '\r') {
- state = BEGIN_LINE;
- }
- break;
- default:
- break;
+ break;
+ case BEGIN_HEX:
+ if (c == 'x' || c == 'X') {
+ state = NUM_VALUE;
+ base = 16;
+ numValue = 0;
+ i = 0;
+ break;
+ } else if (isDigit(c, 10)) {
+ state = NUM_VALUE;
+ base = 10;
+ numValue = getDigitValue(c, base);
+ break;
+ } else if (c != '\n' && c != '\r') {
+ state = END_LINE;
+ break;
+ }
+ // fall through to numValue to handle numValue
+
+ case NUM_VALUE:
+ if (isDigit(c, base)) {
+ numValue *= base;
+ numValue += getDigitValue(c, base);
+ ++i;
+ } else if (bflag == 1 &&
+ (c == ' ' || c == '\r' || c == '\n' || c == '\t')) {
+ break;
+ } else if (base == 16 &&
+ (c == ',' || c == ':' || c == '-' || c == ' ' || c == '}')) {
+ if (c == '}') {
+ bflag = 0;
+ }
+ if (i > 0) {
+ int n = (i + 1) / 2;
+ while (n-- > 0) {
+ numValue = numValue >> (n * 8);
+ unsigned char c = (numValue)&0xFF;
+ strValue.push_back(c);
+ }
+ }
+
+ Set(IsStringValue);
+ numValue = 0;
+ i = 0;
+ } else {
+ if (c == '\n' || c == '\r') {
+ if (bflag == 0) {
+ state = BEGIN_LINE;
+ }
+ } else {
+ if (bflag == 0) {
+ state = END_LINE;
+ }
+ }
+ if (Is(IsStringValue) && base == 16 && i > 0) {
+ int n = (i + 1) / 2;
+ while (n-- > 0) strValue.push_back(((numValue >> (n * 8)) & 0xFF));
+ }
+ if (strValue.length() > 0)
+ pParam = new CNxpNfcParam(token.c_str(), strValue);
+ else
+ pParam = new CNxpNfcParam(token.c_str(), numValue);
+
+ add(pParam);
+ strValue.erase();
+ numValue = 0;
+ }
+ break;
+ case STR_VALUE:
+ if (c == '"') {
+ strValue.push_back('\0');
+ state = END_LINE;
+ pParam = new CNxpNfcParam(token.c_str(), strValue);
+ add(pParam);
+ } else if (isPrintable(c)) {
+ strValue.push_back(c);
+ }
+ break;
+ case END_LINE:
+ if (c == '\n' || c == '\r') {
+ state = BEGIN_LINE;
+ }
+ break;
+ default:
+ break;
}
}
@@ -395,7 +390,7 @@
** Returns: none
**
*******************************************************************************/
-CNxpNfcConfig &CNxpNfcConfig::GetInstance() {
+CNxpNfcConfig& CNxpNfcConfig::GetInstance() {
static CNxpNfcConfig theInstance;
if (theInstance.size() == 0 && theInstance.mValidFile) {
@@ -425,10 +420,9 @@
** false if setting does not exist
**
*******************************************************************************/
-bool CNxpNfcConfig::getValue(const char *name, char *pValue, size_t len) const {
- const CNxpNfcParam *pParam = find(name);
- if (pParam == NULL)
- return false;
+bool CNxpNfcConfig::getValue(const char* name, char* pValue, size_t len) const {
+ const CNxpNfcParam* pParam = find(name);
+ if (pParam == NULL) return false;
if (pParam->str_len() > 0) {
memset(pValue, 0, len);
@@ -438,11 +432,10 @@
return false;
}
-bool CNxpNfcConfig::getValue(const char *name, char *pValue, long len,
- long *readlen) const {
- const CNxpNfcParam *pParam = find(name);
- if (pParam == NULL)
- return false;
+bool CNxpNfcConfig::getValue(const char* name, char* pValue, long len,
+ long* readlen) const {
+ const CNxpNfcParam* pParam = find(name);
+ if (pParam == NULL) return false;
if (pParam->str_len() > 0) {
if (pParam->str_len() <= (unsigned long)len) {
@@ -468,10 +461,9 @@
** false if setting does not exist
**
*******************************************************************************/
-bool CNxpNfcConfig::getValue(const char *name, unsigned long &rValue) const {
- const CNxpNfcParam *pParam = find(name);
- if (pParam == NULL)
- return false;
+bool CNxpNfcConfig::getValue(const char* name, unsigned long& rValue) const {
+ const CNxpNfcParam* pParam = find(name);
+ if (pParam == NULL) return false;
if (pParam->str_len() == 0) {
rValue = static_cast<unsigned long>(pParam->numValue());
@@ -490,10 +482,9 @@
** false if setting does not exist
**
*******************************************************************************/
-bool CNxpNfcConfig::getValue(const char *name, unsigned short &rValue) const {
- const CNxpNfcParam *pParam = find(name);
- if (pParam == NULL)
- return false;
+bool CNxpNfcConfig::getValue(const char* name, unsigned short& rValue) const {
+ const CNxpNfcParam* pParam = find(name);
+ if (pParam == NULL) return false;
if (pParam->str_len() == 0) {
rValue = static_cast<unsigned short>(pParam->numValue());
@@ -511,9 +502,8 @@
** Returns: pointer to the setting object
**
*******************************************************************************/
-const CNxpNfcParam *CNxpNfcConfig::find(const char *p_name) const {
- if (size() == 0)
- return NULL;
+const CNxpNfcParam* CNxpNfcConfig::find(const char* p_name) const {
+ if (size() == 0) return NULL;
for (const_iterator it = begin(), itEnd = end(); it != itEnd; ++it) {
if (**it < p_name) {
@@ -545,11 +535,9 @@
**
*******************************************************************************/
void CNxpNfcConfig::clean() {
- if (size() == 0)
- return;
+ if (size() == 0) return;
- for (iterator it = begin(), itEnd = end(); it != itEnd; ++it)
- delete *it;
+ for (iterator it = begin(), itEnd = end(); it != itEnd; ++it) delete *it;
clear();
}
@@ -563,16 +551,15 @@
** Returns: none
**
*******************************************************************************/
-void CNxpNfcConfig::add(const CNxpNfcParam *pParam) {
+void CNxpNfcConfig::add(const CNxpNfcParam* pParam) {
if (m_list.size() == 0) {
m_list.push_back(pParam);
return;
}
- for (list<const CNxpNfcParam *>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNxpNfcParam*>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it) {
- if (**it < pParam->c_str())
- continue;
+ if (**it < pParam->c_str()) continue;
m_list.insert(it, pParam);
return;
@@ -590,11 +577,10 @@
**
*******************************************************************************/
void CNxpNfcConfig::moveFromList() {
- if (m_list.size() == 0)
- return;
+ if (m_list.size() == 0) return;
- for (list<const CNxpNfcParam *>::iterator it = m_list.begin(),
- itEnd = m_list.end();
+ for (list<const CNxpNfcParam*>::iterator it = m_list.begin(),
+ itEnd = m_list.end();
it != itEnd; ++it)
push_back(*it);
@@ -611,8 +597,7 @@
**
*******************************************************************************/
void CNxpNfcConfig::moveToList() {
- if (m_list.size() != 0)
- m_list.clear();
+ if (m_list.size() != 0) m_list.clear();
for (iterator it = begin(), itEnd = end(); it != itEnd; ++it)
m_list.push_back(*it);
@@ -630,7 +615,7 @@
**
*******************************************************************************/
int CNxpNfcConfig::checkTimestamp() {
- FILE *fd;
+ FILE* fd;
struct stat st;
unsigned long value = 0;
int ret = 0;
@@ -693,7 +678,7 @@
** Returns: none
**
*******************************************************************************/
-CNxpNfcParam::CNxpNfcParam(const char *name, const string &value)
+CNxpNfcParam::CNxpNfcParam(const char* name, const string& value)
: string(name), m_str_value(value), m_numValue(0) {}
/*******************************************************************************
@@ -705,7 +690,7 @@
** Returns: none
**
*******************************************************************************/
-CNxpNfcParam::CNxpNfcParam(const char *name, unsigned long value)
+CNxpNfcParam::CNxpNfcParam(const char* name, unsigned long value)
: string(name), m_numValue(value) {}
/*******************************************************************************
@@ -717,8 +702,8 @@
** Returns: True if found, otherwise False.
**
*******************************************************************************/
-extern int GetNxpStrValue(const char *name, char *pValue, unsigned long len) {
- CNxpNfcConfig &rConfig = CNxpNfcConfig::GetInstance();
+extern int GetNxpStrValue(const char* name, char* pValue, unsigned long len) {
+ CNxpNfcConfig& rConfig = CNxpNfcConfig::GetInstance();
return rConfig.getValue(name, pValue, len);
}
@@ -741,9 +726,9 @@
*FALSE[0]
**
*******************************************************************************/
-extern int GetNxpByteArrayValue(const char *name, char *pValue, long bufflen,
- long *len) {
- CNxpNfcConfig &rConfig = CNxpNfcConfig::GetInstance();
+extern int GetNxpByteArrayValue(const char* name, char* pValue, long bufflen,
+ long* len) {
+ CNxpNfcConfig& rConfig = CNxpNfcConfig::GetInstance();
return rConfig.getValue(name, pValue, bufflen, len);
}
@@ -757,36 +742,34 @@
** Returns: true, if successful
**
*******************************************************************************/
-extern int GetNxpNumValue(const char *name, void *pValue, unsigned long len) {
- if (!pValue)
- return false;
+extern int GetNxpNumValue(const char* name, void* pValue, unsigned long len) {
+ if (!pValue) return false;
- CNxpNfcConfig &rConfig = CNxpNfcConfig::GetInstance();
- const CNxpNfcParam *pParam = rConfig.find(name);
+ CNxpNfcConfig& rConfig = CNxpNfcConfig::GetInstance();
+ const CNxpNfcParam* pParam = rConfig.find(name);
- if (pParam == NULL)
- return false;
+ if (pParam == NULL) return false;
unsigned long v = pParam->numValue();
if (v == 0 && pParam->str_len() > 0 && pParam->str_len() < 4) {
- const unsigned char *p = (const unsigned char *)pParam->str_value();
+ const unsigned char* p = (const unsigned char*)pParam->str_value();
for (unsigned int i = 0; i < pParam->str_len(); ++i) {
v *= 256;
v += *p++;
}
}
switch (len) {
- case sizeof(unsigned long):
- *(static_cast<unsigned long *>(pValue)) = (unsigned long)v;
- break;
- case sizeof(unsigned short):
- *(static_cast<unsigned short *>(pValue)) = (unsigned short)v;
- break;
- case sizeof(unsigned char):
- *(static_cast<unsigned char *>(pValue)) = (unsigned char)v;
- break;
- default:
- return false;
+ case sizeof(unsigned long):
+ *(static_cast<unsigned long*>(pValue)) = (unsigned long)v;
+ break;
+ case sizeof(unsigned short):
+ *(static_cast<unsigned short*>(pValue)) = (unsigned short)v;
+ break;
+ case sizeof(unsigned char):
+ *(static_cast<unsigned char*>(pValue)) = (unsigned char)v;
+ break;
+ default:
+ return false;
}
return true;
}
@@ -801,7 +784,7 @@
**
*******************************************************************************/
extern void resetNxpConfig() {
- CNxpNfcConfig &rConfig = CNxpNfcConfig::GetInstance();
+ CNxpNfcConfig& rConfig = CNxpNfcConfig::GetInstance();
rConfig.clean();
}
@@ -815,7 +798,7 @@
** Returns: none
**
*******************************************************************************/
-void readOptionalConfig(const char *extra) {
+void readOptionalConfig(const char* extra) {
string strPath;
string configName(extra_config_base);
configName += extra;
@@ -841,6 +824,6 @@
**
*******************************************************************************/
extern int isNxpConfigModified() {
- CNxpNfcConfig &rConfig = CNxpNfcConfig::GetInstance();
+ CNxpNfcConfig& rConfig = CNxpNfcConfig::GetInstance();
return rConfig.checkTimestamp();
}
diff --git a/nci/jni/extns/pn54x/src/utils/phNxpConfig.h b/nci/jni/extns/pn54x/src/utils/phNxpConfig.h
index 9119d86..8040c24 100644
--- a/nci/jni/extns/pn54x/src/utils/phNxpConfig.h
+++ b/nci/jni/extns/pn54x/src/utils/phNxpConfig.h
@@ -17,10 +17,10 @@
#ifndef _NXP_CONFIG_H
#define _NXP_CONFIG_H
-int GetNxpStrValue(const char *name, char *p_value, unsigned long len);
-int GetNxpNumValue(const char *name, void *p_value, unsigned long len);
-int GetNxpByteArrayValue(const char *name, char *pValue, long bufflen,
- long *len);
+int GetNxpStrValue(const char* name, char* p_value, unsigned long len);
+int GetNxpNumValue(const char* name, void* p_value, unsigned long len);
+int GetNxpByteArrayValue(const char* name, char* pValue, long bufflen,
+ long* len);
void resetNxpConfig(void);
int isNxpConfigModified();
@@ -57,4 +57,4 @@
/* default configuration */
#define default_storage_location "/data/nfc"
-#endif // _NXP_CONFIG_H
+#endif // _NXP_CONFIG_H
