[Pcsclite-cvs-commit] r1856 - trunk/Drivers/ccid/src/openct

[Ludovic Rousseau]

Author: rousseau
Date: 2006-02-06 15:08:53 +0000 (Mon, 06 Feb 2006)
New Revision: 1856

Modified:
   trunk/Drivers/ccid/src/openct/proto-t1.c
   trunk/Drivers/ccid/src/openct/proto-t1.h
Log:
export t1_build() and some constants


Modified: trunk/Drivers/ccid/src/openct/proto-t1.c
===================================================================
--- trunk/Drivers/ccid/src/openct/proto-t1.c	2006-02-06 15:08:10 UTC (rev 1855)
+++ trunk/Drivers/ccid/src/openct/proto-t1.c	2006-02-06 15:08:53 UTC (rev 1856)
@@ -22,12 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* T=1 protocol constants */
-#define T1_I_BLOCK		0x00
-#define T1_R_BLOCK		0x80
-#define T1_S_BLOCK		0xC0
-#define T1_MORE_BLOCKS		0x20
-
 /* I block */
 #define T1_I_SEQ_SHIFT		6
 
@@ -67,9 +61,6 @@
 static void		t1_set_checksum(t1_state_t *, int);
 static unsigned	int	t1_block_type(unsigned char);
 static unsigned int	t1_seq(unsigned char);
-static unsigned	int	t1_build(t1_state_t *, unsigned char *,
-				unsigned char, unsigned char,
-				ct_buf_t *, size_t *);
 static unsigned int	t1_rebuild(t1_state_t *t1, unsigned char *block);
 static unsigned int	t1_compute_checksum(t1_state_t *,
 				unsigned char *, size_t);
@@ -558,7 +549,7 @@
 	}
 }
 
-static unsigned int
+unsigned int
 t1_build(t1_state_t *t1, unsigned char *block,
 		unsigned char dad, unsigned char pcb,
 		ct_buf_t *bp, size_t *lenp)

Modified: trunk/Drivers/ccid/src/openct/proto-t1.h
===================================================================
--- trunk/Drivers/ccid/src/openct/proto-t1.h	2006-02-06 15:08:10 UTC (rev 1855)
+++ trunk/Drivers/ccid/src/openct/proto-t1.h	2006-02-06 15:08:53 UTC (rev 1856)
@@ -28,6 +28,14 @@
 #endif
 #include <unistd.h>
 
+#include "buffer.h"
+
+/* T=1 protocol constants */
+#define T1_I_BLOCK		0x00
+#define T1_R_BLOCK		0x80
+#define T1_S_BLOCK		0xC0
+#define T1_MORE_BLOCKS		0x20
+
 enum {
 	IFD_PROTOCOL_RECV_TIMEOUT = 0x0000,
 	IFD_PROTOCOL_T1_BLOCKSIZE,
@@ -71,6 +79,8 @@
 void t1_release(t1_state_t *t1);
 int t1_set_param(t1_state_t *t1, int type, long value);
 int t1_negociate_ifsd(t1_state_t *t1, unsigned int dad, int ifsd);
+unsigned int t1_build(t1_state_t *, unsigned char *,
+	unsigned char, unsigned char, ct_buf_t *, size_t *);
 
 #endif