Changeset 1687


Ignore:
Timestamp:
02/25/10 13:24:27 (11 years ago)
Author:
merek
Message:

Add some more Ifdefs for GBOX

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/oscam-reader.c

    r1584 r1687  
    465465  fd_set fds;
    466466  struct timeval tv;
    467  
    468   if(reader[ridx].typ==R_GBOX){
     467
     468#ifdef CS_WITH_GBOX
     469  if(reader[ridx].typ==R_GBOX) {
    469470    struct timeb tpe;
    470   int x;
    471   ulong ms;
    472   cs_ftime(&tpe);
    473   for(x=0;x<CS_MAXPENDING;x++){
    474     ms=1000*(tpe.time-ecmtask[x].tps.time)+tpe.millitm-ecmtask[x].tps.millitm;
    475     if(ecmtask[x].rc == 10 && ms > cfg->ctimeout && ridx == ecmtask[x].gbxRidx){
    476       //cs_log("hello rc=%d idx:%d x:%d ridx%d ridx:%d",ecmtask[x].rc,ecmtask[x].idx,x,ridx,ecmtask[x].gbxRidx);
    477       ecmtask[x].rc=5;
    478       send_dcw(&ecmtask[x]);
    479 
    480     }
    481   }
    482   }
     471    int x;
     472    ulong ms;
     473    cs_ftime(&tpe);
     474    for(x=0;x<CS_MAXPENDING;x++){
     475      ms=1000*(tpe.time-ecmtask[x].tps.time)+tpe.millitm-ecmtask[x].tps.millitm;
     476      if(ecmtask[x].rc == 10 && ms > cfg->ctimeout && ridx == ecmtask[x].gbxRidx) {
     477        //cs_log("hello rc=%d idx:%d x:%d ridx%d ridx:%d",ecmtask[x].rc,ecmtask[x].idx,x,ridx,ecmtask[x].gbxRidx);
     478        ecmtask[x].rc=5;
     479        send_dcw(&ecmtask[x]);
     480      }
     481    }
     482  }
     483#endif
    483484 
    484485  if (master_pid!=getppid()) cs_exit(0);
  • trunk/oscam.c

    r1631 r1687  
    15811581  if (er->rc==0)
    15821582  {
     1583#ifdef CS_WITH_GBOX
    15831584    if(reader[er->reader[0]].typ==R_GBOX)
    15841585      snprintf(sby, sizeof(sby)-1, " by %s(%04X)", reader[er->reader[0]].label,er->gbxCWFrom);
    15851586    else
     1587#endif
    15861588      snprintf(sby, sizeof(sby)-1, " by %s", reader[er->reader[0]].label);
    15871589  }
Note: See TracChangeset for help on using the changeset viewer.