crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r547-550 from trunk.

Browse source
This commit is contained in:
Romain Tartiere 2010-08-18 17:01:08 +00:00
commit 076fa3686c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnfc/chips/pn53x.c
View file

@ -286,6 +286,7 @@ bool pn53x_unwrap_frame(const byte_t* pbtFrame, const size_t szFrameBits, byte_t
bool bool
pn53x_decode_target_data(const byte_t* pbtRawData, size_t szDataLen, nfc_chip_t nc, nfc_target_type_t ntt, nfc_target_info_t* pnti) pn53x_decode_target_data(const byte_t* pbtRawData, size_t szDataLen, nfc_chip_t nc, nfc_target_type_t ntt, nfc_target_info_t* pnti)
{ {
uint8_t ui8AttribResLen;
switch(ntt) { switch(ntt) {
case NTT_MIFARE: case NTT_MIFARE:
case NTT_GENERIC_PASSIVE_106: case NTT_GENERIC_PASSIVE_106:
@ -335,7 +336,7 @@ pn53x_decode_target_data(const byte_t* pbtRawData, size_t szDataLen, nfc_chip_t
pbtRawData += 12; pbtRawData += 12;
// Store temporarily the ATTRIB_RES length // Store temporarily the ATTRIB_RES length
uint8_t ui8AttribResLen = *(pbtRawData++); ui8AttribResLen = *(pbtRawData++);
// Store the 4 bytes ID // Store the 4 bytes ID
memcpy(pnti->nbi.abtId, pbtRawData,4); memcpy(pnti->nbi.abtId, pbtRawData,4);

4
libnfc/nfc.c
View file

@ -534,14 +534,14 @@ nfc_initiator_list_passive_targets(nfc_device_t* pnd, const nfc_modulation_t nmI
{ {
nfc_target_info_t nti; nfc_target_info_t nti;
size_t szTargetFound = 0; size_t szTargetFound = 0;
byte_t* pbtInitData = NULL;
size_t szInitDataLen = 0;
pnd->iLastError = 0; pnd->iLastError = 0;
// Let the reader only try once to find a target // Let the reader only try once to find a target
nfc_configure (pnd, NDO_INFINITE_SELECT, false); nfc_configure (pnd, NDO_INFINITE_SELECT, false);
byte_t* pbtInitData = NULL;
size_t szInitDataLen = 0;
if(nmInitModulation == NM_ISO14443B_106) { if(nmInitModulation == NM_ISO14443B_106) {
// Application Family Identifier (AFI) must equals 0x00 in order to wakeup all ISO14443-B PICCs (see ISO/IEC 14443-3) // Application Family Identifier (AFI) must equals 0x00 in order to wakeup all ISO14443-B PICCs (see ISO/IEC 14443-3)