[Pcsclite-cvs-commit] r2723 - /trunk/Drivers/ccid/src/commands.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Jan  7 15:49:07 2008
New Revision: 2723

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2723
Log:
do not add support for ICCD A or B for the serial driver since
ControlUSB() is not available with this reader

Modified:
    trunk/Drivers/ccid/src/commands.c

Modified: trunk/Drivers/ccid/src/commands.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/commands.c?rev=2723&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/commands.c (original)
+++ trunk/Drivers/ccid/src/commands.c Mon Jan  7 15:49:07 2008
@@ -85,6 +85,7 @@
 	RESPONSECODE return_value = IFD_SUCCESS;
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
 
+#ifndef TWIN_SERIAL
 	if (ICCD_A == ccid_descriptor->bInterfaceProtocol)
 	{
 		int r;
@@ -162,6 +163,7 @@
 
 		return IFD_SUCCESS;
 	}
+#endif
 
 	/* store length of buffer[] */
 	length = *nlength;
@@ -738,6 +740,7 @@
 	RESPONSECODE return_value = IFD_SUCCESS;
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
 
+#ifndef TWIN_SERIAL
 	if (ICCD_A == ccid_descriptor->bInterfaceProtocol)
 	{
 		int r;
@@ -782,6 +785,7 @@
 
 		return IFD_SUCCESS;
 	}
+#endif
 
 	cmd[0] = 0x63; /* IccPowerOff */
 	cmd[1] = cmd[2] = cmd[3] = cmd[4] = 0;	/* dwLength */
@@ -827,6 +831,7 @@
 	RESPONSECODE return_value = IFD_SUCCESS;
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
 
+#ifndef TWIN_SERIAL
 	if (ICCD_A == ccid_descriptor->bInterfaceProtocol)
 	{
 		int r;
@@ -900,6 +905,7 @@
 		}
 		return IFD_SUCCESS;
 	}
+#endif
 
 	cmd[0] = 0x65; /* GetSlotStatus */
 	cmd[1] = cmd[2] = cmd[3] = cmd[4] = 0;	/* dwLength */
@@ -1015,6 +1021,7 @@
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
 	status_t ret;
 
+#ifndef TWIN_SERIAL
 	if (ICCD_A == ccid_descriptor->bInterfaceProtocol)
 	{
 		int r;
@@ -1054,6 +1061,7 @@
 
 		return IFD_SUCCESS;
 	}
+#endif
 
 	cmd[0] = 0x6F; /* XfrBlock */
 	i2dw(tx_length, cmd+1);	/* APDU length */
@@ -1096,6 +1104,7 @@
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
 	status_t ret;
 
+#ifndef TWIN_SERIAL
 	if (ICCD_A == ccid_descriptor->bInterfaceProtocol)
 	{
 		int r;
@@ -1184,6 +1193,7 @@
 
 		return IFD_SUCCESS;
 	}
+#endif
 
 time_request:
 	length = sizeof(cmd);