Changeset 3855 for trunk/csctapi
- Timestamp:
- 11/08/10 20:56:14 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/ifd_pcsc.c
r3816 r3855 90 90 int pcsc_reader_do_api(struct s_reader *pcsc_reader, const uchar *buf, uchar *cta_res, ushort *cta_lr, int l) 91 91 { 92 ULONG rv;92 LONG rv; 93 93 SCARD_IO_REQUEST pioRecvPci; 94 94 DWORD dwSendLength, dwRecvLength; … … 100 100 101 101 dwRecvLength = CTA_RES_LEN; 102 *cta_lr = 0; 102 103 103 104 if(pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0) { … … 116 117 cs_debug("sending %d bytes to PCSC", dwSendLength); 117 118 rv = SCardTransmit((SCARDHANDLE)(pcsc_reader->hCard), SCARD_PCI_T0, (LPCBYTE) buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, (LPDWORD) &dwRecvLength); 119 *cta_lr=dwRecvLength; 118 120 } 119 121 else if(pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T1) { … … 121 123 cs_debug("sending %d bytes to PCSC", dwSendLength); 122 124 rv = SCardTransmit((SCARDHANDLE)(pcsc_reader->hCard), SCARD_PCI_T1, (LPCBYTE) buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, (LPDWORD) &dwRecvLength); 125 *cta_lr=dwRecvLength; 123 126 } 124 127 else { … … 127 130 } 128 131 129 *cta_lr=dwRecvLength;130 132 cs_debug("received %d bytes from PCSC with rv=%lx", *cta_lr, rv); 131 132 cs_debug("PCSC doapi (%lx ) (T=%d), %d", rv, ( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1), dwRecvLength ); 133 cs_debug("PCSC doapi (%lx ) (T=%d), %d", rv, ( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1), *cta_lr ); 134 133 135 if ( rv == SCARD_S_SUCCESS ){ 134 136 return OK; … … 142 144 int pcsc_activate_card(struct s_reader *pcsc_reader, uchar *atr, ushort *atr_size) 143 145 { 144 ULONG rv;146 LONG rv; 145 147 DWORD dwState, dwAtrLen, dwReaderLen; 146 148 BYTE pbAtr[64]; … … 184 186 DWORD dwState, dwAtrLen, dwReaderLen; 185 187 BYTE pbAtr[64]; 186 ULONG rv;188 LONG rv; 187 189 188 190 dwAtrLen = sizeof(pbAtr); … … 241 243 void pcsc_close(struct s_reader *pcsc_reader) 242 244 { 243 245 cs_debug_mask (D_IFD, "PCSC : Closing device %s", pcsc_reader->device); 244 246 SCardDisconnect((SCARDHANDLE)(pcsc_reader->hCard),SCARD_RESET_CARD); 245 247 SCardReleaseContext(pcsc_reader->hContext);
Note:
See TracChangeset
for help on using the changeset viewer.