Changeset 2803
- Timestamp:
- 07/22/10 01:23:39 (14 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/icc_async_exports.h
r1926 r2803 3 3 int ICC_Async_Activate (struct s_reader *reader, ATR * atr, unsigned short deprecated); 4 4 int ICC_Async_GetStatus (struct s_reader *reader, int * card); 5 int ICC_Async_Close (struct s_reader *reader); -
trunk/globals.h
r2802 r2803 1210 1210 extern int pcsc_check_card_inserted(struct s_reader *pcsc_reader); 1211 1211 extern int pcsc_reader_init(struct s_reader *pcsc_reader, char *device); 1212 extern void pcsc_close(struct s_reader *pcsc_reader); 1212 1213 #endif 1213 1214 -
trunk/oscam.c
r2802 r2803 327 327 aes_clear_entries(&reader[ridx]); 328 328 } 329 // close the device 330 reader_device_close(&reader[ridx]); 329 331 break; 330 332 case 's': *log_fd=0; -
trunk/reader-common.c
r2662 r2803 576 576 return (rdr->fd && (rdr->caid[0] == b2i(2,ep->caid) || rdr->typ == R_CCCAM)); 577 577 } 578 579 void reader_device_close(struct s_reader * reader) 580 { 581 #ifdef HAVE_PCSC 582 if (reader->typ == R_PCSC) { 583 pcsc_close(reader); 584 return; 585 } 586 #endif 587 ICC_Async_Close(reader); 588 589 } -
trunk/reader-pcsc.c
r2105 r2803 75 75 cs_debug("PCSC failed establish context (%lx)", rv); 76 76 } 77 77 free(mszReaders); 78 free(readers); 78 79 return 0; 79 80 } … … 230 231 return 0; 231 232 } 233 234 void pcsc_close(struct s_reader *pcsc_reader) 235 { 236 cs_debug_mask (D_IFD, "PSCS : Closing device %s", pcsc_reader->device); 237 SCardDisconnect(pcsc_reader->hCard,SCARD_RESET_CARD); 238 SCardReleaseContext(pcsc_reader->hContext); 239 pcsc_reader->hCard=0; 240 pcsc_reader->pcsc_has_card=0; 241 } 232 242 #endif 233 243
Note:
See TracChangeset
for help on using the changeset viewer.