Changeset 2851 for trunk/reader-common.c
- Timestamp:
- 07/26/10 13:08:53 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-common.c
r2837 r2851 214 214 void reader_card_info(struct s_reader * reader) 215 215 { 216 // int rc=-1; 217 if (reader_checkhealth(reader)) 218 //if (rc=reader_checkhealth()) 216 if ((reader->card_status == CARD_NEED_INIT) || (reader->card_status == CARD_INSERTED)) 219 217 { 220 218 client[cs_idx].last=time((time_t)0); … … 317 315 { 318 316 cs_log("card detected"); 319 reader->card_status = CARD_NEED_INIT; 320 //reader->card_status = (reader_reset(reader) ? CARD_INSERTED : CARD_FAILURE); 317 reader->card_status = CARD_NEED_INIT; 321 318 if (!reader_reset(reader)) 322 319 { … … 326 323 else 327 324 { 328 client[cs_idx].au=reader->ridx; 329 if (cfg->cardinitdone) //do not set CARD_INSERTED before chids are read 330 reader->card_status = CARD_INSERTED; 325 client[cs_idx].au = reader->ridx; 331 326 reader_card_info(reader); 332 327 reader->card_status = CARD_INSERTED; … … 346 341 { 347 342 reader_nullcard(reader); 348 client[cs_idx].lastemm =0;349 client[cs_idx].lastecm =0;350 client[cs_idx].au =-1;343 client[cs_idx].lastemm = 0; 344 client[cs_idx].lastecm = 0; 345 client[cs_idx].au = -1; 351 346 extern int io_serial_need_dummy_char; 352 io_serial_need_dummy_char =0;347 io_serial_need_dummy_char = 0; 353 348 cs_log("card ejected slot = %i", reader->slot); 354 349 } 355 reader->card_status =NO_CARD;356 } 357 return reader->card_status ==CARD_INSERTED;350 reader->card_status = NO_CARD; 351 } 352 return reader->card_status == CARD_INSERTED; 358 353 } 359 354
Note:
See TracChangeset
for help on using the changeset viewer.