[Pcsclite-cvs-commit] r6800 - trunk/Drivers/ccid/src

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2013-11-26 14:10:35 +0000 (Tue, 26 Nov 2013)
New Revision: 6800

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
Revert revision 6799

We will use a better way to solve the bug.


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2013-11-26 13:51:45 UTC (rev 6799)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2013-11-26 14:10:35 UTC (rev 6800)
@@ -1074,12 +1074,11 @@
 	unsigned int *uint_array;
 
 	/* See CCID 3.7.3 page 25 */
-	n = ControlUSB_mayfail(reader_index,
+	n = ControlUSB(reader_index,
 		0xA1, /* request type */
 		0x03, /* GET_DATA_RATES */
 		0x00, /* value */
-		buffer, sizeof(buffer),
-		TRUE);
+		buffer, sizeof(buffer));
 
 	/* we got an error? */
 	if (n <= 0)
@@ -1135,8 +1134,8 @@
  *					ControlUSB
  *
  ****************************************************************************/
-int ControlUSB_mayfail(int reader_index, int requesttype, int request,
-	int value, unsigned char *bytes, unsigned int size, int mayfail)
+int ControlUSB(int reader_index, int requesttype, int request, int value,
+	unsigned char *bytes, unsigned int size)
 {
 	int ret;
 
@@ -1151,18 +1150,9 @@
 
 	if (ret < 0)
 	{
-		if (mayfail)
-		{
-			DEBUG_INFO5("control failed (%d/%d): %d %s",
-				usbDevice[reader_index].bus_number,
-				usbDevice[reader_index].device_address, ret, strerror(errno));
-		}
-		else
-		{
-			DEBUG_CRITICAL5("control failed (%d/%d): %d %s",
-				usbDevice[reader_index].bus_number,
-				usbDevice[reader_index].device_address, ret, strerror(errno));
-		}
+		DEBUG_CRITICAL5("control failed (%d/%d): %d %s",
+			usbDevice[reader_index].bus_number,
+			usbDevice[reader_index].device_address, ret, strerror(errno));
 
 		return ret;
 	}
@@ -1175,18 +1165,6 @@
 
 /*****************************************************************************
  *
- *					ControlUSB
- *
- ****************************************************************************/
-int ControlUSB(int reader_index, int requesttype, int request, int value,
-	unsigned char *bytes, unsigned int size)
-{
-	return ControlUSB_mayfail(reader_index, requesttype, request, value,
-		bytes, size, FALSE);
-} /* ControlUSB */
-
-/*****************************************************************************
- *
  *					Transfer is complete
  *
  ****************************************************************************/