Changeset 1624


Ignore:
Timestamp:
02/20/10 00:49:38 (11 years ago)
Author:
alno
Message:

WebIf:

  • Merging revisions 1619-1623 of trunk (ump?)
Location:
branches/monitor-improvement
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/CMakeLists.txt

    r1613 r1624  
    340340endif (OSCamOperatingSystem MATCHES "Linux")
    341341
     342if (WEBIF)
     343    add_definitions ("-DWEBIF")
     344endif (WEBIF)
     345
    342346#----------------------- put svnversion in the build ------------------------------
    343347# at every target rebuild, we re-build the oscam.c compilation...
     
    378382# some optimisations
    379383if (OSCamOperatingSystem MATCHES "Mac OS X")
    380 add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -m32")
     384    add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -m32")
    381385elseif (OSCAM_SYSTEM_NAME MATCHES "NSLU2")
    382 add_definitions ("-O2 -Winline -Wall -finline-functions -fomit-frame-pointer")
     386    add_definitions ("-O2 -Winline -Wall -finline-functions -fomit-frame-pointer")
    383387else (OSCamOperatingSystem MATCHES "Mac OS X")
    384 add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer")
     388    add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer")
    385389endif (OSCamOperatingSystem MATCHES "Mac OS X")
    386390
     
    473477    message (STATUS "  use system libusb functions")
    474478endif (HAVE_LIBUSB)
     479if (WEBIF)
     480    message (STATUS "  Web interface enabled")
     481endif (WEBIF)
    475482message (STATUS "")
  • branches/monitor-improvement/csctapi/ifd_phoenix.c

    r1587 r1624  
    113113    call (Phoenix_SetBaudrate (DEFAULT_BAUDRATE));
    114114        for(i=0; i<3; i++) {
     115            cs_sleepms(200); // pause for 200ms as this might help with the PL2303
    115116            IO_Serial_Flush();
    116117            call (IO_Serial_SetParity (parity[i]));
     
    125126#endif
    126127                IO_Serial_RTS_Set();
    127             cs_sleepms(50);
     128            cs_sleepms(200); // we went form 50 to 200 as this might help with the PL2303
    128129#ifdef USE_GPIO  //felix: set card reset hi (inactive)
    129130            if (gpio_detect) {
     
    133134#endif
    134135                IO_Serial_RTS_Clr();
     136            cs_sleepms(200); // pause for 200ms as this might help with the PL2303
    135137            IO_Serial_Ioctl_Lock(0);
    136138            if(ATR_InitFromStream (atr, ATR_TIMEOUT) == ATR_OK)
     
    196198        call (tcgetattr (reader[ridx].handle, &tio) != 0);
    197199        call (IO_Serial_SetBitrate (baudrate, &tio));
     200        cs_sleepms(200); // pause for 200ms as this might help with the PL2303
    198201        call (IO_Serial_SetProperties(tio));
     202        cs_sleepms(200); // pause for 200ms as this might help with the PL2303
    199203    }
    200204    current_baudrate = baudrate; //so if update fails, current_baudrate is not changed either
  • branches/monitor-improvement/csctapi/ifd_sci.c

    r1587 r1624  
    4040    int n = 0;
    4141    SCI_PARAMETERS params;
    42 #ifdef SH4
    43     struct timeval tv, tv_spent;
    44     int atr_size = 2, TDi_exists = 0;
    45 #endif
    4642   
    4743    memset(&params,0,sizeof(SCI_PARAMETERS));
     
    4945    params.ETU = 372;
    5046    params.EGT = 3; //not sure why this value is chosen
    51 #ifdef SH4     
    52     params.fs = 9; //not sure why this value is chosen
    53 #else
    5447    params.fs = 5;
    55 #endif
    5648    params.T = 0;
    5749   
     
    5951    call (ioctl(reader[ridx].handle, IOCTL_SET_RESET)<0);
    6052
    61 #ifdef SH4
    62     gettimeofday(&tv,0);
    63     memcpy(&tv_spent,&tv,sizeof(struct timeval));
    64 
    65     while(n<atr_size && (tv_spent.tv_sec-tv.tv_sec)<10)
    66         {
    67         if(!IO_Serial_Read(ATR_TIMEOUT, 1, buf+n))
    68             n++;
    69         gettimeofday(&tv_spent,0);
    70         if(n==2) // format character
    71         {
    72             // high nibble = TA1 , TB1 , TC1 , TD1
    73             if(buf[n-1] & 0x10)
    74                 atr_size++;
    75             if(buf[n-1] & 0x20)
    76                 atr_size++;
    77             if(buf[n-1] & 0x40)
    78                 atr_size++;
    79             if(buf[n-1] & 0x80)
    80             {
    81                 atr_size++;
    82                 TDi_exists=atr_size;
    83             }
    84             atr_size+=(buf[n-1] & 0x0F); // historical bytes
    85         }
    86         if( (TDi_exists>0) && (n==TDi_exists) )
    87         {
    88             TDi_exists=0;
    89             // high nibble = TA1 , TB1 , TC1 , TD1
    90             if(buf[n-1] & 0x10)
    91                 atr_size++;
    92             if(buf[n-1] & 0x20)
    93                 atr_size++;
    94             if(buf[n-1] & 0x40)
    95                 atr_size++;
    96             if(buf[n-1] & 0x80)
    97             {
    98                 atr_size++;
    99                 TDi_exists=atr_size;
    100             }
    101         }
    102     }           
    103 #else
    10453    while(n<SCI_MAX_ATR_SIZE && !IO_Serial_Read(ATR_TIMEOUT, 1, buf+n))
    10554    {
     
    10958    if ((buf[0] !=0x3B) && (buf[0] != 0x3F) && (n>9 && !memcmp(buf+4, "IRDETO", 6))) //irdeto S02 reports FD as first byte on dreambox SCI, not sure about SH4 or phoenix
    11059        buf[0] = 0x3B;
    111 #endif
    11260   
    11361    if(n==0) {
  • branches/monitor-improvement/module-dvbapi.c

    r1619 r1624  
    10311031
    10321032    if (cfg->dvbapi_boxtype[0]==0) {
    1033         cs_strncpy(cfg->dvbapi_boxtype, "dreambox", sizeof(cfg->dvbapi_boxtype));
     1033        strncpy(cfg->dvbapi_boxtype, "dreambox", sizeof(cfg->dvbapi_boxtype)-1);
    10341034        cs_log("dvbapi: boxtype not set. Assume boxtype=%s.", cfg->dvbapi_boxtype);
    10351035    } else
Note: See TracChangeset for help on using the changeset viewer.