DeforaNetworks/nfcutils
DeforaNetworks/nfcutils
3
0
Fork 0
Code Releases Activity

code clean up.

Browse Source
This commit is contained in:
Romuald Conty 2010-03-18 11:02:52 +00:00
parent 0f6d8ecae8
commit 50e79d3760
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lsnfc.c
View File

@ -65,17 +65,6 @@ int main(int argc, const char* argv[])
{ {
pnd = nfc_connect(&(pnddDevices[i])); pnd = nfc_connect(&(pnddDevices[i]));
// If specific device is wanted, i.e. an ARYGON device on /dev/ttyUSB0
/*
nfc_device_desc_t ndd;
ndd.pcDriver = "ARYGON";
ndd.pcPort = "/dev/ttyUSB0";
ndd.uiSpeed = 115200;
pnd = nfc_connect(&ndd);
*/
if (pnd == NULL) { if (pnd == NULL) {
ERR("%s", "Unable to connect to NFC device."); ERR("%s", "Unable to connect to NFC device.");
return EXIT_FAILURE; return EXIT_FAILURE;
@ -98,7 +87,7 @@ int main(int argc, const char* argv[])
bool no_more_tag = false; bool no_more_tag = false;
printf("device = %s\n",pnd->acName); printf("device = %s\n",pnd->acName);
do { do {
if (nfc_initiator_select_tag(pnd,NM_ISO14443A_106,NULL,0,&nti)) // Poll for a ISO14443A (MIFARE) tag if (nfc_initiator_select_tag(pnd,NM_ISO14443A_106,NULL,0,&nti))
{ {
printf(" ISO14443A: "); printf(" ISO14443A: ");
@ -149,7 +138,7 @@ Innovision R&T Jewel 0C 00
/* @note I'm not sure that Jewel can be detected using this modultation and I haven't Jewel tags to test. */ /* @note I'm not sure that Jewel can be detected using this modultation and I haven't Jewel tags to test. */
printf("Innovision R&T Jewel (UID="); print_hex(nti.nai.abtUid,nti.nai.szUidLen); printf(")\n"); printf("Innovision R&T Jewel (UID="); print_hex(nti.nai.abtUid,nti.nai.szUidLen); printf(")\n");
} else { } else {
printf("Unknown tag type: "); printf("Unknown ISO14443A tag type: ");
printf("ATQA (SENS_RES): "); print_hex(nti.nai.abtAtqa,2); printf("ATQA (SENS_RES): "); print_hex(nti.nai.abtAtqa,2);
printf(", UID (NFCID%c): ",(nti.nai.abtUid[0]==0x08?'3':'1')); print_hex(nti.nai.abtUid,nti.nai.szUidLen); printf(", UID (NFCID%c): ",(nti.nai.abtUid[0]==0x08?'3':'1')); print_hex(nti.nai.abtUid,nti.nai.szUidLen);
printf(", SAK (SEL_RES): "); print_hex(&nti.nai.btSak,1); printf(", SAK (SEL_RES): "); print_hex(&nti.nai.btSak,1);
@ -162,7 +151,7 @@ Innovision R&T Jewel 0C 00
} }
nfc_initiator_deselect_tag(pnd); nfc_initiator_deselect_tag(pnd);
tag_count++; 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)) // Poll for a Felica tag } 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: "); printf(" Felica: ");
printf("ID (NFCID2): "); print_hex(nti.nfi.abtId,8); printf("ID (NFCID2): "); print_hex(nti.nfi.abtId,8);
@ -170,7 +159,7 @@ Innovision R&T Jewel 0C 00
printf("\n"); printf("\n");
nfc_initiator_deselect_tag(pnd); nfc_initiator_deselect_tag(pnd);
tag_count++; tag_count++;
} else if (nfc_initiator_select_tag(pnd,NM_ISO14443B_106,(byte_t*)"\x00",1,&nti)) // Poll for a ISO14443B tag } else if (nfc_initiator_select_tag(pnd,NM_ISO14443B_106,(byte_t*)"\x00",1,&nti))
{ {
printf(" ISO14443B: "); printf(" ISO14443B: ");
printf("ATQB: "); print_hex(nti.nbi.abtAtqb,12); printf("ATQB: "); print_hex(nti.nbi.abtAtqb,12);
@ -184,7 +173,7 @@ Innovision R&T Jewel 0C 00
printf("\n"); printf("\n");
nfc_initiator_deselect_tag(pnd); nfc_initiator_deselect_tag(pnd);
tag_count++; tag_count++;
} else if (nfc_initiator_select_tag(pnd,NM_JEWEL_106,NULL,0,&nti)) // Poll for a Jewel tag } else if (nfc_initiator_select_tag(pnd,NM_JEWEL_106,NULL,0,&nti))
{ {
printf(" Jewel: No test results yet"); printf(" Jewel: No test results yet");
nfc_initiator_deselect_tag(pnd); nfc_initiator_deselect_tag(pnd);