fixed problems for workaround of pcscd bug 312749

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@314 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-10-10 16:20:09 +00:00
parent 04f2ee8020
commit 938d09730b

View File

@@ -2,7 +2,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
/* XXX see bug #312749 on https://alioth.debian.org/projects/pcsclite/ */
/*#define IFDHANDLERv2*/
#include <ifdhandler.h> #include <ifdhandler.h>
#include <debuglog.h> #include <debuglog.h>
#include "vpcd.h" #include "vpcd.h"
@@ -19,14 +23,37 @@ IFDHCreateChannel (DWORD Lun, DWORD Channel)
return IFD_SUCCESS; return IFD_SUCCESS;
} }
/* XXX see bug #312749 on https://alioth.debian.org/projects/pcsclite/ */ #ifndef IFDHANDLERv2
#if 0
RESPONSECODE RESPONSECODE
IFDHCreateChannelByName (DWORD Lun, LPSTR DeviceName) IFDHCreateChannelByName (DWORD Lun, LPSTR DeviceName)
{ {
Log3(PCSC_LOG_INFO, "Not opening %s. Using default port %hu", DeviceName, VPCDPORT); Log3(PCSC_LOG_INFO, "Not opening %s. Using default port %hu", DeviceName, VPCDPORT);
return IFDHCreateChannel (Lun, VPCDPORT); return IFDHCreateChannel (Lun, VPCDPORT);
} }
RESPONSECODE
IFDHControl (DWORD Lun, DWORD dwControlCode, PUCHAR TxBuffer, DWORD TxLength,
PUCHAR RxBuffer, DWORD RxLength, LPDWORD pdwBytesReturned)
{
Log9(PCSC_LOG_DEBUG, "IFDHControl not supported (Lun=%u ControlCode=%u TxBuffer=%p TxLength=%u RxBuffer=%p RxLength=%u pBytesReturned=%p)%s",
(unsigned int) Lun, (unsigned int) dwControlCode,
(unsigned char *) TxBuffer, (unsigned int) TxLength,
(unsigned char *) RxBuffer, (unsigned int) RxLength,
(unsigned int *) pdwBytesReturned, "");
return IFD_ERROR_NOT_SUPPORTED;
}
#else
RESPONSECODE
IFDHControl(DWORD Lun, PUCHAR TxBuffer, DWORD TxLength, PUCHAR RxBuffer,
PDWORD RxLength)
{
Log9(PCSC_LOG_DEBUG, "IFDHControl not supported (Lun=%u%s TxBuffer=%p TxLength=%u RxBuffer=%p RxLength=%u%s)%s",
(unsigned int) Lun, "",
(unsigned char *) TxBuffer, (unsigned int) TxLength,
(unsigned char *) RxBuffer, (unsigned int) RxLength,
"", "");
return IFD_ERROR_NOT_SUPPORTED;
}
#endif #endif
RESPONSECODE RESPONSECODE
@@ -188,15 +215,3 @@ IFDHICCPresence (DWORD Lun)
return IFD_COMMUNICATION_ERROR; return IFD_COMMUNICATION_ERROR;
} }
} }
RESPONSECODE
IFDHControl (DWORD Lun, DWORD dwControlCode, PUCHAR TxBuffer, DWORD TxLength,
PUCHAR RxBuffer, DWORD RxLength, LPDWORD pdwBytesReturned)
{
Log9(PCSC_LOG_DEBUG, "IFDHControl not supported (Lun=%u ControlCode=%u TxBuffer=%p TxLength=%u RxBuffer=%p RxLength=%u pBytesReturned=%p)%s",
(unsigned int) Lun, (unsigned int) dwControlCode,
(unsigned char *) TxBuffer, (unsigned int) TxLength,
(unsigned char *) RxBuffer, (unsigned int) RxLength,
(unsigned int *) pdwBytesReturned, "");
return IFD_ERROR_NOT_SUPPORTED;
}