NOSP-NGEN-artf221204-Moved-processing-of-set-mode-fu
diff --git a/src/nfa/include/nfa_api.h b/src/nfa/include/nfa_api.h
index 2dc1b46..508d4b5 100644
--- a/src/nfa/include/nfa_api.h
+++ b/src/nfa/include/nfa_api.h
@@ -100,6 +100,7 @@
 #define NFA_STATUS_CONGESTED            NFC_STATUS_CONGESTED      /* congested                                        */
 #if (NXP_EXTNS == TRUE)
 #define NFA_STATUS_WIRED_SESSION_ABORTED  NFC_STATUS_WIRED_SESSION_ABORTED  /* WIRED_SESSION_ABORTED error */
+#define NFA_STATUS_ALREADY_INITIALIZED  NFC_STATUS_ALREADY_INITIALIZED
 #endif
 typedef UINT8 tNFA_STATUS;
 
diff --git a/src/nfc/nfc/nfc_task.c b/src/nfc/nfc/nfc_task.c
index 470b911..ec72f6b 100755
--- a/src/nfc/nfc/nfc_task.c
+++ b/src/nfc/nfc/nfc_task.c
@@ -167,11 +167,6 @@
             nfc_ncif_modeSet_Ntf_timeout();
             break;
         }
-        case NFC_TYPE_NCI_WAIT_SETMODE_RSP:
-        {
-            nfc_ncif_modeSet_rsp_timeout();
-            break;
-        }
         case NFC_TTYPE_NCI_WAIT_RF_FIELD_NTF:
         {
             nfc_ncif_onWiredModeHold_timeout();