DeforaNetworks/nfcutils
3
0
Fork 0
Code Releases Activity

Sync with libnfc.

Browse Source
This commit is contained in:
Romain Tartiere
2010-09-04 10:21:14 +00:00
parent 278e27941d
commit 629afc751a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lsnfc.c
+3 -3
View File
@@ -76,7 +76,7 @@ mifare_ultralight_identification(const nfc_iso14443a_info_t nai)
abtCmd[1] = 0x10; // block address (1K=0x00..0x39, 4K=0x00..0xff)
if(nfc_initiator_select_passive_target(pnd, NM_ISO14443A_106, nai.abtUid, nai.szUidLen, NULL) ) {
if (nfc_initiator_transceive_dep_bytes(pnd, abtCmd,sizeof(abtCmd), abtRx, &szRxLen)) {
if (nfc_initiator_transceive_bytes(pnd, abtCmd,sizeof(abtCmd), abtRx, &szRxLen)) {
// READ command of 0x10 success, we consider that Ultralight does have 0x10 address, so it's a Ultralight C
return strdup(" C");
} else {
@@ -107,12 +107,12 @@ mifare_desfire_identification(const nfc_iso14443a_info_t nai)
char* res = NULL;
if(nfc_initiator_select_passive_target(pnd, NM_ISO14443A_106, nai.abtUid, nai.szUidLen, NULL) ) {
if (nfc_initiator_transceive_dep_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, &szRxLen)) {
if (nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, &szRxLen)) {
// MIFARE DESFire GetVersion command success, decoding...
if( szRxLen == 8 ) { // GetVersion should reply 8 bytes
memcpy( abtDESFireVersion, abtRx + 1, 7 );
abtCmd[0] = 0xAF; // ask for GetVersion next bytes
if (nfc_initiator_transceive_dep_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, &szRxLen)) {
if (nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, &szRxLen)) {
if( szRxLen == 8 ) { // GetVersion should reply 8 bytes
memcpy( abtDESFireVersion + 7, abtRx + 1, 7 );
res = malloc(16); // We can alloc res: we will be able to provide information