Changeset 7695
- Timestamp:
- 10/12/12 11:18:50 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-common.c
r7692 r7695 327 327 } 328 328 } else { 329 rdr_debug_mask(reader, D_TRACE, "%s: !reader_card_inserted", __func__); 329 330 if (reader->card_status == CARD_INSERTED || reader->card_status == CARD_NEED_INIT) { 330 331 rdr_log(reader, "card ejected"); … … 338 339 reader->card_status = NO_CARD; 339 340 } 341 rdr_debug_mask(reader, D_TRACE, "%s: reader->card_status = %d, ret = %d", __func__, 342 reader->card_status, reader->card_status == CARD_INSERTED); 340 343 return reader->card_status == CARD_INSERTED; 341 344 } … … 404 407 int32_t rc=-1; 405 408 if( (rc=cardreader_do_checkhealth(reader)) ) { 409 rdr_debug_mask(reader, D_TRACE, "%s: cardreader_do_checkhealth returned rc=%d", __func__, rc); 406 410 struct s_client *cl = reader->client; 407 411 if (cl) { … … 411 415 } 412 416 413 if (reader->csystem.active && reader->csystem.do_ecm) 417 if (reader->csystem.active && reader->csystem.do_ecm) { 414 418 rc=reader->csystem.do_ecm(reader, er, ea); 415 else 419 rdr_debug_mask(reader, D_TRACE, "%s: after csystem.do_ecm rc=%d", __func__, rc); 420 } else 416 421 rc=0; 417 422 } 423 rdr_debug_mask(reader, D_TRACE, "%s: ret rc=%d", __func__, rc); 418 424 return(rc); 419 425 } … … 450 456 451 457 int32_t rc = cardreader_do_ecm(reader, er, &ea); 452 rdr_debug_mask(reader, D_TRACE, "%s: cardreader_do_ecm returned rc=%d (ERROR=%d)", __func__, ea.rc, ERROR);458 rdr_debug_mask(reader, D_TRACE, "%s: cardreader_do_ecm returned rc=%d (ERROR=%d)", __func__, rc, ERROR); 453 459 454 460 ea.rc = E_FOUND; //default assume found
Note:
See TracChangeset
for help on using the changeset viewer.