Changeset 4582 for trunk/reader-dre.c


Ignore:
Timestamp:
Jan 24, 2011, 10:31:03 AM (9 years ago)
Author:
dingo35
Message:

All readers: remove caid array since all readers only support one caid

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/reader-dre.c

    r4356 r4582  
    153153  case 0x11:
    154154    card = "Tricolor Centr";
    155     reader->caid[0] = 0x4ae1;
     155    reader->caid = 0x4ae1;
    156156    break;          //59 type card = MSP (74 type = ATMEL)
    157157  case 0x12:
    158158    card = "Cable TV";
    159     reader->caid[0] = 0x4ae1;   //TODO not sure about this one
     159    reader->caid = 0x4ae1;  //TODO not sure about this one
    160160    break;
    161161  case 0x14:
    162162    card = "Tricolor Syberia / Platforma HD new";
    163     reader->caid[0] = 0x4ae1;
     163    reader->caid = 0x4ae1;
    164164    break;          //59 type card
    165165  case 0x15:
    166166    card = "Platforma HD / DW old";
    167     reader->caid[0] = 0x4ae1;
     167    reader->caid = 0x4ae1;
    168168    break;          //59 type card
    169169  default:
    170170    card = "Unknown";
    171     reader->caid[0] = 0x4ae1;
     171    reader->caid = 0x4ae1;
    172172    break;
    173173  }
     
    226226  //cs_ri_log("[dre-reader] type: DRE Crypt, caid: %04X, serial: %llu, card: v%x",
    227227  cs_ri_log (reader, "[dre-reader] type: DRE Crypt, caid: %04X, serial: %s, dre id: %i%i%i%08i, geocode %i, card: %s v%i.%i",
    228       reader->caid[0], cs_hexdump (0, reader->hexserial + 2, 4), dre_chksum, reader->provider - 16,
     228      reader->caid, cs_hexdump (0, reader->hexserial + 2, 4), dre_chksum, reader->provider - 16,
    229229      major_version + 1, low_dre_id, geocode, card, major_version, minor_version);
    230230  cs_ri_log (reader, "[dre-reader] Provider name:%s.", provname);
     
    249249{
    250250  def_resp;
    251   if (reader->caid[0] == 0x4ae0) {
     251  if (reader->caid == 0x4ae0) {
    252252    uchar ecmcmd41[] = { 0x41,
    253253      0x58, 0x1f, 0x00,     //fixed part, dont change
     
    305305            ep->type = SHARED;
    306306            // FIXME: Seems to be that SA is only used with caid 0x4ae1
    307             if (rdr->caid[0] == 0x4ae1) {
     307            if (rdr->caid == 0x4ae1) {
    308308                memset(ep->hexserial, 0, 8);
    309309                memcpy(ep->hexserial, ep->emm + 3, 4);
     
    337337    filter[38+0+16] = 0xFF;
    338338    // FIXME: Seems to be that SA is only used with caid 0x4ae1
    339     if (rdr->caid[0] == 0x4ae1) {
     339    if (rdr->caid == 0x4ae1) {
    340340        memcpy(filter+38+1, &rdr->sa[0][0], 4);
    341341        memset(filter+38+1+16, 0xFF, 4);
     
    359359  cs_ddump_mask(D_READER, ep->emm, ((ep->emm[1] & 0x0f) << 8) + ep->emm[2] + 3, "EMM:");
    360360
    361   if (reader->caid[0] == 0x4ae1) {
     361  if (reader->caid == 0x4ae1) {
    362362    if(ep->type == UNIQUE && ep->emm[39] == 0x3d)
    363363    { /* For new package activation. */
Note: See TracChangeset for help on using the changeset viewer.