Merge remote-tracking branch 'origin/master' into libusb10

Author: Your Name

README.md

@@ -102,6 +102,17 @@ file per device in a nfc/devices.d directory:
     printf 'name = "My first device"\nconnstring = "pn532_uart:/dev/ttyACM0"\n' | sudo tee /etc/nfc/devices.d/first.conf
     printf 'name = "My second device"\nconnstring = "pn532_uart:/dev/ttyACM1"\n' | sudo tee /etc/nfc/devices.d/second.conf
 
+Environment Variables
+=====================
+You can override certain configuration options at runtime using the following environment variables:
++ `LIBNFC_DEFAULT_DEVICE=<connstring>`:  `LIBNFC_DEFAULT_DEVICE=pn532_uart:/dev/ttyACM0` will use pn532 on /dev/ttyACM0 as default device
++ `LIBNFC_DEVICE=<connstring>` will ignore all devices in the config files and use only the one defined in the variable
++ `LIBNFC_AUTO_SCAN=<true|false>` overrides `allow_autoscan` option in the config file
++ `LIBNFC_INTRUSIVE_SCAN=<true|false>` overrides `allow_intrusive_scan` option in the config file
++ `LIBNFC_LOG_LEVEL=<0|1|2|3>` overrides `log_level` option in the config file
+
+To obtain the connstring of a recognized device, you can use `nfc-scan-device`: `LIBNFC_AUTO_SCAN=true nfc-scan-device` will show the names & connstrings of all found devices.
+
 How to report bugs
 ==================
 

examples/nfc-st25tb.c

@@ -50,7 +50,7 @@
  *
  * Tested with
  * - ST25TB512-AC - (BE/Brussels/STIB ; AliExpress ones)
- * - ST25TB512-AT - (FR/Lille/Ilevia ; FR/Reims/Citura)
+ * - ST25TB512-AT - (FR/Lille/Ilevia ; FR/Reims/Citura ; FR/Dijon/Divia ; FR/Strasbourg/CTS)
  * - SRT512 - legacy - (FR/Bordeaux/TBM)
  * - SRI512 - legacy - (anonymous vending machine)
  */
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 	nfc_context *context = NULL;
 	nfc_device *pnd = NULL;
 	nfc_target nt = {0};
-	nfc_modulation nm = {NMT_ISO14443B, NBR_106};
+	nfc_modulation nm = {NMT_ISO14443B2SR, NBR_106};
 	const st_data * stcurrent;
 	int opt, res;
 	bool bIsBlock = false, bIsRead = false, bIsWrite = false, bIsBadCli = false;
@@ -205,45 +205,35 @@ int main(int argc, char *argv[])
 				{
 					printf("Reader  : %s - via %s\n  ...wait for card...\n", nfc_device_get_name(pnd), nfc_device_get_connstring(pnd));
 
-					res = nfc_initiator_list_passive_targets(pnd, nm, &nt, 1);
-					if(res == 0) // we don't really wanted a NMT_ISO14443B
+					if (nfc_initiator_select_passive_target(pnd, nm, NULL, 0, &nt) > 0)
 					{
-						nm.nmt = NMT_ISO14443B2SR; // we want a NMT_ISO14443B2SR, but needed to ask for NMT_ISO14443B before
-						if (nfc_initiator_select_passive_target(pnd, nm, NULL, 0, &nt) > 0)
+						stcurrent = get_info(&nt, true);
+						if(stcurrent)
 						{
-							stcurrent = get_info(&nt, true);
-							if(stcurrent)
-							{
-								printf("\n");
+							printf("\n");
 
-								if(bIsBlock && (bIsRead || bIsWrite))
+							if(bIsBlock && (bIsRead || bIsWrite))
+							{
+								if(bIsRead)
 								{
-									if(bIsRead)
-									{
-										get_block_at(pnd, blockNumber, NULL, 0, true);
-									}
-									
-									if(bIsWrite)
-									{
-										set_block_at_confirmed(pnd, blockNumber, data, cbData, true);
-									}
+									get_block_at(pnd, blockNumber, NULL, 0, true);
 								}
-								else if(!bIsRead && !bIsWrite && !bIsBlock)
+								
+								if(bIsWrite)
+								{
+									set_block_at_confirmed(pnd, blockNumber, data, cbData, true);
+								}
+							}
+							else if(!bIsRead && !bIsWrite && !bIsBlock)
+							{
+								for(i = 0; i < stcurrent->nbNormalBlock; i++)
 								{
-									for(i = 0; i < stcurrent->nbNormalBlock; i++)
-									{
-										get_block_at(pnd, i, NULL, 0, true);
-									}
-									display_system_info(pnd, stcurrent);
+									get_block_at(pnd, i, NULL, 0, true);
 								}
+								display_system_info(pnd, stcurrent);
 							}
 						}
 					}
-					else if(res > 0)
-					{
-						printf("ERROR - We got a NMT_ISO14443B ?\n");
-					}
-					else printf("ERROR - nfc_initiator_list_passive_targets: %i\n", res);
 				}
 				else printf("ERROR - nfc_initiator_init: %i\n", res);
 
@@ -606,4 +596,5 @@ void print_hex(const uint8_t *pbtData, const size_t szBytes)
 	{
 		printf("%02hhx ", pbtData[szPos]);
 	}
-}
+}
+

