diff options
| author | Nick Pelly <npelly@google.com> | 2011-08-18 08:51:07 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-08-18 08:51:07 -0700 |
| commit | 5b80cbbaa1169bd26bb0a19a2b75fd9e6522a1af (patch) | |
| tree | 39ff6a58356d7378da632404cd94e0749c904e82 /src | |
| parent | 39038381fd4a9922cdd07251ce1a0a8840681bcd (diff) | |
| download | libnfc-nxp-5b80cbbaa1169bd26bb0a19a2b75fd9e6522a1af.tar.gz | |
Revert "Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc."
This reverts commit 39038381fd4a9922cdd07251ce1a0a8840681bcd.
Diffstat (limited to 'src')
| -rw-r--r-- | src/phLibNfc.h | 5 | ||||
| -rw-r--r-- | src/phLibNfc_SE.c | 64 |
2 files changed, 2 insertions, 67 deletions
diff --git a/src/phLibNfc.h b/src/phLibNfc.h index 9e4aff1..c2cb6dd 100644 --- a/src/phLibNfc.h +++ b/src/phLibNfc.h @@ -129,10 +129,7 @@ typedef enum This can be applied to UICC as well as SmartMX*/ phLibNfc_SE_ActModeVirtual=0x02, /**< Enables Virtual Mode communication. This can be applied to UICC as well as SmartMX*/ - phLibNfc_SE_ActModeOff =0x03, /**< Inactivate SE.This means,put SE in in-active state - This can be applied to UICC as well as SmartMX*/ - phLibNfc_SE_ActModeVirtualVolatile = 0x04 /**< Enabled virtual mode communication for SE through an event - This can be applied to UICC as well as SmartMX*/ + phLibNfc_SE_ActModeOff =0x03 /**< Inactivate SE.This means,put SE in in-active state */ }phLibNfc_eSE_ActivationMode; diff --git a/src/phLibNfc_SE.c b/src/phLibNfc_SE.c index 968c239..3c271f3 100644 --- a/src/phLibNfc_SE.c +++ b/src/phLibNfc_SE.c @@ -473,6 +473,7 @@ NFCSTATUS phLibNfc_SE_SetMode ( phLibNfc_Handle hSE_Handle, switch(eActivation_mode) { case phLibNfc_SE_ActModeVirtual: + case phLibNfc_SE_ActModeDefault: { if(hSE_Handle == sSecuredElementInfo[LIBNFC_SE_UICC_INDEX].hSecureElement) { @@ -506,69 +507,6 @@ NFCSTATUS phLibNfc_SE_SetMode ( phLibNfc_Handle hSE_Handle, } } break; - case phLibNfc_SE_ActModeVirtualVolatile: - { - if(hSE_Handle == sSecuredElementInfo[LIBNFC_SE_SMARTMX_INDEX].hSecureElement) - { - eEmulationType = NFC_SMARTMX_EMULATION; - /*Enable the SMX -External reader can see it*/ - pLibContext->sCardEmulCfg.config.smartMxCfg.enableEmulation = TRUE; - pLibContext->sSeContext.eActivatedMode = phLibNfc_SE_ActModeVirtualVolatile; - - Status = phHal4Nfc_Switch_SMX_Mode( - pLibContext->psHwReference, - eSmartMx_Virtual, - phLibNfc_SE_SetMode_cb, - pLibContext - ); - } - else if(hSE_Handle == sSecuredElementInfo[LIBNFC_SE_UICC_INDEX].hSecureElement) - { - eEmulationType = NFC_UICC_EMULATION; - /*Enable the UICC -External reader can see it*/ - pLibContext->sCardEmulCfg.config.uiccEmuCfg.enableUicc = TRUE; - pLibContext->sSeContext.eActivatedMode = phLibNfc_SE_ActModeVirtualVolatile; - - Status = phHal4Nfc_Switch_Swp_Mode( - pLibContext->psHwReference, - eSWP_Switch_On, - phLibNfc_SE_SetMode_cb, - pLibContext - ); - } - else - { - Status = NFCSTATUS_INVALID_HANDLE; - } - } - break; - case phLibNfc_SE_ActModeDefault: - { - if(hSE_Handle == sSecuredElementInfo[LIBNFC_SE_SMARTMX_INDEX].hSecureElement) - { - Status = phHal4Nfc_Switch_SMX_Mode( - pLibContext->psHwReference, - eSmartMx_Default, - phLibNfc_SE_SetMode_cb, - pLibContext - ); - } - else if(hSE_Handle == sSecuredElementInfo[LIBNFC_SE_UICC_INDEX].hSecureElement) - { - Status = phHal4Nfc_Switch_Swp_Mode( - pLibContext->psHwReference, - eSWP_Switch_Default, - phLibNfc_SE_SetMode_cb, - pLibContext - ); - } - else - { - Status = NFCSTATUS_INVALID_HANDLE; - } - } - break; - case phLibNfc_SE_ActModeWired: { if(hSE_Handle == sSecuredElementInfo[LIBNFC_SE_SMARTMX_INDEX].hSecureElement) |