[Pcsclite-cvs-commit] Drivers/ccid/src commands.c,1.17,1.18 commands.h,1.7,1.8

rousseau@haydn.debian.org rousseau@haydn.debian.org


Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv16560

Modified Files:
	commands.c commands.h 
Log Message:
CCID_Transmit() now has a new "unsigned char bBWI" argument


Index: commands.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/commands.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- commands.c	30 Jun 2004 11:53:51 -0000	1.17
+++ commands.c	30 Jun 2004 13:21:18 -0000	1.18
@@ -415,7 +415,7 @@
  *
  ****************************************************************************/
 RESPONSECODE CCID_Transmit(int lun, unsigned int tx_length,
-	const unsigned char tx_buffer[])
+	const unsigned char tx_buffer[], unsigned char bBWI)
 {
 	unsigned char cmd[10+CMD_BUF_SIZE];	/* CCID + APDU buffer */
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(lun);
@@ -424,7 +424,8 @@
 	i2dw(tx_length, cmd+1);	/* APDU length */
 	cmd[5] = 0;	/* slot number */
 	cmd[6] = ccid_descriptor->bSeq++;
-	cmd[7] = cmd[8] = cmd[9] = 0; /* RFU */
+	cmd[7] = bBWI;	/* extend block waiting timeout */
+	cmd[8] = cmd[9] = 0; /* RFU */
 	memcpy(cmd+10, tx_buffer, tx_length);
 
 	if (WritePort(lun, 10+tx_length, cmd) != STATUS_SUCCESS)
@@ -490,7 +491,7 @@
 
 	DEBUG_COMM2("T=0: %d bytes", tx_length);
 
-	return_value = CCID_Transmit(lun, tx_length, tx_buffer);
+	return_value = CCID_Transmit(lun, tx_length, tx_buffer, 0);
 	if (return_value != IFD_SUCCESS)
 		return return_value;
 	

Index: commands.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/commands.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- commands.h	24 May 2004 12:58:43 -0000	1.7
+++ commands.h	30 Jun 2004 13:21:18 -0000	1.8
@@ -37,7 +37,7 @@
 	unsigned char tx_buffer[], unsigned int *rx_length,
 	unsigned char rx_buffer[], int protoccol);
 RESPONSECODE CCID_Transmit(int lun, unsigned int tx_length,
-	const unsigned char tx_buffer[]);
+	const unsigned char tx_buffer[], unsigned char bBWI);
 RESPONSECODE CCID_Receive(int lun, unsigned int *rx_length,
 	unsigned char rx_buffer[]);
 RESPONSECODE CmdXfrBlockTPDU_T0(int lun, unsigned int tx_length,