[Pcsclite-cvs-commit] r2091 - in trunk/Drivers/ccid/src: . openct towitoko

Ludovic Rousseau rousseau at costa.debian.org
Mon Jul 3 13:59:14 UTC 2006


Author: rousseau
Date: 2006-07-03 13:59:13 +0000 (Mon, 03 Jul 2006)
New Revision: 2091

Modified:
   trunk/Drivers/ccid/src/commands.c
   trunk/Drivers/ccid/src/openct/proto-t1.c
   trunk/Drivers/ccid/src/towitoko/pps.c
Log:
use CCID_Receive() with the new API (use NULL as chain_parameter)


Modified: trunk/Drivers/ccid/src/commands.c
===================================================================
--- trunk/Drivers/ccid/src/commands.c	2006-07-03 13:56:42 UTC (rev 2090)
+++ trunk/Drivers/ccid/src/commands.c	2006-07-03 13:59:13 UTC (rev 2091)
@@ -292,7 +292,7 @@
 		return IFD_COMMUNICATION_ERROR;
 	}
 
-	ret = CCID_Receive(reader_index, RxLength, RxBuffer);
+	ret = CCID_Receive(reader_index, RxLength, RxBuffer, NULL);
 
 	/* T=1 Protocol Management for a TPDU reader */
 	if ((IFD_SUCCESS == ret)
@@ -512,7 +512,7 @@
  		return IFD_COMMUNICATION_ERROR;
 	}
 
- 	ret = CCID_Receive(reader_index, RxLength, RxBuffer);
+ 	ret = CCID_Receive(reader_index, RxLength, RxBuffer, NULL);
 
 	/* T=1 Protocol Management for a TPDU reader */
 	if ((IFD_SUCCESS == ret)
@@ -897,7 +897,7 @@
 	if (return_value != IFD_SUCCESS)
 		return return_value;
 
-	return CCID_Receive(reader_index, rx_length, rx_buffer);
+	return CCID_Receive(reader_index, rx_length, rx_buffer, NULL);
 } /* CmdXfrBlockTPDU_T0 */
 
 
@@ -1000,7 +1000,7 @@
 		if (return_value != IFD_SUCCESS)
 			return return_value;
 
-		return_value = CCID_Receive(reader_index, &ret_len, tmp_buf);
+		return_value = CCID_Receive(reader_index, &ret_len, tmp_buf, NULL);
 		if (return_value != IFD_SUCCESS)
 			return return_value;
 
@@ -1062,7 +1062,7 @@
 
 		in_len = 1;
 
-		return_value = CCID_Receive(reader_index, &in_len, tmp_buf);
+		return_value = CCID_Receive(reader_index, &in_len, tmp_buf, NULL);
 		if (return_value != IFD_SUCCESS)
 			return return_value;
 
@@ -1153,7 +1153,7 @@
 		if (in_len == 0)
 		{
 			in_len = 1;
-			return_value = CCID_Receive(reader_index, &in_len, tmp_buf);
+			return_value = CCID_Receive(reader_index, &in_len, tmp_buf, NULL);
 			if (return_value != IFD_SUCCESS)
 			{
 				DEBUG_CRITICAL("CCID_Receive failed");

Modified: trunk/Drivers/ccid/src/openct/proto-t1.c
===================================================================
--- trunk/Drivers/ccid/src/openct/proto-t1.c	2006-07-03 13:56:42 UTC (rev 2090)
+++ trunk/Drivers/ccid/src/openct/proto-t1.c	2006-07-03 13:59:13 UTC (rev 2091)
@@ -681,7 +681,7 @@
 		 * so we can't use &rmax since &rmax is a (size_t *) and may not
 		 * be the same on 64-bits architectures for example (iMac G5) */
 		rmax_int = rmax;
-		n = CCID_Receive(t1 -> lun, &rmax_int, block);
+		n = CCID_Receive(t1 -> lun, &rmax_int, block, NULL);
 		rmax = rmax_int;
 
 		if (n == IFD_PARITY_ERROR)
@@ -696,7 +696,7 @@
 			return n;
 
 		rmax_int = rmax;
-		n = CCID_Receive(t1 -> lun, &rmax_int, &block[3]);
+		n = CCID_Receive(t1 -> lun, &rmax_int, &block[3], NULL);
 		rmax = rmax_int;
 		if (n == IFD_PARITY_ERROR)
 			return -2;
@@ -714,7 +714,7 @@
 
 		/* Get the response en bloc */
 		rmax_int = rmax;
-		n = CCID_Receive(t1 -> lun, &rmax_int, block);
+		n = CCID_Receive(t1 -> lun, &rmax_int, block, NULL);
 		rmax = rmax_int;
 		if (n == IFD_PARITY_ERROR)
 			return -2;

Modified: trunk/Drivers/ccid/src/towitoko/pps.c
===================================================================
--- trunk/Drivers/ccid/src/towitoko/pps.c	2006-07-03 13:56:42 UTC (rev 2090)
+++ trunk/Drivers/ccid/src/towitoko/pps.c	2006-07-03 13:59:13 UTC (rev 2091)
@@ -60,7 +60,7 @@
 
   /* Get PPS confirm */
   len_confirm = sizeof(confirm);
-  if (CCID_Receive (lun, &len_confirm, confirm) != IFD_SUCCESS)
+  if (CCID_Receive (lun, &len_confirm, confirm, NULL) != IFD_SUCCESS)
     return PPS_ICC_ERROR;
 
   DEBUG_XXD ("PPS: Receiving confirm: ", confirm, len_confirm);




More information about the Pcsclite-cvs-commit mailing list