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

Examples and utils are now updated to use the requiered nfc_context

Browse source
This commit is contained in:
Romuald Conty 2012-12-04 19:29:57 +01:00
parent dc949c257e
commit 5b0e276572
20 changed files with 136 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

13
examples/nfc-anticol.c
View file

@ -149,10 +149,11 @@ main(int argc, char *argv[])
}
}
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
// Try to open the NFC reader
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
if (!pnd) {
printf("Error opening NFC reader\n");
@ -187,8 +188,8 @@ main(int argc, char *argv[])
if (!transmit_bits(abtReqa, 7)) {
printf("Error: No tag available\n");
nfc_close(pnd);
nfc_exit(NULL);
return 1;
nfc_exit(context);
return EXIT_FAILURE;
}
memcpy(abtAtqa, abtRx, 2);
@ -317,6 +318,6 @@ main(int argc, char *argv[])
}
nfc_close(pnd);
nfc_exit(NULL);
return 0;
nfc_exit(context);
return EXIT_SUCCESS;
}

7
examples/nfc-dep-initiator.c
View file

@ -71,9 +71,10 @@ main(int argc, const char *argv[])
return EXIT_FAILURE;
}
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
if (!pnd) {
printf("Unable to open NFC device.\n");
return EXIT_FAILURE;
@ -110,6 +111,6 @@ main(int argc, const char *argv[])
error:
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
return EXIT_SUCCESS;
}

12
examples/nfc-dep-target.c
View file

@ -64,18 +64,20 @@ main(int argc, const char *argv[])
uint8_t abtRx[MAX_FRAME_LEN];
int szRx;
uint8_t abtTx[] = "Hello Mars!";
nfc_context *context;
nfc_init(&context);
#define MAX_DEVICE_COUNT 2
nfc_connstring connstrings[MAX_DEVICE_COUNT];
size_t szDeviceFound = nfc_list_devices(NULL, connstrings, MAX_DEVICE_COUNT);
size_t szDeviceFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);
// Little hack to allow using nfc-dep-initiator & nfc-dep-target from
// the same machine: if there is more than one readers opened
// nfc-dep-target will open the second reader
// (we hope they're always detected in the same order)
nfc_init(NULL);
if (szDeviceFound == 1) {
pnd = nfc_open(NULL, connstrings[0]);
pnd = nfc_open(context, connstrings[0]);
} else if (szDeviceFound > 1) {
pnd = nfc_open(NULL, connstrings[1]);
pnd = nfc_open(context, connstrings[1]);
} else {
printf("No device found.\n");
return EXIT_FAILURE;
@ -141,6 +143,6 @@ main(int argc, const char *argv[])
error:
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
return EXIT_SUCCESS;
}

10
examples/nfc-emulate-forum-tag2.c
View file

@ -184,8 +184,10 @@ main(int argc, char *argv[])
};
signal(SIGINT, stop_emulation);
nfc_init(NULL);
pnd = nfc_open(NULL, NULL);
nfc_context *context;
nfc_init(&context);
pnd = nfc_open(context, NULL);
if (pnd == NULL) {
ERR("Unable to open NFC device");
@ -200,7 +202,7 @@ main(int argc, char *argv[])
}
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_SUCCESS);
@ -208,6 +210,6 @@ error:
if (pnd) {
nfc_perror(pnd, argv[0]);
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
}
}

9
examples/nfc-emulate-tag.c
View file

@ -56,6 +56,7 @@
static uint8_t abtRx[MAX_FRAME_LEN];
static int szRx;
static nfc_context *context;
static nfc_device *pnd;
static bool quiet_output = false;
static bool init_mfc_auth = false;
@ -68,7 +69,7 @@ intr_hdlr(int sig)
if (pnd != NULL) {
nfc_close(pnd);
}
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_FAILURE);
}
@ -181,10 +182,10 @@ main(int argc, char *argv[])
signal(SIGINT, intr_hdlr);
#endif
nfc_init(NULL);
nfc_init(&context);
// Try to open the NFC reader
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
// Display libnfc version
acLibnfcVersion = nfc_version();
@ -270,7 +271,7 @@ main(int argc, char *argv[])
}
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_SUCCESS);
}

9
examples/nfc-emulate-uid.c
View file

@ -126,10 +126,11 @@ main(int argc, char *argv[])
signal(SIGINT, intr_hdlr);
#endif
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
// Try to open the NFC device
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
if (pnd == NULL) {
printf("Unable to open NFC device\n");
@ -220,11 +221,11 @@ main(int argc, char *argv[])
}
}
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_SUCCESS);
error:
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_FAILURE);
}

11
examples/nfc-mfsetuid.c
View file

