[Pcsclite-cvs-commit] Drivers/ccid/src utils.c,1.2,1.3 parse.c,1.9,1.10 defs.h,1.5,1.6 commands.h,1.4,1.5 ccid_serial.c,1.9,1.10 ccid_ifdhandler.h,1.7,1.8 Makefile.am,1.14,1.15

[rousseau@haydn.debian.org]

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

Modified Files:
	utils.c parse.c defs.h commands.h ccid_serial.c 
	ccid_ifdhandler.h Makefile.am 
Log Message:
reorganize header files


Index: utils.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- utils.c	10 Sep 2003 08:52:29 -0000	1.2
+++ utils.c	17 May 2004 14:35:51 -0000	1.3
@@ -21,7 +21,11 @@
  * $Id$
  */
 
-#include "pcscdefines.h"
+#include <pcsclite.h>
+
+#include "ccid.h"
+#include "defs.h"
+#include "ccid_ifdhandler.h"
 #include "utils.h"
 
 /* Check if the Lun is not to large for the pgSlots table

Index: parse.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/parse.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- parse.c	8 Apr 2004 09:46:54 -0000	1.9
+++ parse.c	17 May 2004 14:35:51 -0000	1.10
@@ -25,7 +25,8 @@
 #include <string.h> 
 #include <usb.h>
 
-#include "pcscdefines.h"
+#include "defs.h"
+#include "ccid_ifdhandler.h"
 #include "ccid.h"
 #include "ccid_usb.h"
 

Index: defs.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/defs.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defs.h	19 Apr 2004 16:18:00 -0000	1.5
+++ defs.h	17 May 2004 14:35:51 -0000	1.6
@@ -21,7 +21,8 @@
  * $Id$
  */
 
-#include "pcscdefines.h"
+#include <pcsclite.h>
+
 #include "protocol_t1/protocol_t1.h"
 
 typedef struct CCID_DESC
@@ -42,6 +43,13 @@
 	 */
 	Protocol_T1 t1;
 } CcidDesc;
+
+typedef enum {
+	STATUS_SUCCESS               = 0xFA,
+	STATUS_UNSUCCESSFUL          = 0xFB,
+	STATUS_COMM_ERROR            = 0xFC,
+	STATUS_DEVICE_PROTOCOL_ERROR = 0xFD
+} status_t;
 
 /* Powerflag (used to detect quick insertion removals unnoticed by the 
  * resource manager)Initial value */

Index: commands.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/commands.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- commands.h	15 Jan 2004 14:09:10 -0000	1.4
+++ commands.h	17 May 2004 14:35:51 -0000	1.5
@@ -26,7 +26,8 @@
 #define ERROR_OFFSET 8
 
 RESPONSECODE CmdPowerOn(int lun, int * nlength, unsigned char buffer[]);
-RESPONSECODE CmdEscape(int lun, int command);
+RESPONSECODE CmdEscape(int lun, const unsigned char TxBuffer[], int TxLength,
+	unsigned char RxBuffer[], unsigned long *RxLength);
 RESPONSECODE CmdPowerOff(int lun);
 RESPONSECODE CmdGetSlotStatus(int lun, unsigned char buffer[]);
 RESPONSECODE CmdXfrBlock(int lun, int tx_length, unsigned char tx_buffer[],

Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ccid_serial.c	6 Apr 2004 13:15:34 -0000	1.9
+++ ccid_serial.c	17 May 2004 14:35:51 -0000	1.10
@@ -33,7 +33,8 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "pcscdefines.h"
+#include "defs.h"
+#include "ccid_ifdhandler.h"
 #include "config.h"
 #include "debug.h"
 #include "ccid.h"

Index: ccid_ifdhandler.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_ifdhandler.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ccid_ifdhandler.h	17 May 2004 13:00:12 -0000	1.7
+++ ccid_ifdhandler.h	17 May 2004 14:35:51 -0000	1.8
@@ -33,11 +33,14 @@
 extern int DriverOptions;
 
 /*
+ * Maximum number of CCID readers supported simultaneously
+ */
+#define PCSCLITE_MAX_READERS 16
+
+/*
  * CCID driver specific functions
  */
 CcidDesc *get_ccid_slot(int lun);
-RESPONSECODE CardUp(int lun);
-RESPONSECODE CardDown(int lun);
 
 #endif
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	19 Apr 2004 16:21:53 -0000	1.14
+++ Makefile.am	17 May 2004 14:35:51 -0000	1.15
@@ -9,16 +9,14 @@
 
 COMMON = ccid.c \
 	ccid.h \
+	ccid_ifdhandler.h \
 	commands.c \
 	commands.h \
 	debug.h \
 	defs.h \
 	ifdhandler.c \
-	ifdhandler.h \
-	pcscdefines.h \
 	utils.c \
-	utils.h \
-	winsmcrd.h
+	utils.h
 USB = ccid_usb.c ccid_usb.h
 SERIAL = ccid_serial.c ccid_serial.h
 T1 = protocol_t1/apdu.h \