Changeset 1658


Ignore:
Timestamp:
02/23/10 10:16:52 (11 years ago)
Author:
merek
Message:

Backport smargopatch reader setting vom WebIf Branch

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/csctapi/icc_async.c

    r1653 r1658  
    777777           
    778778                // Towitoko does not allow IFSC > 251 //FIXME not sure whether this limitation still exists
    779                 ifsc = MIN (ifsc, MAX_IFSC);
     779                // ifsc = MIN (ifsc, MAX_IFSC);
     780
     781                //FIXME workaround for Smargo until native mode works
     782                if(reader[ridx].smargopatch == 1)
     783                    ifsc = MIN (ifsc, 28);
     784                else
     785                    ifsc = MIN (ifsc, MAX_IFSC);
    780786           
    781787            #ifndef PROTOCOL_T1_USE_DEFAULT_TIMINGS
  • trunk/globals.h

    r1584 r1658  
    421421struct s_reader
    422422{
     423  int       smargopatch; //FIXME workaround for Smargo until native mode works
    423424  int       cs_idx;
    424425  int       enable;
     
    460461  char      * emmfile;
    461462  char      pincode[5];
    462   int       ucpk_valid;
     463  int       ucpk_valid;
    463464  int       logemm;
    464465  int       cachemm;
    465466  int       rewritemm;
    466467  int       card_status;
    467     int       deprecated; //if 0 ATR obeyed, if 1 default speed (9600) is chosen; for devices that cannot switch baudrate
     468  int       deprecated; //if 0 ATR obeyed, if 1 default speed (9600) is chosen; for devices that cannot switch baudrate
    468469  struct    s_module ph;
    469470  uchar     ncd_key[16];
  • trunk/oscam-config.c

    r1623 r1658  
    12441244  if (!strcmp(token, "reconnecttimeout")) {    rdr->tcp_rto = atoi(value);  return; }
    12451245  if (!strcmp(token, "disableserverfilter")) { rdr->ncd_disable_server_filt = atoi(value);  return; }
    1246 
     1246  //FIXME workaround for Smargo until native mode works
     1247  if (!strcmp(token, "smargopatch")) { rdr->smargopatch = atoi(value);  return; }
    12471248  if (!strcmp(token, "label")) { strncpy(rdr->label, value, sizeof(rdr->label)-1); return; }
    12481249  if (!strcmp(token, "fallback")) { rdr->fallback=atoi(value) ? 1 : 0; return; }
Note: See TracChangeset for help on using the changeset viewer.