@ -177,10 +177,11 @@ main(int argc, char *argv[])
}
}
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
// Try to open the NFC reader
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
if (!pnd) {
printf("Error opening NFC reader\n");
@ -215,7 +216,7 @@ main(int argc, char *argv[])
if (!transmit_bits(abtReqa, 7)) {
printf("Error: No tag available\n");
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
return 1;
}
memcpy(abtAtqa, abtRx, 2);
@ -354,6 +355,6 @@ main(int argc, char *argv[])
nfc_close(pnd);
nfc_exit(NULL);
return 0;
nfc_exit(context);
return EXIT_SUCCESS;
}

9
examples/nfc-poll.c
View file

@ -103,9 +103,10 @@ main(int argc, const char *argv[])
nfc_target nt;
int res = 0;
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
if (pnd == NULL) {
ERR("%s", "Unable to open NFC device.");
@ -122,7 +123,7 @@ main(int argc, const char *argv[])
if ((res = nfc_initiator_poll_target(pnd, nmModulations, szModulations, uiPollNr, uiPeriod, &nt)) < 0) {
nfc_perror(pnd, "nfc_initiator_poll_target");
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_FAILURE);
}
@ -132,6 +133,6 @@ main(int argc, const char *argv[])
printf("No target found.\n");
}
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_SUCCESS);
}

14
examples/nfc-relay.c
View file

@ -108,19 +108,19 @@ main(int argc, char *argv[])
signal(SIGINT, intr_hdlr);
#endif
nfc_context *context;
nfc_init(&context);
nfc_connstring connstrings[MAX_DEVICE_COUNT];
// List available devices
size_t szFound = nfc_list_devices(NULL, connstrings, MAX_DEVICE_COUNT);
size_t szFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);
if (szFound < 2) {
ERR("%zd device found but two opened devices are needed to relay NFC.", szFound);
return EXIT_FAILURE;
}
nfc_init(NULL);
// Try to open the NFC emulator device
pndTag = nfc_open(NULL, connstrings[0]);
pndTag = nfc_open(context, connstrings[0]);
if (pndTag == NULL) {
printf("Error opening NFC emulator device\n");
return EXIT_FAILURE;
@ -152,7 +152,7 @@ main(int argc, char *argv[])
if ((szReaderRxBits = nfc_target_init(pndTag, &nt, abtReaderRx, sizeof(abtReaderRx), 0)) < 0) {
ERR("%s", "Initialization of NFC emulator failed");
nfc_close(pndTag);
nfc_exit(NULL);
nfc_exit(context);
return EXIT_FAILURE;
}
printf("%s", "Configuring emulator settings...");
@ -164,7 +164,7 @@ main(int argc, char *argv[])
printf("%s", "Done, emulated tag is initialized");
// Try to open the NFC reader
pndReader = nfc_open(NULL, connstrings[1]);
pndReader = nfc_open(context, connstrings[1]);
printf("NFC reader device: %s opened", nfc_device_get_name(pndReader));
printf("%s", "Configuring NFC reader settings...");
@ -222,6 +222,6 @@ main(int argc, char *argv[])
nfc_close(pndTag);
nfc_close(pndReader);
nfc_exit(NULL);
nfc_exit(context);
exit(EXIT_SUCCESS);
}

7
examples/pn53x-diagnose.c
View file

@ -66,21 +66,22 @@ main(int argc, const char *argv[])
errx(1, "usage: %s", argv[0]);
}
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
// Display libnfc version
acLibnfcVersion = nfc_version();
printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
nfc_connstring connstrings[MAX_DEVICE_COUNT];
size_t szFound = nfc_list_devices(NULL, connstrings, MAX_DEVICE_COUNT);
size_t szFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);
if (szFound == 0) {
printf("No NFC device found.\n");
}
for (i = 0; i < szFound; i++) {
pnd = nfc_open(NULL, connstrings[i]);
pnd = nfc_open(context, connstrings[i]);
if (pnd == NULL) {
ERR("%s", "Unable to open NFC device.");

7
examples/pn53x-sam.c
View file

@ -77,7 +77,8 @@ main(int argc, const char *argv[])
int ret = EXIT_FAILURE;
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
// Display libnfc version
const char *acLibnfcVersion = nfc_version();
@ -85,7 +86,7 @@ main(int argc, const char *argv[])
// Open using the first available NFC device
nfc_device *pnd;
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
if (pnd == NULL) {
ERR("%s", "Unable to open NFC device.");
@ -211,7 +212,7 @@ error:
// Close NFC device
nfc_close(pnd);
nfc_exit(NULL);
nfc_exit(context);
exit(ret);
}

9
examples/pn53x-tamashell.c
View file

@ -83,10 +83,11 @@ int main(int argc, const char *argv[])
}
}
nfc_init(NULL);
nfc_context *context;
nfc_init(&context);
// Try to open the NFC reader
pnd = nfc_open(NULL, NULL);
pnd = nfc_open(context, NULL);
if (pnd == NULL) {
ERR("%s", "Unable to open NFC device.");
@ -197,6 +198,6 @@ int main(int argc, const char *argv[])
fclose(input);
}
nfc_close(pnd);
nfc_exit(NULL);
return 1;
nfc_exit(context);
return EXIT_SUCCESS;
}