Changeset 4571 for trunk/module-cccam.c
- Timestamp:
- 01/23/11 10:48:48 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r4569 r4571 681 681 682 682 //check for already pending: 683 if (((struct cc_data*)cl->cc)->extended_mode) {684 int j,found;685 for (found=j=0;j<CS_MAXPENDING;j++) {686 if (i!=j && cl->ecmtask[j].rc == 101 &&687 cl->ecmtask[i].caid==cl->ecmtask[j].caid &&688 cl->ecmtask[i].ecmd5==cl->ecmtask[j].ecmd5) {689 found=1;690 break;691 }692 }693 if (!found)694 n = i;695 }696 else683 //if (((struct cc_data*)cl->cc)->extended_mode) { 684 // int j,found; 685 // for (found=j=0;j<CS_MAXPENDING;j++) { 686 // if (i!=j && cl->ecmtask[j].rc == 101 && 687 // cl->ecmtask[i].caid==cl->ecmtask[j].caid && 688 // cl->ecmtask[i].ecmd5==cl->ecmtask[j].ecmd5) { 689 // found=1; 690 // break; 691 // } 692 // } 693 // if (!found) 694 // n = i; 695 //} 696 //else 697 697 n = i; 698 698 } … … 1073 1073 cs_debug_mask(D_READER, "cccam: ecm trylock: got lock"); 1074 1074 } 1075 do { 1075 1076 cc->ecm_time = cur_time; 1076 1077 rdr->available = cc->extended_mode; … … 1204 1205 set_au_data(cl, rdr, card, cur_er); 1205 1206 pthread_mutex_unlock(&cc->cards_busy); 1207 1208 if (cc->extended_mode) 1209 continue; //process next pending ecm! 1206 1210 return 0; 1207 1211 } else { … … 1237 1241 } 1238 1242 pthread_mutex_unlock(&cc->cards_busy); 1243 1244 //process next pending ecm! 1245 } while (cc->extended_mode); 1246 1239 1247 if (!cc->extended_mode) { 1240 1248 rdr->available = 1; 1241 1249 pthread_mutex_unlock(&cc->ecm_busy); 1242 1250 } 1251 1243 1252 return -1; 1244 1253 } … … 2518 2527 } else if ((buf[1] == (MSG_CW_NOK1)) || (buf[1] == (MSG_CW_NOK2))) { 2519 2528 *rc = 0; 2520 return (cc->recv_ecmtask); 2529 if (cc->is_oscam_cccam) 2530 return (cc->recv_ecmtask); 2531 else 2532 return -1; 2521 2533 } 2522 2534
Note:
See TracChangeset
for help on using the changeset viewer.