Merge the freefare-desfire branch into trunk.
This commit is contained in:
parent
3f6a142b57
commit
5779d6f945
38 changed files with 4943 additions and 116 deletions
|
|
@ -28,28 +28,39 @@ void
|
|||
cut_setup ()
|
||||
{
|
||||
int res;
|
||||
nfc_device_desc_t devices[8];
|
||||
size_t device_count;
|
||||
|
||||
device = nfc_connect (NULL);
|
||||
if (!device)
|
||||
nfc_list_devices (devices, 8, &device_count);
|
||||
if (!device_count)
|
||||
cut_omit ("No device found");
|
||||
|
||||
tags = freefare_get_tags (device);
|
||||
cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed"));
|
||||
for (size_t i = 0; i < device_count; i++) {
|
||||
|
||||
tag = NULL;
|
||||
for (int i=0; tags[i]; i++) {
|
||||
if ((freefare_get_tag_type(tags[i]) == CLASSIC_1K) ||
|
||||
(freefare_get_tag_type(tags[i]) == CLASSIC_4K)) {
|
||||
tag = tags[i];
|
||||
break;
|
||||
device = nfc_connect (&(devices[i]));
|
||||
if (!device)
|
||||
cut_omit ("nfc_connect() failed");
|
||||
|
||||
tags = freefare_get_tags (device);
|
||||
cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed"));
|
||||
|
||||
tag = NULL;
|
||||
for (int i=0; tags[i]; i++) {
|
||||
if ((freefare_get_tag_type(tags[i]) == CLASSIC_1K) ||
|
||||
(freefare_get_tag_type(tags[i]) == CLASSIC_4K)) {
|
||||
tag = tags[i];
|
||||
res = mifare_classic_connect (tag);
|
||||
cut_assert_equal_int (0, res, cut_message ("mifare_classic_connect() failed"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
nfc_disconnect (device);
|
||||
device = NULL;
|
||||
freefare_free_tags (tags);
|
||||
tags = NULL;
|
||||
}
|
||||
|
||||
if (!tag)
|
||||
cut_omit ("No MIFARE Classic tag on NFC device");
|
||||
|
||||
res = mifare_classic_connect (tag);
|
||||
cut_assert_equal_int (0, res, cut_message ("mifare_classic_connect() failed"));
|
||||
cut_omit ("No MIFARE Classic tag on NFC device");
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -58,8 +69,10 @@ cut_teardown ()
|
|||
if (tag)
|
||||
mifare_classic_disconnect (tag);
|
||||
|
||||
if (tags)
|
||||
if (tags) {
|
||||
freefare_free_tags (tags);
|
||||
tags = NULL;
|
||||
}
|
||||
|
||||
if (device)
|
||||
nfc_disconnect (device);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue