[Pcsclite-cvs-commit] r1703 - trunk/Drivers/ccid/src

[Ludovic Rousseau]

Author: rousseau
Date: 2005-11-07 15:46:03 +0000 (Mon, 07 Nov 2005)
New Revision: 1703

Modified:
   trunk/Drivers/ccid/src/ccid_serial.c
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
remove #ifdef DEBUG_LEVEL_COMM since DEBUG_LEVEL_COMM is a numeric value
and not a compilation flag anymore. Debug is always active and filtered
by pcscd.


Modified: trunk/Drivers/ccid/src/ccid_serial.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_serial.c	2005-11-07 15:41:47 UTC (rev 1702)
+++ trunk/Drivers/ccid/src/ccid_serial.c	2005-11-07 15:46:03 UTC (rev 1703)
@@ -199,11 +199,9 @@
 	unsigned char lrc;
 	unsigned char low_level_buffer[GEMPCTWIN_MAXBUF];
 
-#ifdef DEBUG_LEVEL_COMM
 	char debug_header[] = "-> 123456 ";
 
 	sprintf(debug_header, "-> %06X ", reader_index);
-#endif
 
 	if (length > GEMPCTWIN_MAXBUF-3)
 	{
@@ -225,9 +223,7 @@
 		lrc ^= low_level_buffer[i];
 	low_level_buffer[length+2] = lrc;
 
-#ifdef DEBUG_LEVEL_COMM
 	DEBUG_XXD(debug_header, low_level_buffer, length+3);
-#endif
 
 	if (write(serialDevice[reader_index].fd, low_level_buffer,
 		length+3) != length+3)
@@ -340,9 +336,7 @@
 	if ((rv = get_bytes(reader_index, buffer+5, to_read-5)) != STATUS_SUCCESS)
 		return rv;
 
-#ifdef DEBUG_LEVEL_COMM
-		DEBUG_XXD("frame: ", buffer, to_read);
-#endif
+	DEBUG_XXD("frame: ", buffer, to_read);
 
 	/* lrc */
 	DEBUG_COMM("lrc");
@@ -435,11 +429,9 @@
 	struct timeval t;
 	int i, rv = 0;
 	int already_read;
-#ifdef DEBUG_LEVEL_COMM
 	char debug_header[] = "<- 123456 ";
 
 	sprintf(debug_header, "<- %06X ", reader_index);
-#endif
 
 	already_read = 0;
 	while (already_read < min_length)
@@ -470,9 +462,7 @@
 			return -1;
 		}
 
-#ifdef DEBUG_LEVEL_COMM
 		DEBUG_XXD(debug_header, buffer + already_read, rv);
-#endif
 
 		already_read += rv;
 		DEBUG_COMM3("read: %d, to read: %d", already_read,

Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2005-11-07 15:41:47 UTC (rev 1702)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2005-11-07 15:46:03 UTC (rev 1703)
@@ -433,15 +433,11 @@
 	unsigned char *buffer)
 {
 	int rv;
-#ifdef DEBUG_LEVEL_COMM
 	char debug_header[] = "-> 121234 ";
 
 	sprintf(debug_header, "-> %06X ", (int)reader_index);
-#endif
 
-#ifdef DEBUG_LEVEL_COMM
 	DEBUG_XXD(debug_header, buffer, length);
-#endif
 
 	rv = usb_bulk_write(usbDevice[reader_index].handle,
 		usbDevice[reader_index].bulk_out, (char *)buffer, length,
@@ -474,11 +470,9 @@
 	unsigned char *buffer)
 {
 	int rv;
-#ifdef DEBUG_LEVEL_COMM
 	char debug_header[] = "<- 121234 ";
 
 	sprintf(debug_header, "<- %06X ", (int)reader_index);
-#endif
 
 	rv = usb_bulk_read(usbDevice[reader_index].handle,
 		usbDevice[reader_index].bulk_in, (char *)buffer, *length,
@@ -495,9 +489,7 @@
 
 	*length = rv;
 
-#ifdef DEBUG_LEVEL_COMM
 	DEBUG_XXD(debug_header, buffer, *length);
-#endif
 
 	return STATUS_SUCCESS;
 } /* ReadUSB */