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

Update nfc_initiator_transceive_bytes() vs. nfc_initiator_transceive_dep_bytes().

Browse source 
nfc_initiator_transceive_dep_bytes() was removed, and
nfc_initiator_transceive_bytes() is now configured to behave like the one or
the other of the original functions.  For details, see:
http://code.google.com/p/libnfc/source/detail?r=592
This commit is contained in:
Romain Tartiere 2010-09-03 16:13:46 +00:00
parent 70f2fe2685
commit 036d2956f4
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libfreefare/mifare_classic.c
View file

@ -83,7 +83,7 @@
do { \ do { \
errno = 0; \ errno = 0; \
DEBUG_XFER (msg, __##msg##_n, "===> "); \ DEBUG_XFER (msg, __##msg##_n, "===> "); \
if (!(nfc_initiator_transceive_dep_bytes (tag->device, msg, __##msg##_n, res, &__##res##_n))) { \ if (!(nfc_initiator_transceive_bytes (tag->device, msg, __##msg##_n, res, &__##res##_n))) { \
nfc_perror (tag->device, __FUNCTION__); \ nfc_perror (tag->device, __FUNCTION__); \
if (disconnect) \ if (disconnect) \
tag->active = false; \ tag->active = false; \

2
libfreefare/mifare_desfire.c
View file

@ -277,6 +277,7 @@ mifare_desfire_connect (MifareTag tag)
errno = EIO; errno = EIO;
return -1; return -1;
} }
nfc_configure (tag->device, NDO_EASY_FRAMING, false);
return 0; return 0;
} }
@ -295,6 +296,7 @@ mifare_desfire_disconnect (MifareTag tag)
if (nfc_initiator_deselect_target (tag->device)) { if (nfc_initiator_deselect_target (tag->device)) {
tag->active = 0; tag->active = 0;
} }
nfc_configure (tag->device, NDO_EASY_FRAMING, true);
return 0; return 0;
} }

4
libfreefare/mifare_ultralight.c
View file

@ -51,7 +51,7 @@
do { \ do { \
errno = 0; \ errno = 0; \
DEBUG_XFER (msg, __##msg##_n, "===> "); \ DEBUG_XFER (msg, __##msg##_n, "===> "); \
if (!(nfc_initiator_transceive_dep_bytes (tag->device, msg, __##msg##_n, res, &__##res##_n))) { \ if (!(nfc_initiator_transceive_bytes (tag->device, msg, __##msg##_n, res, &__##res##_n))) { \
return errno = EIO, -1; \ return errno = EIO, -1; \
} \ } \
DEBUG_XFER (res, __##res##_n, "<=== "); \ DEBUG_XFER (res, __##res##_n, "<=== "); \
@ -187,7 +187,7 @@ mifare_ultralight_write (MifareTag tag, const MifareUltralightPageNumber page, c
memcpy (cmd + 2, data, sizeof (MifareUltralightPage)); memcpy (cmd + 2, data, sizeof (MifareUltralightPage));
size_t n; size_t n;
if (!(nfc_initiator_transceive_dep_bytes (tag->device, cmd, sizeof (cmd), NULL, &n))) { if (!(nfc_initiator_transceive_bytes (tag->device, cmd, sizeof (cmd), NULL, &n))) {
errno = EIO; errno = EIO;
return -1; return -1;
} }