Changeset 814
- Timestamp:
- 12/13/09 02:31:53 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-pcsc.c
r809 r814 69 69 cs_log("PCSC initializing reader (%s)", &pcsc_reader->pcsc_name); 70 70 rv = SCardConnect(pcsc_reader->hContext, &pcsc_reader->pcsc_name, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, &pcsc_reader->hCard, &pcsc_reader->dwActiveProtocol); 71 cs_debug("PCSC initializing result (%lx) protocol (T=%lx)", rv, pcsc_reader->dwActiveProtocol);71 cs_debug("PCSC initializing result (%lx) protocol (T=%lx)", rv, ( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1)); 72 72 if (rv==SCARD_S_SUCCESS) { 73 73 pcsc_reader->pcsc_has_card=1; … … 107 107 rv = SCardTransmit(pcsc_reader->hCard, SCARD_PCI_T1, buf, dwSendLength, &pioRecvPci, cta_res, &dwRecvLength); 108 108 else { 109 cs_debug("PCSC invalid protocol (T=%d)", pcsc_reader->dwActiveProtocol);109 cs_debug("PCSC invalid protocol (T=%d)", ( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1)); 110 110 return ERR_INVALID; 111 111 } … … 114 114 // cs_ddump(cta_res, cta_lr, "received %d bytes from PCSC with rv=%lx", cta_lr, rv); 115 115 116 cs_debug("PCSC doapi (%lx ) (T=%d)", rv, pcsc_reader->dwActiveProtocol);116 cs_debug("PCSC doapi (%lx ) (T=%d)", rv, ( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1) ); 117 117 if ( rv == SCARD_S_SUCCESS ){ 118 118 return OK; … … 136 136 rv = SCardReconnect(pcsc_reader->hCard, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1, SCARD_RESET_CARD, &pcsc_reader->dwActiveProtocol); 137 137 cs_debug("PCSC resetting done on card in (%s)", pcsc_reader->pcsc_name); 138 cs_debug("PCSC Protocol (T=%d)", pcsc_reader->dwActiveProtocol);138 cs_debug("PCSC Protocol (T=%d)",( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1)); 139 139 140 140 if ( rv != SCARD_S_SUCCESS ) { … … 152 152 rv = SCardStatus(pcsc_reader->hCard, NULL, &dwReaderLen, &dwState, &pcsc_reader->dwActiveProtocol, pbAtr, &dwAtrLen); 153 153 if ( rv == SCARD_S_SUCCESS ) { 154 cs_debug("PCSC Protocol (T=%d)", pcsc_reader->dwActiveProtocol);154 cs_debug("PCSC Protocol (T=%d)",( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1)); 155 155 memcpy(atr, pbAtr, dwAtrLen); 156 156 *atr_size=dwAtrLen; … … 214 214 cs_debug("PCSC card in %s removed / absent [dwstate=%lx rv=(%lx)]", pcsc_reader->pcsc_name, dwState, rv ); 215 215 } else { 216 cs_debug("PCSC card inserted FAILURE in %s (%lx) card state (%x) (T=%d)", pcsc_reader->pcsc_name, rv, dwState, pcsc_reader->dwActiveProtocol);216 cs_debug("PCSC card inserted FAILURE in %s (%lx) card state (%x) (T=%d)", pcsc_reader->pcsc_name, rv, dwState, ( pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T0 ? 0 : 1)); 217 217 } 218 218 return 0;
Note:
See TracChangeset
for help on using the changeset viewer.