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

Use nfc_initiator_transceive_dep_bytes() instead of pn53x_transceive() in example.

Browse source
This commit is contained in:
Romain Tartiere 2010-08-10 21:00:08 +00:00
parent fd0efd4a62
commit eece496351
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
examples/mifare.c
View file

@ -2,9 +2,9 @@
#include <string.h> #include <string.h>
#include "chips/pn53x.h" #include <nfc/nfc.h>
extern const byte_t pncmd_initiator_exchange_data [265]; #include "chips/pn53x.h"
/** /**
* @brief Execute a MIFARE Classic Command * @brief Execute a MIFARE Classic Command
@ -24,15 +24,13 @@ bool nfc_initiator_mifare_cmd(const nfc_device_t* pnd, const mifare_cmd mc, cons
byte_t abtRx[MAX_FRAME_LEN]; byte_t abtRx[MAX_FRAME_LEN];
size_t szRxLen; size_t szRxLen;
size_t szParamLen; size_t szParamLen;
byte_t abtCmd[sizeof(pncmd_initiator_exchange_data)]; byte_t abtCmd[265];
memcpy(abtCmd,pncmd_initiator_exchange_data,sizeof(pncmd_initiator_exchange_data));
// Make sure we are dealing with a active device // Make sure we are dealing with a active device
if (!pnd->bActive) return false; if (!pnd->bActive) return false;
abtCmd[2] = 0x01; // Use first target/card abtCmd[0] = mc; // The MIFARE Classic command
abtCmd[3] = mc; // The MIFARE Classic command abtCmd[1] = ui8Block; // The block address (1K=0x00..0x39, 4K=0x00..0xff)
abtCmd[4] = ui8Block; // The block address (1K=0x00..0x39, 4K=0x00..0xff)
switch (mc) switch (mc)
{ {
@ -67,10 +65,10 @@ bool nfc_initiator_mifare_cmd(const nfc_device_t* pnd, const mifare_cmd mc, cons
} }
// When available, copy the parameter bytes // When available, copy the parameter bytes
if (szParamLen) memcpy(abtCmd+5,(byte_t*)pmp,szParamLen); if (szParamLen) memcpy(abtCmd+2,(byte_t*)pmp,szParamLen);
// Fire the mifare command // Fire the mifare command
if (!pn53x_transceive(pnd,abtCmd,5+szParamLen,abtRx,&szRxLen)) return false; if (!nfc_initiator_transceive_dep_bytes(pnd,abtCmd,2+szParamLen,abtRx,&szRxLen)) return false;
// When we have executed a read command, copy the received bytes into the param // When we have executed a read command, copy the received bytes into the param
if (mc == MC_READ && szRxLen == 17) memcpy(pmp->mpd.abtData,abtRx+1,16); if (mc == MC_READ && szRxLen == 17) memcpy(pmp->mpd.abtData,abtRx+1,16);

1
windows/win32/nfc.def
View file

@ -27,5 +27,4 @@ EXPORTS
append_iso14443a_crc append_iso14443a_crc
nfc_version nfc_version
; FIXME: Lines bellow SUCKS! ; FIXME: Lines bellow SUCKS!
pn53x_transceive
pncmd_initiator_exchange_data pncmd_initiator_exchange_data