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

nfc_initiator_select_dep_target() function returns now selected D.E.P targets count on success.

Browse source
This commit is contained in:
Audrey Diacre 2011-12-22 13:28:41 +00:00
parent b864215d63
commit 658fceb7fc
4 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libnfc/chips/pn53x.c
View file

@ -2315,28 +2315,27 @@ pn53x_InJumpForDEP (struct nfc_device *pnd,
return res; return res;
// Make sure one target has been found, the PN53X returns 0x00 if none was available // Make sure one target has been found, the PN53X returns 0x00 if none was available
if (abtRx[1] != 1) if (abtRx[1] >= 1) {
return NFC_ECHIP; // Is a target struct available
if (pnt) {
// Is a target struct available pnt->nm.nmt = NMT_DEP;
if (pnt) { pnt->nm.nbr = nbr;
pnt->nm.nmt = NMT_DEP; pnt->nti.ndi.ndm = ndm;
pnt->nm.nbr = nbr; memcpy (pnt->nti.ndi.abtNFCID3, abtRx + 2, 10);
pnt->nti.ndi.ndm = ndm; pnt->nti.ndi.btDID = abtRx[12];
memcpy (pnt->nti.ndi.abtNFCID3, abtRx + 2, 10); pnt->nti.ndi.btBS = abtRx[13];
pnt->nti.ndi.btDID = abtRx[12]; pnt->nti.ndi.btBR = abtRx[14];
pnt->nti.ndi.btBS = abtRx[13]; pnt->nti.ndi.btTO = abtRx[15];
pnt->nti.ndi.btBR = abtRx[14]; pnt->nti.ndi.btPP = abtRx[16];
pnt->nti.ndi.btTO = abtRx[15]; if(szRx > 17) {
pnt->nti.ndi.btPP = abtRx[16]; pnt->nti.ndi.szGB = szRx - 17;
if(szRx > 17) { memcpy (pnt->nti.ndi.abtGB, abtRx + 17, pnt->nti.ndi.szGB);
pnt->nti.ndi.szGB = szRx - 17; } else {
memcpy (pnt->nti.ndi.abtGB, abtRx + 17, pnt->nti.ndi.szGB); pnt->nti.ndi.szGB = 0;
} else { }
pnt->nti.ndi.szGB = 0;
} }
} }
return NFC_SUCCESS; return abtRx[1];
} }
int int

2
libnfc/nfc.c
View file

@ -433,7 +433,7 @@ nfc_initiator_poll_target (nfc_device *pnd,
/** /**
* @brief Select a target and request active or passive mode for D.E.P. (Data Exchange Protocol) * @brief Select a target and request active or passive mode for D.E.P. (Data Exchange Protocol)
* @return Returns 0 on success, otherwise returns libnfc's error code (negative value). * @return Returns selected D.E.P tagets count on success, otherwise returns libnfc's error code (negative value).
* *
* @param pnd \a nfc_device struct pointer that represent currently used device * @param pnd \a nfc_device struct pointer that represent currently used device
* @param ndm desired D.E.P. mode (\a NDM_ACTIVE or \a NDM_PASSIVE for active, respectively passive mode) * @param ndm desired D.E.P. mode (\a NDM_ACTIVE or \a NDM_PASSIVE for active, respectively passive mode)

10
test/test_dep_active.c
View file

@ -116,16 +116,16 @@ initiator_thread (void *arg)
*/ */
sleep (1); sleep (1);
printf ("=========== INITIATOR %s =========\n", nfc_device_get_name (device)); printf ("=========== INITIATOR %s =========\n", nfc_device_get_name (device));
int ires = nfc_initiator_init (device); int res = nfc_initiator_init (device);
cut_assert_equal_int (0, ires, cut_message ("Can't initialize NFC device as initiator: %s", nfc_strerror (device))); cut_assert_equal_int (0, res, cut_message ("Can't initialize NFC device as initiator: %s", nfc_strerror (device)));
if (ires < 0) { thread_res = -1; return (void*) thread_res; } if (res < 0) { thread_res = -1; return (void*) thread_res; }
nfc_target nt; nfc_target nt;
// Active mode // Active mode
printf ("=========== INITIATOR %s (Active mode / %s Kbps) =========\n", nfc_device_get_name (device), str_nfc_baud_rate(nbr)); printf ("=========== INITIATOR %s (Active mode / %s Kbps) =========\n", nfc_device_get_name (device), str_nfc_baud_rate(nbr));
int res = nfc_initiator_select_dep_target (device, NDM_ACTIVE, nbr, NULL, &nt, 1000); res = nfc_initiator_select_dep_target (device, NDM_ACTIVE, nbr, NULL, &nt, 1000);
cut_assert_equal_int (0, res, cut_message ("Can't select any DEP target: %s", nfc_strerror (device))); cut_assert_operator_int (res, >=, 0, cut_message ("Can't select any DEP target: %s", nfc_strerror (device)));
cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation")); cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation"));
cut_assert_equal_int (nbr, nt.nm.nbr, cut_message ("Invalid target baud rate")); cut_assert_equal_int (nbr, nt.nm.nbr, cut_message ("Invalid target baud rate"));
cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3")); cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3"));

