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

nfc_list_devices() function returns now the number of devices found.

Browse source
This commit is contained in:
Audrey Diacre 2012-01-10 10:35:36 +00:00
parent 00818e048c
commit 1ec504e163
12 changed files with 23 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/test_access_storm.c
View file

@ -15,17 +15,16 @@ test_access_storm (void)
{
int n = NTESTS;
nfc_connstring connstrings[MAX_DEVICE_COUNT];
size_t device_count, ref_device_count;
int res = 0;
nfc_list_devices (connstrings, MAX_DEVICE_COUNT, &ref_device_count);
size_t ref_device_count = nfc_list_devices (connstrings, MAX_DEVICE_COUNT);
if (!ref_device_count)
cut_omit ("No NFC device found");
while (n) {
size_t i;
nfc_list_devices (connstrings, MAX_DEVICE_COUNT, &device_count);
size_t device_count = nfc_list_devices (connstrings, MAX_DEVICE_COUNT);
cut_assert_equal_int (ref_device_count, device_count, cut_message ("device count"));
for (i = 0; i < device_count; i++) {

4
test/test_dep_active.c
View file

@ -27,9 +27,7 @@ abort_test_by_keypress (int sig)
void
cut_setup (void)
{
size_t n;
nfc_list_devices (connstrings, 2, &n);
size_t n = nfc_list_devices (connstrings, 2);
if (n < 2) {
cut_omit ("At least two NFC devices must be plugged-in to run this test");
}

4
test/test_dep_passive.c
View file

@ -26,9 +26,7 @@ abort_test_by_keypress (int sig)
void
cut_setup (void)
{
size_t n;
nfc_list_devices (connstrings, 2, &n);
size_t n = nfc_list_devices (connstrings, 2);
if (n < 2) {
cut_omit ("At least two NFC devices must be plugged-in to run this test");
}

3
test/test_register_access.c
View file

@ -10,10 +10,9 @@ void
test_register_endianness (void)
{
nfc_connstring connstrings[MAX_DEVICE_COUNT];
size_t device_count;
int res = 0;
nfc_list_devices (connstrings, MAX_DEVICE_COUNT, &device_count);
size_t device_count = nfc_list_devices (connstrings, MAX_DEVICE_COUNT);
if (!device_count)
cut_omit ("No NFC device found");

3
test/test_register_endianness.c
View file

@ -11,10 +11,9 @@ void
test_register_endianness (void)
{
nfc_connstring connstrings[MAX_DEVICE_COUNT];
size_t device_count;
int res = 0;
nfc_list_devices (connstrings, MAX_DEVICE_COUNT, &device_count);
size_t device_count = nfc_list_devices (connstrings, MAX_DEVICE_COUNT);
if (!device_count)
cut_omit ("No NFC device found");