[Pcsclite-cvs-commit] Drivers/ccid/src ccid_serial.c,1.3,1.4 ccid_usb.c,1.8,1.9 ifdhandler.c,1.6,1.7
rousseau@quantz.debian.org
rousseau@quantz.debian.org
Thu, 15 Jan 2004 09:30:33 +0100
Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory quantz:/tmp/cvs-serv15975/src
Modified Files:
ccid_serial.c ccid_usb.c ifdhandler.c
Log Message:
remove function name from debug message since __FUNCTION__ is now used in
DEBUG_* macro definition
Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ccid_serial.c 22 Sep 2003 14:24:26 -0000 1.3
+++ ccid_serial.c 15 Jan 2004 08:30:31 -0000 1.4
@@ -154,7 +154,7 @@
if (length > GEMPCTWIN_MAXBUF-3)
{
- DEBUG_CRITICAL3("WriteSerial: command too long: %d for max %d",
+ DEBUG_CRITICAL3("command too long: %d for max %d",
length, GEMPCTWIN_MAXBUF-3);
return STATUS_UNSUCCESSFUL;
}
@@ -179,7 +179,7 @@
if (write(serialDevice[LunToReaderIndex(lun)].fd, low_level_buffer,
length+3) != length+3)
{
- DEBUG_CRITICAL2("WriteSerial: write error: %s", strerror(errno));
+ DEBUG_CRITICAL2("write error: %s", strerror(errno));
return STATUS_UNSUCCESSFUL;
}
@@ -316,12 +316,12 @@
int offset = serialDevice[LunToReaderIndex(lun)].buffer_offset;
int offset_last = serialDevice[LunToReaderIndex(lun)].buffer_offset_last;
- DEBUG_COMM3("get_bytes: available: %d, needed: %d", offset_last-offset,
+ DEBUG_COMM3("available: %d, needed: %d", offset_last-offset,
length);
/* enough data are available */
if (offset + length <= offset_last)
{
- DEBUG_COMM("get_bytes: data available");
+ DEBUG_COMM("data available");
memcpy(buffer, serialDevice[LunToReaderIndex(lun)].buffer + offset, length);
serialDevice[LunToReaderIndex(lun)].buffer_offset += length;
}
@@ -334,13 +334,13 @@
if (present > 0)
{
- DEBUG_COMM2("get_bytes: some data available: %d", present);
+ DEBUG_COMM2("some data available: %d", present);
memcpy(buffer, serialDevice[LunToReaderIndex(lun)].buffer + offset,
present);
}
/* get fresh data */
- DEBUG_COMM2("get_bytes: get more data: %d", length - present);
+ DEBUG_COMM2("get more data: %d", length - present);
rv = ReadChunk(lun, serialDevice[LunToReaderIndex(lun)].buffer, sizeof(serialDevice[LunToReaderIndex(lun)].buffer), length - present);
if (rv < 0)
return STATUS_COMM_ERROR;
@@ -350,7 +350,7 @@
length - present);
serialDevice[LunToReaderIndex(lun)].buffer_offset = length - present;
serialDevice[LunToReaderIndex(lun)].buffer_offset_last = rv;
- DEBUG_COMM3("get_bytes: offset: %d, last_offset: %d",
+ DEBUG_COMM3("offset: %d, last_offset: %d",
serialDevice[LunToReaderIndex(lun)].buffer_offset,
serialDevice[LunToReaderIndex(lun)].buffer_offset_last);
}
@@ -411,7 +411,7 @@
#endif
already_read += rv;
- DEBUG_COMM3("ReadChunk, read: %d, to read: %d", already_read,
+ DEBUG_COMM3("read: %d, to read: %d", already_read,
min_length);
}
@@ -431,7 +431,7 @@
int i;
int reader = LunToReaderIndex(lun);
- DEBUG_COMM3("OpenSerial: Lun: %X, Channel: %d", lun, channel);
+ DEBUG_COMM3("Lun: %X, Channel: %d", lun, channel);
/*
* Conversion of old-style ifd-hanler 1.0 CHANNELID
Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ccid_usb.c 6 Jan 2004 07:21:27 -0000 1.8
+++ ccid_usb.c 15 Jan 2004 08:30:31 -0000 1.9
@@ -102,7 +102,7 @@
int vendorID, productID;
char infofile[FILENAME_MAX];
- DEBUG_COMM3("OpenUSB: Lun: %X, Channel: %X", lun, Channel);
+ DEBUG_COMM3("Lun: %X, Channel: %X", lun, Channel);
if (busses == NULL)
usb_init();
Index: ifdhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ifdhandler.c 12 Dec 2003 09:38:25 -0000 1.6
+++ ifdhandler.c 15 Jan 2004 08:30:31 -0000 1.7
@@ -78,7 +78,7 @@
*/
RESPONSECODE return_value = IFD_SUCCESS;
- DEBUG_INFO2("Entering IFDHCreateChannel (lun: %X)", Lun);
+ DEBUG_INFO2("lun: %X", Lun);
if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR;
@@ -96,7 +96,7 @@
if (OpenPort(Lun, Channel) != STATUS_SUCCESS)
{
- DEBUG_CRITICAL("OpenReader failed");
+ DEBUG_CRITICAL("OpenPort failed");
return_value = IFD_COMMUNICATION_ERROR;
}
@@ -121,7 +121,7 @@
* IFD_SUCCESS IFD_COMMUNICATION_ERROR
*/
- DEBUG_INFO2("entering IFDHCloseChannel (lun: %X)", Lun);
+ DEBUG_INFO2("lun: %X", Lun);
if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR;
@@ -164,7 +164,7 @@
* IFD_SUCCESS IFD_ERROR_TAG
*/
- DEBUG_INFO3("entering IFDHGetCapabilities (lun: %X) tag: %02X", Lun, Tag);
+ DEBUG_INFO3("lun: %X, tag: %02X", Lun, Tag);
if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR;
@@ -241,7 +241,7 @@
/* By default, say it worked */
- DEBUG_PERIODIC2("entering IFDHSetCapabilities (lun: %X)", Lun);
+ DEBUG_PERIODIC2("lun: %X", Lun);
/* if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR; */
@@ -268,7 +268,7 @@
* IFD_PROTOCOL_NOT_SUPPORTED
*/
- DEBUG_INFO2("entering IFDHSetProtocolParameters (lun: %X)", Lun);
+ DEBUG_INFO2("lun: %X", Lun);
/* if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR; */
@@ -320,7 +320,7 @@
RESPONSECODE return_value = IFD_SUCCESS;
unsigned char pcbuffer[RESP_BUF_SIZE];
- DEBUG_INFO2("entering IFDHPowerICC (lun: %X)", Lun);
+ DEBUG_INFO2("lun: %X", Lun);
/* By default, assume it won't work :) */
*AtrLength = 0;
@@ -416,7 +416,7 @@
RESPONSECODE return_value = IFD_SUCCESS; /* Assume it will work */
- DEBUG_INFO2("entering IFDHTransmitToICC (lun: %X)", Lun);
+ DEBUG_INFO2("lun: %X", Lun);
if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR;
@@ -458,7 +458,7 @@
* Notes: RxLength should be zero on error.
*/
- DEBUG_INFO2("entering IFDHControl (lun: %X)", Lun);
+ DEBUG_INFO2("lun: %X", Lun);
/* if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR; */
@@ -484,7 +484,7 @@
unsigned char pcbuffer[SIZE_GET_SLOT_STATUS];
RESPONSECODE return_value = IFD_COMMUNICATION_ERROR;
- DEBUG_PERIODIC2("entering IFDHICCPresence (lun: %X)", Lun);
+ DEBUG_PERIODIC2("lun: %X", Lun);
if (CheckLun(Lun))
return IFD_COMMUNICATION_ERROR;