[Pcsclite-cvs-commit] r396 - trunk/MacAPDU

[Ludovic Rousseau]

Author: rousseau
Date: 2006-02-07 08:31:41 +0000 (Tue, 07 Feb 2006)
New Revision: 396

Modified:
   trunk/MacAPDU/ApduController.h
   trunk/MacAPDU/ApduController.m
Log:
allow to use a T=1 card


Modified: trunk/MacAPDU/ApduController.h
===================================================================
--- trunk/MacAPDU/ApduController.h	2006-02-07 08:21:42 UTC (rev 395)
+++ trunk/MacAPDU/ApduController.h	2006-02-07 08:31:41 UTC (rev 396)
@@ -12,6 +12,7 @@
     id 		readerDrop;
     SCARDCONTEXT hContext;
     SCARDHANDLE hCard;
+    DWORD	protocol;
 }
 - (void)transmitClick:(id)sender;
 - (void)connectClick:(id)sender;

Modified: trunk/MacAPDU/ApduController.m
===================================================================
--- trunk/MacAPDU/ApduController.m	2006-02-07 08:21:42 UTC (rev 395)
+++ trunk/MacAPDU/ApduController.m	2006-02-07 08:31:41 UTC (rev 396)
@@ -86,7 +86,7 @@
     
     rv = SCardConnect(hContext, [tokenName[tokenIndex] cString], 
                         SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, 
-                        &hCard, &dwPref);
+                        &hCard, &protocol);
     if ( rv != SCARD_S_SUCCESS ) {
         ShowError( rv );
     }
@@ -166,8 +166,9 @@
     }
 
     rxLength = MAX_BUFFER_SIZE;
-    rv = SCardTransmit( hCard, SCARD_PCI_T0, txUCBuffer, j, NULL,
-                        rxUCBuffer, &rxLength );
+    rv = SCardTransmit( hCard,
+		SCARD_PROTOCOL_T0 == protocol ? SCARD_PCI_T0 : SCARD_PCI_T1,
+		txUCBuffer, j, NULL, rxUCBuffer, &rxLength );
 
     if ( rv != SCARD_S_SUCCESS ) {
         ShowError( rv );