17
test/test_dep_passive.c
View file

@ -148,17 +148,16 @@ initiator_thread (void *arg)
sleep (1); sleep (1);
printf ("=========== INITIATOR %s =========\n", nfc_device_get_name (device)); printf ("=========== INITIATOR %s =========\n", nfc_device_get_name (device));
int ires = nfc_initiator_init (device); int res = nfc_initiator_init (device);
printf ("IRES: %d\n", ires); cut_assert_equal_int (0, res, cut_message ("Can't initialize NFC device as initiator: %s", nfc_strerror (device)));
cut_assert_equal_int (0, ires, cut_message ("Can't initialize NFC device as initiator: %s", nfc_strerror (device))); if (res < 0) { thread_res = -1; return (void*) thread_res; }
if (ires < 0) { thread_res = -1; return (void*) thread_res; }
nfc_target nt; nfc_target nt;
// Passive mode / 106Kbps // Passive mode / 106Kbps
printf ("=========== INITIATOR %s (Passive mode / 106Kbps) =========\n", nfc_device_get_name (device)); printf ("=========== INITIATOR %s (Passive mode / 106Kbps) =========\n", nfc_device_get_name (device));
int res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_106, NULL, &nt, 5000); res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_106, NULL, &nt, 5000);
cut_assert_equal_int (0, res, cut_message ("Can't select any DEP target: %s", nfc_strerror (device))); cut_assert_operator_int (res, >=, 0, cut_message ("Can't select any DEP target: %s", nfc_strerror (device)));
cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation")); cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation"));
cut_assert_equal_int (NBR_106, nt.nm.nbr, cut_message ("Invalid target baud rate")); cut_assert_equal_int (NBR_106, nt.nm.nbr, cut_message ("Invalid target baud rate"));
cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3")); cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3"));
@ -183,7 +182,7 @@ initiator_thread (void *arg)
// Passive mode / 212Kbps (second pass) // Passive mode / 212Kbps (second pass)
printf ("=========== INITIATOR %s (Passive mode / 212Kbps) =========\n", nfc_device_get_name (device)); printf ("=========== INITIATOR %s (Passive mode / 212Kbps) =========\n", nfc_device_get_name (device));
res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_212, NULL, &nt, 1000); res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_212, NULL, &nt, 1000);
cut_assert_equal_int (0, res, cut_message ("Can't select any DEP target: %s", nfc_strerror (device))); cut_assert_operator_int (res, >=, 0, cut_message ("Can't select any DEP target: %s", nfc_strerror (device)));
cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation")); cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation"));
cut_assert_equal_int (NBR_212, nt.nm.nbr, cut_message ("Invalid target baud rate")); cut_assert_equal_int (NBR_212, nt.nm.nbr, cut_message ("Invalid target baud rate"));
cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3")); cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3"));
@ -205,7 +204,7 @@ initiator_thread (void *arg)
// Passive mode / 212Kbps // Passive mode / 212Kbps
printf ("=========== INITIATOR %s (Passive mode / 212Kbps, second pass) =========\n", nfc_device_get_name (device)); printf ("=========== INITIATOR %s (Passive mode / 212Kbps, second pass) =========\n", nfc_device_get_name (device));
res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_212, NULL, &nt, 1000); res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_212, NULL, &nt, 1000);
cut_assert_equal_int (0, res, cut_message ("Can't select any DEP target: %s", nfc_strerror (device))); cut_assert_operator_int (res, >=, 0, cut_message ("Can't select any DEP target: %s", nfc_strerror (device)));
cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation")); cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation"));
cut_assert_equal_int (NBR_212, nt.nm.nbr, cut_message ("Invalid target baud rate")); cut_assert_equal_int (NBR_212, nt.nm.nbr, cut_message ("Invalid target baud rate"));
cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3")); cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3"));
@ -227,7 +226,7 @@ initiator_thread (void *arg)
// Passive mode / 424Kbps // Passive mode / 424Kbps
printf ("=========== INITIATOR %s (Passive mode / 424Kbps) =========\n", nfc_device_get_name (device)); printf ("=========== INITIATOR %s (Passive mode / 424Kbps) =========\n", nfc_device_get_name (device));
res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_424, NULL, &nt, 1000); res = nfc_initiator_select_dep_target (device, NDM_PASSIVE, NBR_424, NULL, &nt, 1000);
cut_assert_equal_int (0, res, cut_message ("Can't select any DEP target: %s", nfc_strerror (device))); cut_assert_operator_int (res, >=, 0, cut_message ("Can't select any DEP target: %s", nfc_strerror (device)));
cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation")); cut_assert_equal_int (NMT_DEP, nt.nm.nmt, cut_message ("Invalid target modulation"));
cut_assert_equal_int (NBR_424, nt.nm.nbr, cut_message ("Invalid target baud rate")); cut_assert_equal_int (NBR_424, nt.nm.nbr, cut_message ("Invalid target baud rate"));
cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3")); cut_assert_equal_memory ("\x11\x22\x33\x44\x55\x66\x77\x88\x99\xAA", 10, nt.nti.ndi.abtNFCID3, 10, cut_message ("Invalid target NFCID3"));