From 78f4485d27a7630534b2b28f24ab9d0190a2e642 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Tue, 4 Jan 2011 18:04:06 +1100 Subject: Fix bugs related to SE+P2P co-exisitance. Source: Patrice @ NXP Change-Id: I9437a2c2798ffe7ea34f3f18df097d0036310568 --- src/phLibNfc_SE.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/phLibNfc_SE.c b/src/phLibNfc_SE.c index 2361a87..42334d8 100644 --- a/src/phLibNfc_SE.c +++ b/src/phLibNfc_SE.c @@ -172,12 +172,18 @@ STATIC void phLibNfc_SeNotification(void *context, { case NFC_EVT_TRANSACTION: { - if(pEvtInfo->eventInfo.aid.length != 0) + if((pEvtInfo->eventInfo.aid.length != 0) && ((pEvtInfo->eventInfo.aid.length <= 16))) // PLG { /*copy the Application id on which transaction happened*/ Se_Trans_Info.UiccEvtInfo.aid.buffer =pEvtInfo->eventInfo.aid.buffer; Se_Trans_Info.UiccEvtInfo.aid.length =pEvtInfo->eventInfo.aid.length; } + else + { + // PLG patch + Se_Trans_Info.UiccEvtInfo.aid.buffer = NULL; + Se_Trans_Info.UiccEvtInfo.aid.length = 0; + } if((pEvtInfo->eventHost == phHal_eUICCHost) && (info.psEventInfo->eventInfo.uicc_info.param.length != 0)) @@ -218,7 +224,16 @@ STATIC void phLibNfc_SeNotification(void *context, status); break; } - case NFC_EVT_START_OF_TRANSACTION: + case NFC_EVT_START_OF_TRANSACTION: // PLG ++ + + (*pLibContext->sSeContext.sSeCallabackInfo.pSeListenerNtfCb)( + pLibContext->sSeContext.sSeCallabackInfo.pSeListenerCtxt, + phLibNfc_eSE_EvtTypeTransaction, + pSeInfo->hSecureElement, + &Se_Trans_Info, + status); + + break; // PLG -- default: { break; -- cgit v1.2.3