diff options
| author | aferir <arnaud.ferir@trusted-logic.com> | 2010-11-02 22:57:43 -0500 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-11-03 13:13:38 -0500 |
| commit | e1b8bffcf9ff1a5c290c03be5a1d85be0c103223 (patch) | |
| tree | 2e63f807583e0d11b40d4e48f32c348376e8832e /src | |
| parent | b5419c7dd2b703f796dc10480a5a73c907f41e14 (diff) | |
| download | external_libnfc-nxp-e1b8bffcf9ff1a5c290c03be5a1d85be0c103223.zip external_libnfc-nxp-e1b8bffcf9ff1a5c290c03be5a1d85be0c103223.tar.gz external_libnfc-nxp-e1b8bffcf9ff1a5c290c03be5a1d85be0c103223.tar.bz2 | |
fixed ISO15693 collision
Change-Id: Ic27ec9adbdffb064f03f567b160b05502def2444
Diffstat (limited to 'src')
| -rw-r--r-- | src/phHciNfc_ISO15693.c | 6 | ||||
| -rw-r--r-- | src/phHciNfc_RFReader.c | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/phHciNfc_ISO15693.c b/src/phHciNfc_ISO15693.c index f9a3f9e..99ba86e 100644 --- a/src/phHciNfc_ISO15693.c +++ b/src/phHciNfc_ISO15693.c @@ -27,7 +27,7 @@ * $Date: Thu Feb 11 18:54:47 2010 $ * * $Author: ing04880 $ * * $Revision: 1.7 $ * -* $Aliases: NFC_FRI1.1_WK1007_R33_1,NFC_FRI1.1_WK1007_R33_4,NFC_FRI1.1_WK1017_PREP1,NFC_FRI1.1_WK1017_R34_1,NFC_FRI1.1_WK1017_R34_2,NFC_FRI1.1_WK1023_R35_1 $ +* $Aliases: $ * * * =========================================================================== * */ @@ -599,12 +599,16 @@ phHciNfc_Recv_ISO15693_Event( { phNfc_sCompletionInfo_t pCompInfo; +/* #define NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT 0x00 */ +#if (NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT >= 0x01) + if (ISO_15693_MULTIPLE_TAGS_FOUND == message->payload[i]) { ps_15693_info->multiple_tgts_found = ISO_15693_MULTIPLE_TAGS_FOUND; pCompInfo.status = NFCSTATUS_MULTIPLE_TAGS; } else +#endif /* #if (NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT <= 0x01) */ { ps_15693_info->multiple_tgts_found = FALSE; pCompInfo.status = NFCSTATUS_SUCCESS; diff --git a/src/phHciNfc_RFReader.c b/src/phHciNfc_RFReader.c index e0aa2dc..816c48d 100644 --- a/src/phHciNfc_RFReader.c +++ b/src/phHciNfc_RFReader.c @@ -27,7 +27,7 @@ * $Date: Wed Apr 21 12:21:15 2010 $ * * $Author: ing07385 $ * * $Revision: 1.53 $ * -* $Aliases: NFC_FRI1.1_WK1007_R33_6,NFC_FRI1.1_WK1017_PREP1,NFC_FRI1.1_WK1017_R34_1,NFC_FRI1.1_WK1017_R34_2,NFC_FRI1.1_WK1023_R35_1 $ * +* $Aliases: NFC_FRI1.1_WK1007_R33_6 $ * * * * =========================================================================== * */ @@ -1524,6 +1524,16 @@ phHciNfc_ReaderMgmt_Activate_Next( break; } #endif /* #ifdef TYPE_FELICA */ +#ifdef TYPE_ISO15693 + case phHal_eISO15693_PCD: + { + /* Get the ISO 15693 Reader Pipe ID */ + status = phHciNfc_ISO15693_Get_PipeID + (psHciContext, &reader_pipe_id); + + break; + } +#endif /* #ifdef TYPE_ISO15693 */ default: { status = PHNFCSTVAL(CID_NFC_HCI, NFCSTATUS_FEATURE_NOT_SUPPORTED); |