libnfc/chips/pn53x.c

@@ -1155,6 +1155,14 @@ pn53x_initiator_select_passive_target_ext(struct nfc_device *pnd,
         uint8_t abtRx[1];
         uint8_t *pbtInitData = (uint8_t *) "\x0b";
         size_t szInitData = 1;
+        
+        if ((res = pn53x_write_register(pnd, PN53X_REG_CIU_TxAuto, 0xef, 0x07)) < 0) // Initial RFOn, Tx2 RFAutoEn, Tx1 RFAutoEn
+          return res;
+        if ((res = pn53x_write_register(pnd, PN53X_REG_CIU_CWGsP, 0x3f, 0x3f)) < 0) // Conductance of the P-Driver
+          return res;
+        if ((res = pn53x_write_register(pnd, PN53X_REG_CIU_ModGsP, 0x3f, 0x12)) < 0) // Driver P-output conductance for the time of modulation
+          return res;
+        
         // Getting random Chip_ID
         if ((res = pn53x_initiator_transceive_bytes(pnd, abtInitiate, szInitiateLen, abtRx, sizeof(abtRx), timeout)) < 0) {
           if ((res == NFC_ERFTRANS) && (CHIP_DATA(pnd)->last_status_byte == 0x01)) { // Chip timeout

libnfc/drivers/acr122_usb.c

@@ -580,6 +580,7 @@ acr122_usb_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, co
 
   uint8_t attempted_response = RDR_to_PC_DataBlock;
   size_t len;
+  int error, status;
 
   if (res == NFC_ETIMEOUT) {
     if (DRIVER_DATA(pnd)->abort_flag) {
@@ -591,7 +592,7 @@ acr122_usb_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, co
       goto read;
     }
   }
-  if (res < 12) {
+  if (res < 10) {
     log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "%s", "Invalid RDR_to_PC_DataBlock frame");
     // try to interrupt current device state
     acr122_usb_ack(pnd);
@@ -606,6 +607,17 @@ acr122_usb_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, co
   offset++;
 
   len = abtRxBuf[offset++];
+  status = abtRxBuf[7];
+  error = abtRxBuf[8];
+  if (len == 0 && error == 0xFE) { // ICC_MUTE; XXX check for more errors
+      // Do not check status; my ACR122U seemingly has status=0 in this case,
+      // even though the spec says it should have had bmCommandStatus=1
+      // and bmICCStatus=1.
+      log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "%s", "Command timed out");
+      pnd->last_error = NFC_ETIMEOUT;
+      return pnd->last_error;
+  }
+
   if (!((len > 1) && (abtRxBuf[10] == 0xd5))) { // In case we didn't get an immediate answer:
     if (len != 2) {
       log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "%s", "Wrong reply");
@@ -652,7 +664,7 @@ acr122_usb_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, co
         goto read; // FIXME May cause some trouble on Touchatag, right ?
       }
     }
-    if (res < 12) {
+    if (res < 10) {
       // try to interrupt current device state
       acr122_usb_ack(pnd);
       pnd->last_error = NFC_EIO;
@@ -701,7 +713,7 @@ acr122_usb_receive(nfc_device *pnd, uint8_t *pbtData, const size_t szDataLen, co
 
   // Skip CCID remaining bytes
   offset += 2; // bSlot and bSeq are not used
-  offset += 2; // XXX bStatus and bError should maybe checked ?
+  offset += 2; // bStatus and bError is partially checked
   offset += 1; // bRFU should be 0x00
 
   // TFI + PD0 (CC+1)

utils/nfc-list.c

@@ -113,7 +113,7 @@ main(int argc, const char *argv[])
         exit(EXIT_FAILURE);
       }
       // Force TypeB for all derivatives of B
-      if (mask & 0xf0)
+      if (mask & 0xd0)
         mask |= 0x08;
     } else {
       ERR("%s is not supported option.", argv[arg]);