- Timestamp:
- 05/05/10 15:52:37 (14 years ago)
- Location:
- branches/modular
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/modular/module-cccam.c
r2201 r2204 313 313 cs_log("cccam: server not init! ccinit=%d pfd=%d", cc?1:0, pfd); 314 314 write_ecm_answer(&reader[ridx], fd_c2m, er); 315 cc_cycle_connection();315 //cc_cycle_connection(); 316 316 } 317 317 return -1; … … 329 329 // SS: ecm_busy removed! 330 330 // pthread_mutex_unlock(&cc->ecm_busy); 331 cs_log("no ecm pending!"); 331 332 return 0; // no queued ecms 332 333 } … … 879 880 cs_log("cccam: cw nok (%d), sid = %x", buf[1], cc->cur_sid); 880 881 881 if (cc->cur_card && cc->cur_sid) {882 if (cc->cur_card) { 882 883 int f = 0; 883 884 LLIST_ITR itr; … … 901 902 memset(cc->dcw, 0, 16); 902 903 cc->cur_card = NULL; 903 904 cc_send_ecm(NULL, NULL); 904 905 int n; 906 if ((n = cc_get_nxt_ecm()) >= 0) { 907 ecmtask[n].rc = 100; 908 cs_log("retrying ecm..."); 909 cc_send_ecm(NULL, NULL); 910 } 905 911 } 906 912 //if (cc->found) … … 938 944 // pthread_mutex_unlock(&cc->ecm_busy); 939 945 //cc_abort_user_ecms(); 940 cc_send_ecm(NULL, NULL);946 //cc_send_ecm(NULL, NULL); 941 947 942 948 if (cc->max_ecms) -
branches/modular/reader-common.c
r2179 r2204 220 220 if (cardsystem[i].card_init) { 221 221 if (cardsystem[i].card_init(reader, atr)) { 222 reader [ridx].card_system=i+1;222 reader->card_system=i+1; 223 223 cs_log("found cardsystem"); 224 224 break;
Note:
See TracChangeset
for help on using the changeset viewer.