Changeset 1989


Ignore:
Timestamp:
04/07/10 08:26:30 (12 years ago)
Author:
alno
Message:

CMD05 - transmit the block commands negated hope thats compatible now with camd3 server. Removed transmission of cardsystem in CMD05. Please test with camd3 server

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/module-camd35.c

    r1985 r1989  
    193193        }
    194194        //we think client/server protocols should deliver all information, and only readers should discard EMM
    195         mbuf[128] = reader[au].blockemm_g;
    196         mbuf[129] = reader[au].blockemm_s;
    197         mbuf[130] = reader[au].blockemm_u;
    198         mbuf[131] = reader[au].card_system; //Cardsystem for Oscam client
     195        mbuf[128] = (reader[au].blockemm_g == 1) ? 0: 1;
     196        mbuf[129] = (reader[au].blockemm_s == 1) ? 0: 1;
     197        mbuf[130] = (reader[au].blockemm_u == 1) ? 0: 1;
     198        //mbuf[131] = reader[au].card_system; //Cardsystem for Oscam client
    199199    }
    200200    else        // disable emm
     
    490490
    491491    // reading CMD05 Emm request and set serial
    492     if ((buf[0] == 0x05) && !(buf[131]==0xff)) {
     492    if (buf[0] == 0x05) {
    493493
    494494        reader[ridx].nprov = 0; //reset if number changes on reader change
     
    514514        reader[ridx].hexserial[7] = 0;
    515515
    516         reader[ridx].blockemm_g = buf[128];
    517         reader[ridx].blockemm_s = buf[129];
    518         reader[ridx].blockemm_u = buf[130];
    519         reader[ridx].card_system = buf[131];
     516        reader[ridx].blockemm_g = (buf[128]==1) ? 0: 1;
     517        reader[ridx].blockemm_s = (buf[129]==1) ? 0: 1;
     518        reader[ridx].blockemm_u = (buf[130]==1) ? 0: 1;
     519        reader[ridx].card_system = get_cardsystem(reader[ridx].aucaid);
    520520        cs_log("CMD05 reader: %s serial: %s cardsyst: %d aucaid: %04X",
    521521                reader[ridx].label,
Note: See TracChangeset for help on using the changeset viewer.