[Pcsclite-cvs-commit] r2057 - trunk/PCSC/src/PCSC

[Ludovic Rousseau]

Author: rousseau
Date: 2006-05-25 21:28:42 +0000 (Thu, 25 May 2006)
New Revision: 2057

Modified:
   trunk/PCSC/src/PCSC/pcsclite.h.in
Log:
#define MAX_BUFFER_SIZE_EXTENDED and remove the @extended_apdu@
management


Modified: trunk/PCSC/src/PCSC/pcsclite.h.in
===================================================================
--- trunk/PCSC/src/PCSC/pcsclite.h.in	2006-05-25 20:53:55 UTC (rev 2056)
+++ trunk/PCSC/src/PCSC/pcsclite.h.in	2006-05-25 21:28:42 UTC (rev 2057)
@@ -216,27 +216,14 @@
 #endif
 
 /*
- * Enhanced messaging has been added to accomodate newer devices which have
- * more advanced capabilites, such as dedicated secure co-processors which
- * can stream and encrypt data over USB. In order to used enhanced messaging
- * you must define PCSCLITE_ENHANCED_MESSAGING in the framework(library),
- * the daemon, and your application
- */
- at extended_apdu@
-#ifndef PCSCLITE_ENHANCED_MESSAGING
-#define PCSCLITE_MAX_MESSAGE_SIZE	2048	/* Transport msg len */
-#define MAX_BUFFER_SIZE			264	/* Maximum Tx/Rx Buffer */
-#define PCSCLITE_SERVER_ATTEMPTS	5	/* Attempts to reach cl */
-#else
-/*
  * The message and buffer sizes must be multiples of 16.
  * The max message size must be at least large enough
  * to accomodate the transmit_struct
  */
-#define PCSCLITE_MAX_MESSAGE_SIZE	(1<<17)	/* enhanced (128K) msg len */
-#define MAX_BUFFER_SIZE			(1<<15)	/* enhanced (32K) Tx/Rx Buffer */
-#define PCSCLITE_SERVER_ATTEMPTS	200	/* To allow larger data reads/writes */
-#endif
+#define PCSCLITE_MAX_MESSAGE_SIZE	2048	/* Transport msg len */
+#define MAX_BUFFER_SIZE			264	/* Maximum Tx/Rx Buffer */
+#define MAX_BUFFER_SIZE_EXTENDED	(1<<15)	/* enhanced (32K) Tx/Rx Buffer */
+#define PCSCLITE_SERVER_ATTEMPTS	5	/* Attempts to reach cl */
 
 /*
  * Gets a stringified error response