Changeset 1774


Ignore:
Timestamp:
Mar 4, 2010, 10:12:04 PM (10 years ago)
Author:
merek
Message:

Merge from UMP r1836

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/reader-common.c

    r1766 r1774  
    382382    switch(rdr->card_system) {
    383383    case SC_NAGRA:
    384       rc=nagra2_get_emm_type(ep); break;
     384      rc=nagra2_get_emm_type(ep, rdr); break;
    385385    case SC_IRDETO:
    386       rc=irdeto_get_emm_type(ep); break;
     386      rc=irdeto_get_emm_type(ep, rdr); break;
    387387    case SC_CRYPTOWORKS:
    388       rc=cryptoworks_get_emm_type(ep); break;
     388      rc=cryptoworks_get_emm_type(ep, rdr); break;
    389389    case SC_VIACCESS:
    390       rc=viaccess_get_emm_type(ep); break;
     390      rc=viaccess_get_emm_type(ep, rdr); break;
    391391    case SC_CONAX:
    392       rc=conax_get_emm_type(ep); break;
     392      rc=conax_get_emm_type(ep, rdr); break;
    393393    case SC_SECA:
    394394      rc=seca_get_emm_type(ep, rdr); break;
    395395    case SC_VIDEOGUARD2:
    396       rc=videoguard_get_emm_type(ep); break;
     396      rc=videoguard_get_emm_type(ep, rdr); break;
    397397    case SC_DRE:
    398       rc=dre_get_emm_type(ep); break;
     398      rc=dre_get_emm_type(ep, rdr); break;
    399399    default:
    400400      rc=0;
  • trunk/reader-common.h

    r1766 r1774  
    1616int irdeto_do_ecm(ECM_REQUEST *);
    1717int irdeto_do_emm(EMM_PACKET *);
    18 int irdeto_get_emm_type(EMM_PACKET *);
     18int irdeto_get_emm_type(EMM_PACKET *, struct s_reader *);
    1919int irdeto_card_info(void);
    2020
     
    2323int viaccess_do_ecm(ECM_REQUEST *);
    2424int viaccess_do_emm(EMM_PACKET *);
    25 int viaccess_get_emm_type(EMM_PACKET *);
     25int viaccess_get_emm_type(EMM_PACKET *, struct s_reader *);
    2626int viaccess_card_info(void);
    2727
     
    3030int videoguard_do_ecm(ECM_REQUEST *);
    3131int videoguard_do_emm(EMM_PACKET *);
    32 int videoguard_get_emm_type(EMM_PACKET *);
     32int videoguard_get_emm_type(EMM_PACKET *, struct s_reader *);
    3333int videoguard_card_info(void);
    3434
     
    3737int cryptoworks_do_ecm(ECM_REQUEST *);
    3838int cryptoworks_do_emm(EMM_PACKET *);
    39 int cryptoworks_get_emm_type(EMM_PACKET *);
     39int cryptoworks_get_emm_type(EMM_PACKET *, struct s_reader *);
    4040int cryptoworks_card_info(void);
    4141int CheckSctLen(const uchar *, int);
     
    4545int seca_do_ecm(ECM_REQUEST *);
    4646int seca_do_emm(EMM_PACKET *);
    47 //FIXME int seca_get_emm_type(EMM_PACKET *);
    4847int seca_get_emm_type(EMM_PACKET *, struct s_reader *);
    4948int seca_card_info(void);
     
    5352int nds_do_ecm(ECM_REQUEST *);
    5453int nds_do_emm(EMM_PACKET *);
    55 int nds_get_emm_type(EMM_PACKET *);
     54int nds_get_emm_type(EMM_PACKET *, struct s_reader *);
    5655int nds_card_info(void);
    5756
     
    6160int nagra2_card_info(void);
    6261int nagra2_do_emm(EMM_PACKET *);
    63 int nagra2_get_emm_type(EMM_PACKET *);
     62int nagra2_get_emm_type(EMM_PACKET *, struct s_reader *);
    6463void nagra2_post_process();
    6564 
     
    6867int conax_do_ecm(ECM_REQUEST *);
    6968int conax_do_emm(EMM_PACKET *);
    70 int conax_get_emm_type(EMM_PACKET *);
     69int conax_get_emm_type(EMM_PACKET *, struct s_reader *);
    7170int conax_card_info(void);
    7271 
     
    7574int dre_do_ecm(ECM_REQUEST *);
    7675int dre_do_emm(EMM_PACKET *);
    77 int dre_get_emm_type(EMM_PACKET *);
     76int dre_get_emm_type(EMM_PACKET *, struct s_reader *);
    7877int dre_card_info(void);
    7978
  • trunk/reader-conax.c

    r1766 r1774  
    204204}
    205205
    206 int conax_get_emm_type(EMM_PACKET *ep) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
     206int conax_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
    207207{
    208208    ep->type=ep->emm[2]+3; //FIXME not sure how this maps onto global, unique and shared!
  • trunk/reader-cryptoworks.c

    r1766 r1774  
    457457}
    458458
    459 int cryptoworks_get_emm_type(EMM_PACKET *ep) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
     459int cryptoworks_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
    460460{
    461461  switch (ep->emm[0]) {
  • trunk/reader-dre.c

    r1766 r1774  
    302302}
    303303
    304 int dre_get_emm_type(EMM_PACKET *ep)
     304int dre_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr)
    305305{
    306306  switch (ep->emm[0]) {
  • trunk/reader-irdeto.c

    r1766 r1774  
    366366}
    367367
    368 int irdeto_get_emm_type(EMM_PACKET *ep) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
     368int irdeto_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
    369369{
    370370  int i, l=(ep->emm[3]&0x07), ok=0;
     
    374374        memset(ep->hexserial,0,8);
    375375        memcpy(ep->hexserial, ep->emm + 4, l);
    376     return (mode==reader[ridx].hexserial[3] &&
    377        (!l || !memcmp(ep->emm+4, reader[ridx].hexserial, l)));
     376    return (mode==rdr->hexserial[3] &&
     377       (!l || !memcmp(ep->emm+4, rdr->hexserial, l)));
    378378  }
    379379  else {                // Provider addressed
    380380        ep->type = SHARED;
    381     for(i=0; i<reader[ridx].nprov; i++) {
    382       ok=(mode==reader[ridx].prid[i][0] &&
    383          (!l || !memcmp(ep->emm+4, &reader[ridx].prid[i][1], l)));
     381    for(i=0; i<rdr->nprov; i++) {
     382      ok=(mode==rdr->prid[i][0] &&
     383         (!l || !memcmp(ep->emm+4, &rdr->prid[i][1], l)));
    384384      if (ok) break;
    385385    }
  • trunk/reader-nagra.c

    r1771 r1774  
    719719}
    720720
    721 int nagra2_get_emm_type(EMM_PACKET *ep) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
     721int nagra2_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
    722722{
    723723  switch (ep->emm[0]) {
     
    732732            else
    733733                ep->type = UNIQUE;
    734             return (!memcmp (reader[ridx].hexserial, ep->hexserial, 4));
     734            return (!memcmp (rdr->hexserial, ep->hexserial, 4));
    735735        case 0x82:
    736736            ep->type = GLOBAL;
  • trunk/reader-viaccess.c

    r1766 r1774  
    355355}
    356356
    357 int viaccess_get_emm_type(EMM_PACKET *ep) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
     357int viaccess_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
    358358{
    359359    ep->type=UNKNOWN; //FIXME not sure how this maps onto global, unique and shared!
  • trunk/reader-videoguard2.c

    r1766 r1774  
    943943}
    944944
    945 int videoguard_get_emm_type(EMM_PACKET *ep) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
     945int videoguard_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
    946946{
    947947    ep->type=UNKNOWN; //FIXME not sure how this maps onto global, unique and shared!
Note: See TracChangeset for help on using the changeset viewer.