77 lines
2.8 KiB
Plaintext
77 lines
2.8 KiB
Plaintext
$NetBSD: patch-ab,v 1.2 2012/12/15 00:29:31 pettai Exp $
|
|
|
|
--- src/commands.c.orig 2012-12-11 19:36:05.000000000 +0000
|
|
+++ src/commands.c
|
|
@@ -161,7 +161,7 @@ RESPONSECODE CmdPowerOn(unsigned int rea
|
|
|
|
/* Status Information? */
|
|
if (0x40 == tmp[0])
|
|
- ccid_error(tmp[2], __FILE__, __LINE__, __FUNCTION__);
|
|
+ ccid_error(tmp[2], __FILE__, __LINE__, (const char *) __FUNCTION__);
|
|
return IFD_COMMUNICATION_ERROR;
|
|
}
|
|
|
|
@@ -230,7 +230,7 @@ again:
|
|
|
|
if (buffer[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
|
{
|
|
- ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
|
+ ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
|
|
|
if (0xBB == buffer[ERROR_OFFSET] && /* Protocol error in EMV mode */
|
|
((GEMPC433 == ccid_descriptor->readerID)
|
|
@@ -823,7 +823,7 @@ again:
|
|
|
|
if (cmd_out[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
|
{
|
|
- ccid_error(cmd_out[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
|
+ ccid_error(cmd_out[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
|
return_value = IFD_COMMUNICATION_ERROR;
|
|
}
|
|
|
|
@@ -925,7 +925,7 @@ RESPONSECODE CmdPowerOff(unsigned int re
|
|
|
|
if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
|
{
|
|
- ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
|
+ ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
|
return_value = IFD_COMMUNICATION_ERROR;
|
|
}
|
|
|
|
@@ -1052,7 +1052,7 @@ again_status:
|
|
&& (buffer[ERROR_OFFSET] != 0xFE))
|
|
{
|
|
return_value = IFD_COMMUNICATION_ERROR;
|
|
- ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
|
+ ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
|
}
|
|
|
|
return return_value;
|
|
@@ -1278,7 +1278,7 @@ time_request_ICCD_B:
|
|
|
|
case 0x40:
|
|
/* Status Information */
|
|
- ccid_error(rx_buffer[2], __FILE__, __LINE__, __FUNCTION__);
|
|
+ ccid_error(rx_buffer[2], __FILE__, __LINE__, (const char *) __FUNCTION__);
|
|
return IFD_COMMUNICATION_ERROR;
|
|
|
|
case 0x80:
|
|
@@ -1336,7 +1336,7 @@ time_request:
|
|
|
|
if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
|
{
|
|
- ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
|
+ ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
|
switch (cmd[ERROR_OFFSET])
|
|
{
|
|
case 0xEF: /* cancel */
|
|
@@ -2083,7 +2083,7 @@ RESPONSECODE SetParameters(unsigned int
|
|
|
|
if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
|
|
{
|
|
- ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__); /* bError */
|
|
+ ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__); /* bError */
|
|
if (0x00 == cmd[ERROR_OFFSET]) /* command not supported */
|
|
return IFD_NOT_SUPPORTED;
|
|
else
|