[Pcsclite-cvs-commit] Drivers/ccid/src commands.c,1.27,1.28
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv16263
Modified Files:
commands.c
Log Message:
use (*ccid_descriptor->pbSeq)++ instead of ccid_descriptor->bSeq++
Index: commands.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/commands.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- commands.c 28 Jul 2004 08:33:18 -0000 1.27
+++ commands.c 6 Aug 2004 11:13:25 -0000 1.28
@@ -86,7 +86,7 @@
cmd[0] = 0x62; /* IccPowerOn */
cmd[1] = cmd[2] = cmd[3] = cmd[4] = 0; /* dwLength */
cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
- cmd[6] = ccid_descriptor->bSeq++;
+ cmd[6] = (*ccid_descriptor->pbSeq)++;
cmd[7] = voltage;
cmd[8] = cmd[9] = 0; /* RFU */
@@ -203,7 +203,7 @@
cmd[0] = 0x69; /* Secure */
cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
- cmd[6] = ccid_descriptor->bSeq++;
+ cmd[6] = (*ccid_descriptor->pbSeq)++;
cmd[7] = 0; /* bBWI */
cmd[8] = 0; /* wLevelParameter */
cmd[9] = 0;
@@ -246,7 +246,7 @@
cmd_in[0] = 0x6B; /* PC_to_RDR_Escape */
i2dw(length_in - 10, cmd_in+1); /* dwLength */
cmd_in[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
- cmd_in[6] = ccid_descriptor->bSeq++;
+ cmd_in[6] = (*ccid_descriptor->pbSeq)++;
cmd_in[7] = cmd_in[8] = cmd_in[9] = 0; /* RFU */
/* copy the command */
@@ -302,7 +302,7 @@
cmd[0] = 0x63; /* IccPowerOff */
cmd[1] = cmd[2] = cmd[3] = cmd[4] = 0; /* dwLength */
cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
- cmd[6] = ccid_descriptor->bSeq++;
+ cmd[6] = (*ccid_descriptor->pbSeq)++;
cmd[7] = cmd[8] = cmd[9] = 0; /* RFU */
res = WritePort(reader_index, sizeof(cmd), cmd);
@@ -340,7 +340,7 @@
cmd[0] = 0x65; /* GetSlotStatus */
cmd[1] = cmd[2] = cmd[3] = cmd[4] = 0; /* dwLength */
cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
- cmd[6] = ccid_descriptor->bSeq++;
+ cmd[6] = (*ccid_descriptor->pbSeq)++;
cmd[7] = cmd[8] = cmd[9] = 0; /* RFU */
res = WritePort(reader_index, sizeof(cmd), cmd);
@@ -439,7 +439,7 @@
cmd[0] = 0x6F; /* XfrBlock */
i2dw(tx_length, cmd+1); /* APDU length */
cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
- cmd[6] = ccid_descriptor->bSeq++;
+ cmd[6] = (*ccid_descriptor->pbSeq)++;
cmd[7] = bBWI; /* extend block waiting timeout */
cmd[8] = cmd[9] = 0; /* RFU */
memcpy(cmd+10, tx_buffer, tx_length);
@@ -563,7 +563,7 @@
cmd[0] = 0x61; /* SetParameters */
i2dw(length, cmd+1); /* APDU length */
cmd[5] = ccid_descriptor->bCurrentSlotIndex; /* slot number */
- cmd[6] = ccid_descriptor->bSeq++;
+ cmd[6] = (*ccid_descriptor->pbSeq)++;
cmd[7] = protocol; /* bProtocolNum */
cmd[8] = cmd[9] = 0; /* RFU */
memcpy(cmd+10, buffer, length);