forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-07-29 07:01:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

New NFC modulation type NMT_BARCODE

Browse Source
This commit is contained in:
Philippe Teuwen
2017-05-17 13:38:20 +02:00
parent 9f1a68530a
commit dcdbff0705
16 changed files with 224 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
utils/nfc-list.c
View File

@@ -71,8 +71,9 @@ print_usage(const char *progname)
printf("\t 16: ISO14443B'\n");
printf("\t 32: ISO14443B-2 ST SRx\n");
printf("\t 64: ISO14443B-2 ASK CTx\n");
printf("\t 128: Jewel\n");
printf("\tSo 255 (default) polls for all types.\n");
printf("\t 128: ISO14443A-3 Jewel\n");
printf("\t 256: ISO14443A-2 NFC Barcode\n");
printf("\tSo 511 (default) polls for all types.\n");
printf("\tNote that if 16, 32 or 64 then 8 is selected too.\n");
}
@@ -84,7 +85,7 @@ main(int argc, const char *argv[])
size_t i;
bool verbose = false;
int res = 0;
int mask = 0xff;
int mask = 0x1ff;
int arg;
nfc_context *context;
@@ -108,7 +109,7 @@ main(int argc, const char *argv[])
} else if ((0 == strcmp(argv[arg], "-t")) && (arg + 1 < argc)) {
arg++;
mask = atoi(argv[arg]);
if ((mask < 1) || (mask > 255)) {
if ((mask < 1) || (mask > 0x1ff)) {
ERR("%i is invalid value for type bitfield.", mask);
print_usage(argv[0]);
exit(EXIT_FAILURE);
@@ -277,7 +278,23 @@ main(int argc, const char *argv[])
if ((res = nfc_initiator_list_passive_targets(pnd, nm, ant, MAX_TARGET_COUNT)) >= 0) {
int n;
if (verbose || (res > 0)) {
printf("%d Jewel passive target(s) found%s\n", res, (res == 0) ? ".\n" : ":");
printf("%d ISO14443A-3 Jewel passive target(s) found%s\n", res, (res == 0) ? ".\n" : ":");
}
for (n = 0; n < res; n++) {
print_nfc_target(&ant[n], verbose);
printf("\n");
}
}
}
if (mask & 0x100) {
nm.nmt = NMT_BARCODE;
nm.nbr = NBR_106;
// List NFC Barcode targets
if ((res = nfc_initiator_list_passive_targets(pnd, nm, ant, MAX_TARGET_COUNT)) >= 0) {
int n;
if (verbose || (res > 0)) {
printf("%d ISO14443A-2 NFC Barcode passive target(s) found%s\n", res, (res == 0) ? ".\n" : ":");
}
for (n = 0; n < res; n++) {
print_nfc_target(&ant[n], verbose);