diff options
| author | Daniel Tomas <dtomas.nxp@gmail.com> | 2011-06-21 17:24:09 +0200 |
|---|---|---|
| committer | mike wakerly <mikey@google.com> | 2011-06-28 10:47:23 -0700 |
| commit | 967359c892ff74962b4f4243d989f447ffe4ae11 (patch) | |
| tree | 548bdc1245227f4b64e4e698552d8f66255d2363 /src | |
| parent | 99141cdd942973bc0cb8ef208ef717b14eb73b8e (diff) | |
| download | external_libnfc-nxp-967359c892ff74962b4f4243d989f447ffe4ae11.zip external_libnfc-nxp-967359c892ff74962b4f4243d989f447ffe4ae11.tar.gz external_libnfc-nxp-967359c892ff74962b4f4243d989f447ffe4ae11.tar.bz2 | |
Patch to support the new PN544 firmware events
Change-Id: I6e5a976721fb52f2da30081276bb2ac15d27d186
Diffstat (limited to 'src')
| -rw-r--r-- | src/phHal4Nfc.c | 5 | ||||
| -rw-r--r-- | src/phHciNfc_WI.c | 30 | ||||
| -rw-r--r-- | src/phLibNfc.h | 6 | ||||
| -rw-r--r-- | src/phLibNfc_SE.c | 45 |
4 files changed, 82 insertions, 4 deletions
diff --git a/src/phHal4Nfc.c b/src/phHal4Nfc.c index ebd447f..3e7c163 100644 --- a/src/phHal4Nfc.c +++ b/src/phHal4Nfc.c @@ -1240,7 +1240,10 @@ static void phHal4Nfc_HandleEvent( case NFC_EVT_START_OF_TRANSACTION: case NFC_EVT_END_OF_TRANSACTION: case NFC_EVT_CONNECTIVITY: - case NFC_EVT_OPERATION_ENDED: + case NFC_EVT_OPERATION_ENDED: + case NFC_EVT_MIFARE_ACCESS: + case NFC_EVT_APDU_RECEIVED: + case NFC_EVT_EMV_CARD_REMOVAL: sNotificationInfo.info = psEventInfo; sNotificationInfo.status = NFCSTATUS_SUCCESS; sNotificationInfo.type = NFC_EVENT_NOTIFICATION; diff --git a/src/phHciNfc_WI.c b/src/phHciNfc_WI.c index 4da2078..e1310a4 100644 --- a/src/phHciNfc_WI.c +++ b/src/phHciNfc_WI.c @@ -63,6 +63,9 @@ /****************** Static Function Declaration **************************/ +static uint8_t paypass_removal[2] = {0x50, 0x00}; +static uint8_t mifare_access = 0x60; + static NFCSTATUS phHciNfc_Recv_WI_Response( @@ -700,12 +703,33 @@ phHciNfc_Recv_WI_Event( EventInfo.eventType = NFC_EVT_TRANSACTION; EventInfo.eventInfo.aid.buffer = (uint8_t *)p_wi_info->aid; /* check for AID data is at least 1 byte is their */ - if(length > HCP_HEADER_LEN) + if (length > HCP_HEADER_LEN) { EventInfo.eventInfo.aid.length = length - HCP_HEADER_LEN; - (void) memcpy((void *)p_wi_info->aid,message->payload, - EventInfo.eventInfo.aid.length ); + memcpy((void *)p_wi_info->aid, message->payload, + EventInfo.eventInfo.aid.length ); + } + + /* Filter Transaction event */ + if (EventInfo.eventInfo.aid.length == 4) + { + EventInfo.eventType = NFC_EVT_APDU_RECEIVED; + } + else if (EventInfo.eventInfo.aid.length == 2) + { + if (!memcmp(paypass_removal, EventInfo.eventInfo.aid.buffer, EventInfo.eventInfo.aid.length)) + { + EventInfo.eventType = NFC_EVT_EMV_CARD_REMOVAL; + } + else if(mifare_access == EventInfo.eventInfo.aid.buffer[0]) + { + EventInfo.eventType = NFC_EVT_MIFARE_ACCESS; + } } + + EventInfo.eventInfo.aid.buffer = (uint8_t *)p_wi_info->aid; + (void) memcpy((void *)p_wi_info->aid,message->payload, + EventInfo.eventInfo.aid.length ); break; } default: diff --git a/src/phLibNfc.h b/src/phLibNfc.h index 216196f..790d619 100644 --- a/src/phLibNfc.h +++ b/src/phLibNfc.h @@ -173,6 +173,12 @@ typedef enum ETSI TS 102 622 V7.4.0 */ phLibNfc_eSE_EvtFieldOn, // consider using phLibNfc_eSE_EvtConnectivity phLibNfc_eSE_EvtFieldOff, + + phLibNfc_eSE_EvtApduReceived, /* PAYPASS MagStripe or MCHIP_4 transaction */ + + phLibNfc_eSE_EvtCardRemoval, /* Indicates the beginning of an EMV Card Removal sequence */ + + phLibNfc_eSE_EvtMifareAccess /* Indicates when the SMX Emulation MIFARE is accessed */ } phLibNfc_eSE_EvtType_t; /** diff --git a/src/phLibNfc_SE.c b/src/phLibNfc_SE.c index 5fa4e08..4e839cf 100644 --- a/src/phLibNfc_SE.c +++ b/src/phLibNfc_SE.c @@ -204,6 +204,51 @@ STATIC void phLibNfc_SeNotification(void *context, status); break; } + + case NFC_EVT_APDU_RECEIVED: + { + if ((pEvtInfo->eventInfo.aid.length != 0) && ((pEvtInfo->eventInfo.aid.length <= 16))) + { + /* Copy received APDU to aid buffer. */ + Se_Trans_Info.UiccEvtInfo.aid.buffer = pEvtInfo->eventInfo.aid.buffer; + Se_Trans_Info.UiccEvtInfo.aid.length = pEvtInfo->eventInfo.aid.length; + } + + (*pLibContext->sSeContext.sSeCallabackInfo.pSeListenerNtfCb)( + pLibContext->sSeContext.sSeCallabackInfo.pSeListenerCtxt, + phLibNfc_eSE_EvtApduReceived, + pSeInfo->hSecureElement, + &Se_Trans_Info, + status); + break; + } + + case NFC_EVT_MIFARE_ACCESS: + { + /* copy the Block MIFARE accessed */ + Se_Trans_Info.UiccEvtInfo.aid.buffer = pEvtInfo->eventInfo.aid.buffer; + Se_Trans_Info.UiccEvtInfo.aid.length = pEvtInfo->eventInfo.aid.length; + + (*pLibContext->sSeContext.sSeCallabackInfo.pSeListenerNtfCb)( + pLibContext->sSeContext.sSeCallabackInfo.pSeListenerCtxt, + phLibNfc_eSE_EvtMifareAccess, + pSeInfo->hSecureElement, + &Se_Trans_Info, + status); + break; + } + + case NFC_EVT_EMV_CARD_REMOVAL: + { + (*pLibContext->sSeContext.sSeCallabackInfo.pSeListenerNtfCb)( + pLibContext->sSeContext.sSeCallabackInfo.pSeListenerCtxt, + phLibNfc_eSE_EvtCardRemoval, + pSeInfo->hSecureElement, + &Se_Trans_Info, + status); + break; + } + case NFC_EVT_END_OF_TRANSACTION: { (*pLibContext->sSeContext.sSeCallabackInfo.pSeListenerNtfCb)( |