1 files changed, 99 insertions, 96 deletions
diff --git a/nci/jni/TransactionController.h b/nci/jni/TransactionController.h
index d3965dd9..a0df7a1e 100644..100755
--- a/nci/jni/TransactionController.h
+++ b/nci/jni/TransactionController.h
@@ -1,96 +1,99 @@
-/******************************************************************************
- *
- *  Copyright (C) 2015 NXP Semiconductors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- ******************************************************************************/
-#pragma once
-#include <semaphore.h>
-#include <NfcJniUtil.h>
-extern "C"
-{
-    #include "nfa_api.h"
-}
-#define TRANSACTION_REQUESTOR(name) #name
-#define TRANSACTION_ATTEMPT_FOR_SECONDS(seconds)  (seconds)
-#define pTransactionController      (transactionController::getInstance())
-
-
-
-/* Transaction Events in order */
-typedef enum transcation_events
-{
-    NFA_TRANS_DEFAULT = 0x00,
-    NFA_TRANS_ACTIVATED_EVT,
-    NFA_TRANS_EE_ACTION_EVT,
-    NFA_TRANS_DM_RF_FIELD_EVT,
-    NFA_TRANS_DM_RF_FIELD_EVT_ON,
-    NFA_TRANS_DM_RF_TRANS_START,
-    NFA_TRANS_DM_RF_FIELD_EVT_OFF,
-    NFA_TRANS_DM_RF_TRANS_PROGRESS,
-    NFA_TRANS_DM_RF_TRANS_END,
-    NFA_TRANS_MIFARE_ACT_EVT,
-    NFA_TRANS_CE_ACTIVATED = 0x18,
-    NFA_TRANS_CE_DEACTIVATED = 0x19,
-}eTranscation_events_t;
-/*Structure to store  discovery parameters*/
-typedef struct discovery_Parameters
-{
-    int technologies_mask;
-    bool enable_lptd;
-    bool reader_mode;
-    bool enable_p2p;
-    bool restart;
-}discovery_Parameters_t;
-/*Structure to store transcation result*/
-typedef struct Transcation_Check
-{
-    bool trans_in_progress;
-    char last_request;
-    struct nfc_jni_native_data *transaction_nat;
-    eScreenState_t last_screen_state_request;
-    eTranscation_events_t current_transcation_state;
-    discovery_Parameters_t discovery_params;
-#if(NXP_EXTNS == TRUE)
-#if(NXP_NFCC_HCE_F == TRUE)
-    int t3thandle;
-    bool isInstallRequest;
-#endif
-#endif
-} Transcation_Check_t;
-
-class transactionController
-{
-    private:
-        static transactionController* pInstance;    //Reference to controller
-        sem_t barrier;                             //barrier: Guard for controlling access to NFCC when profile switch happening
-        IntervalTimer* abortTimer;                //abortTimer: Used for aborting a stuck transaction
-        Transcation_Check_t* pTransactionDetail; //transactionDetail: holds last transaction detail
-        const char* requestor;                  //requestor: Identifier of transaction trigger
-
-        transactionController(void);           //Constructor
-        bool transactionLiveLockable(const char* transactionRequestor);
-    public:
-        void lastRequestResume(void);
-        bool transactionAttempt(const char* transactionRequestor, unsigned int timeoutInMsec);
-        bool transactionAttempt(const char* transactionRequestor);
-        bool transactionTerminate(const char* transactionRequestor);
-        void transactionEnd(const char* transactionRequestor);
-        bool transactionInProgress(void);
-        void killAbortTimer(void);
-        void setAbortTimer(unsigned int msec);
-        static void  transactionAbortTimerCb(union sigval);
-        static transactionController* controller(void);
-        static transactionController* getInstance(void);
-};
+/******************************************************************************
+ *
+ *  Copyright (C) 2015 NXP Semiconductors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
+#pragma once
+#include <semaphore.h>
+#include <NfcJniUtil.h>
+extern "C"
+{
+    #include "nfa_api.h"
+}
+#define TRANSACTION_REQUESTOR(name) #name
+#define TRANSACTION_ATTEMPT_FOR_SECONDS(seconds)  (seconds)
+#define pTransactionController      (transactionController::getInstance())
+
+
+
+/* Transaction Events in order */
+typedef enum transcation_events
+{
+    NFA_TRANS_DEFAULT = 0x00,
+    NFA_TRANS_ACTIVATED_EVT,
+    NFA_TRANS_EE_ACTION_EVT,
+    NFA_TRANS_DM_RF_FIELD_EVT,
+    NFA_TRANS_DM_RF_FIELD_EVT_ON,
+    NFA_TRANS_DM_RF_TRANS_START,
+    NFA_TRANS_DM_RF_FIELD_EVT_OFF,
+    NFA_TRANS_DM_RF_TRANS_PROGRESS,
+    NFA_TRANS_DM_RF_TRANS_END,
+    NFA_TRANS_MIFARE_ACT_EVT,
+    NFA_TRANS_CE_ACTIVATED = 0x18,
+    NFA_TRANS_CE_DEACTIVATED = 0x19,
+}eTranscation_events_t;
+/*Structure to store  discovery parameters*/
+typedef struct discovery_Parameters
+{
+    int technologies_mask;
+    bool enable_lptd;
+    bool reader_mode;
+    bool enable_p2p;
+    bool restart;
+}discovery_Parameters_t;
+/*Structure to store transcation result*/
+typedef struct Transcation_Check
+{
+    bool trans_in_progress;
+    char last_request;
+    struct nfc_jni_native_data *transaction_nat;
+    eScreenState_t last_screen_state_request;
+    eTranscation_events_t current_transcation_state;
+    discovery_Parameters_t discovery_params;
+#if(NXP_EXTNS == TRUE)
+#if(NXP_NFCC_HCE_F == TRUE)
+    int t3thandle;
+    bool isInstallRequest;
+#endif
+#endif
+} Transcation_Check_t;
+
+class transactionController
+{
+    private:
+        static transactionController* pInstance;    //Reference to controller
+        sem_t barrier;                             //barrier: Guard for controlling access to NFCC when profile switch happening
+        IntervalTimer* abortTimer;                //abortTimer: Used for aborting a stuck transaction
+        IntervalTimer* pendingTransHandleTimer;  //pendingTransHandleTimer: Used to schedule pending transaction handler thread
+        Transcation_Check_t* pTransactionDetail; //transactionDetail: holds last transaction detail
+        const char* requestor;                  //requestor: Identifier of transaction trigger
+
+        transactionController(void);           //Constructor
+        bool transactionLiveLockable(const char* transactionRequestor);
+    public:
+        void lastRequestResume(void);
+        bool transactionAttempt(const char* transactionRequestor, unsigned int timeoutInMsec);
+        bool transactionAttempt(const char* transactionRequestor);
+        bool transactionTerminate(const char* transactionRequestor);
+        void transactionEnd(const char* transactionRequestor);
+        bool transactionInProgress(void);
+        void killAbortTimer(void);
+        void setAbortTimer(unsigned int msec);
+        static void  transactionAbortTimerCb(union sigval);
+        static void transactionHandlePendingCb(union sigval);
+        static transactionController* controller(void);
+        static transactionController* getInstance(void);
+        const char * getCurTransactionRequestor();
+};