[Pcsclite-cvs-commit] Drivers/ccid/src/towitoko pps.c,1.3,1.4 pps.h,1.2,1.3

[rousseau@haydn.debian.org]

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

Modified Files:
	pps.c pps.h 
Log Message:
move macros PPS_HAS_PPS?() from pps.c to pps.h


Index: pps.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/towitoko/pps.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pps.c	11 Feb 2004 14:33:04 -0000	1.3
+++ pps.c	30 Jun 2004 13:57:33 -0000	1.4
@@ -20,31 +20,16 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "protocol_t1.h"
 #include "pps.h"
 #include "atr.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <PCSC/ifdhandler.h>
 
 #include "commands.h"
 #include "defs.h"
-#include "ifdhandler.h"
 #include "debug.h"
-
-/*
- * Not exported constants definition
- */
-
-#define PPS_DEFAULT_PROTOCOL	0x00
-
-/*
- * Not exported macros definition
- */
-
-#define PPS_HAS_PPS1(block)	((block[1] & 0x10) == 0x10)
-#define PPS_HAS_PPS2(block)	((block[1] & 0x20) == 0x20)
-#define PPS_HAS_PPS3(block)	((block[1] & 0x40) == 0x40)
 
 /*
  * Not exported funtions declaration

Index: pps.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/towitoko/pps.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pps.h	11 Feb 2004 14:33:04 -0000	1.2
+++ pps.h	30 Jun 2004 13:57:33 -0000	1.3
@@ -34,6 +34,11 @@
 #define PPS_HANDSAKE_ERROR	2	/* Agreement not reached */
 #define PPS_PROTOCOL_ERROR	3	/* Error starting protocol */
 #define PPS_MAX_LENGTH		6
+
+#define PPS_HAS_PPS1(block)	((block[1] & 0x10) == 0x10)
+#define PPS_HAS_PPS2(block)	((block[1] & 0x20) == 0x20)
+#define PPS_HAS_PPS3(block)	((block[1] & 0x40) == 0x40)
+
 /*
  * Exported data types definition
  */