DeforaNetworks/nfcutils
3
0
Fork 0
Code Releases Activity

(nfcutils) Improve tag count reporting in lsnfc:

Browse Source 
- Reset tag count when switching from a device to another;
  - Add a counter for the total number of tags to keep the previous information.
This commit is contained in:
Romain Tartiere
2010-06-27 07:03:02 +00:00
parent dd8766658c
commit 4eff5f8f98
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lsnfc.c
+15 -6
View File
@@ -44,7 +44,9 @@ int
main (int argc, const char *argv[])
{
nfc_target_info_t nti;
uint8_t tag_count = 0;
uint8_t device_count = 0;
uint8_t device_tag_count = 0; // per device
uint8_t tag_count = 0; // total
nfc_device_desc_t *pnddDevices;
size_t szFound;
@@ -64,6 +66,9 @@ main (int argc, const char *argv[])
for (size_t i = 0; i < szFound; i++) {
pnd = nfc_connect (&(pnddDevices[i]));
device_count++;
device_tag_count = 0;
if (pnd == NULL) {
ERR ("%s", "Unable to connect to NFC device.");
return EXIT_FAILURE;
@@ -163,6 +168,7 @@ Innovision R&T Jewel 0C 00
printf ("Unknown ISO14443A tag type: ");
printf ("ATQA (SENS_RES): ");
print_hex (nti.nai.abtAtqa, 2);
printf (" == %02x%02d == ", nti.nai.abtAtqa[0], nti.nai.abtAtqa[1]);
printf (", UID (NFCID%c): ", (nti.nai.abtUid[0] == 0x08 ? '3' : '1'));
print_hex (nti.nai.abtUid, nti.nai.szUidLen);
printf (", SAK (SEL_RES): ");
@@ -174,7 +180,7 @@ Innovision R&T Jewel 0C 00
printf ("\n");
}
nfc_initiator_deselect_tag (pnd);
tag_count++;
device_tag_count++;
} else if (nfc_initiator_select_tag (pnd, NM_FELICA_212, abtFelica, 5, &nti)
|| nfc_initiator_select_tag (pnd, NM_FELICA_424, abtFelica, 5, &nti)) {
printf (" Felica: ");
@@ -184,7 +190,7 @@ Innovision R&T Jewel 0C 00
print_hex (nti.nfi.abtPad, 8);
printf ("\n");
nfc_initiator_deselect_tag (pnd);
tag_count++;
device_tag_count++;
} else if (nfc_initiator_select_tag (pnd, NM_ISO14443B_106, (byte_t *) "\x00", 1, &nti)) {
printf (" ISO14443B: ");
printf ("ATQB: ");
@@ -200,21 +206,24 @@ Innovision R&T Jewel 0C 00
nti.nbi.btParam4);
printf ("\n");
nfc_initiator_deselect_tag (pnd);
tag_count++;
device_tag_count++;
} else if (nfc_initiator_select_tag (pnd, NM_JEWEL_106, NULL, 0, &nti)) {
printf (" Jewel: No test results yet");
nfc_initiator_deselect_tag (pnd);
tag_count++;
device_tag_count++;
} else {
no_more_tag = true;
}
} while (no_more_tag != true);
printf ("%d tag(s) have been found.\n", tag_count);
printf ("%d tag(s) on device.\n\n", device_tag_count);
tag_count += device_tag_count;
// Disable field
nfc_configure (pnd, NDO_ACTIVATE_FIELD, false);
nfc_disconnect (pnd);
}
if (device_count > 1)
printf ("Total: %d tag(s) on %d device(s).\n", tag_count, device_count);
return EXIT_SUCCESS;
}