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

Make sure the field is disabled then enabled before listing.

Browse source 
Improve documentation about default configuration values.
This commit is contained in:
Romuald Conty 2010-10-18 10:11:30 +00:00
parent ecc1eeca8f
commit 7d59b6b1a3
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libnfc/nfc.c
View file

@ -59,6 +59,15 @@ nfc_device_desc_t *nfc_pick_device (void);
* *
* When it has successfully claimed a NFC device, memory is allocated to save the device information. It will return a pointer to a \a nfc_device_t struct. * When it has successfully claimed a NFC device, memory is allocated to save the device information. It will return a pointer to a \a nfc_device_t struct.
* This pointer should be supplied by every next functions of libnfc that should perform an action with this device. * This pointer should be supplied by every next functions of libnfc that should perform an action with this device.
*
* @note During this function, the device will be configured with default options:
* - Crc is handled by the device (NDO_HANDLE_CRC = true)
* - Parity is handled the device (NDO_HANDLE_PARITY = true)
* - Cryto1 cipher is disabled (NDO_ACTIVATE_CRYPTO1 = false)
* - Easy framing is enabled (NDO_EASY_FRAMING = true)
* - Auto-switching in ISO14443-4 mode is enabled (NDO_AUTO_ISO14443_4 = true)
* - Invalid frames are not accepted (NDO_ACCEPT_INVALID_FRAMES = false)
* - Multiple frames are not accepted (NDO_ACCEPT_MULTIPLE_FRAMES = false)
*/ */
nfc_device_t * nfc_device_t *
nfc_connect (nfc_device_desc_t * pndd) nfc_connect (nfc_device_desc_t * pndd)
@ -114,7 +123,7 @@ nfc_connect (nfc_device_desc_t * pndd)
if (!nfc_configure (pnd, NDO_HANDLE_PARITY, true)) if (!nfc_configure (pnd, NDO_HANDLE_PARITY, true))
return NULL; return NULL;
// Deactivate the CRYPTO1 chiper, it may could cause problems when still active // Deactivate the CRYPTO1 cipher, it may could cause problems when still active
if (!nfc_configure (pnd, NDO_ACTIVATE_CRYPTO1, false)) if (!nfc_configure (pnd, NDO_ACTIVATE_CRYPTO1, false))
return NULL; return NULL;
@ -358,8 +367,18 @@ nfc_initiator_list_passive_targets (nfc_device_t * pnd,
pnd->iLastError = 0; pnd->iLastError = 0;
// Let the reader only try once to find a target // Drop the field for a while
nfc_configure (pnd, NDO_INFINITE_SELECT, false); if (!nfc_configure (pnd, NDO_ACTIVATE_FIELD, false)) {
return false;
}
// Let the reader only try once to find a tag
if (!nfc_configure (pnd, NDO_INFINITE_SELECT, false)) {
return false;
}
// Enable field so more power consuming cards can power themselves up
if (!nfc_configure (pnd, NDO_ACTIVATE_FIELD, true)) {
return false;
}
switch (nm.nmt) { switch (nm.nmt) {
case NMT_ISO14443B: { case NMT_ISO14443B: {