Changeset 1624

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:

• CMakeLists.txt (modified) (3 diffs)
• csctapi/ifd_phoenix.c (modified) (4 diffs)
• csctapi/ifd_sci.c (modified) (4 diffs)
• module-dvbapi.c (modified) (1 diff)

branches/monitor-improvement/CMakeLists.txt

@@ -340 +340 @@
 endif (OSCamOperatingSystem MATCHES "Linux")
 
+if (WEBIF)
+    add_definitions ("-DWEBIF")
+endif (WEBIF)
+
 #----------------------- put svnversion in the build ------------------------------
 # at every target rebuild, we re-build the oscam.c compilation...
@@ -378 +382 @@
 # some optimisations
 if (OSCamOperatingSystem MATCHES "Mac OS X")
-add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -m32")
+    add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -m32")
 elseif (OSCAM_SYSTEM_NAME MATCHES "NSLU2")
-add_definitions ("-O2 -Winline -Wall -finline-functions -fomit-frame-pointer")
+    add_definitions ("-O2 -Winline -Wall -finline-functions -fomit-frame-pointer")
 else (OSCamOperatingSystem MATCHES "Mac OS X")
-add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer")
+    add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer")
 endif (OSCamOperatingSystem MATCHES "Mac OS X")
 
@@ -473 +477 @@
     message (STATUS "  use system libusb functions")
 endif (HAVE_LIBUSB)
+if (WEBIF)
+    message (STATUS "  Web interface enabled")
+endif (WEBIF)
 message (STATUS "")

branches/monitor-improvement/csctapi/ifd_phoenix.c

@@ -113 +113 @@
     call (Phoenix_SetBaudrate (DEFAULT_BAUDRATE));
         for(i=0; i<3; i++) {
+            cs_sleepms(200); // pause for 200ms as this might help with the PL2303
             IO_Serial_Flush();
             call (IO_Serial_SetParity (parity[i]));
@@ -125 +126 @@
 #endif
                 IO_Serial_RTS_Set();
-            cs_sleepms(50);
+            cs_sleepms(200); // we went form 50 to 200 as this might help with the PL2303
 #ifdef USE_GPIO  //felix: set card reset hi (inactive)
             if (gpio_detect) {
@@ -133 +134 @@
 #endif
                 IO_Serial_RTS_Clr();
+            cs_sleepms(200); // pause for 200ms as this might help with the PL2303
             IO_Serial_Ioctl_Lock(0);
             if(ATR_InitFromStream (atr, ATR_TIMEOUT) == ATR_OK)
@@ -196 +198 @@
         call (tcgetattr (reader[ridx].handle, &tio) != 0);
         call (IO_Serial_SetBitrate (baudrate, &tio));
+        cs_sleepms(200); // pause for 200ms as this might help with the PL2303
         call (IO_Serial_SetProperties(tio));
+        cs_sleepms(200); // pause for 200ms as this might help with the PL2303
     }
     current_baudrate = baudrate; //so if update fails, current_baudrate is not changed either

branches/monitor-improvement/csctapi/ifd_sci.c

@@ -40 +40 @@
     int n = 0;
     SCI_PARAMETERS params;
-#ifdef SH4
-    struct timeval tv, tv_spent;
-    int atr_size = 2, TDi_exists = 0;
-#endif
     
     memset(&params,0,sizeof(SCI_PARAMETERS));
@@ -49 +45 @@
     params.ETU = 372; 
     params.EGT = 3; //not sure why this value is chosen
-#ifdef SH4      
-    params.fs = 9; //not sure why this value is chosen
-#else
     params.fs = 5;
-#endif
     params.T = 0;
     
@@ -59 +51 @@
     call (ioctl(reader[ridx].handle, IOCTL_SET_RESET)<0);
 
-#ifdef SH4
-    gettimeofday(&tv,0);
-    memcpy(&tv_spent,&tv,sizeof(struct timeval));
-
-    while(n<atr_size && (tv_spent.tv_sec-tv.tv_sec)<10)
-        {
-        if(!IO_Serial_Read(ATR_TIMEOUT, 1, buf+n))
-            n++;
-        gettimeofday(&tv_spent,0);
-        if(n==2) // format character
-        {
-            // high nibble = TA1 , TB1 , TC1 , TD1
-            if(buf[n-1] & 0x10)
-                atr_size++;
-            if(buf[n-1] & 0x20)
-                atr_size++;
-            if(buf[n-1] & 0x40)
-                atr_size++;
-            if(buf[n-1] & 0x80)
-            {
-                atr_size++;
-                TDi_exists=atr_size;
-            }
-            atr_size+=(buf[n-1] & 0x0F); // historical bytes
-        }
-        if( (TDi_exists>0) && (n==TDi_exists) )
-        {
-            TDi_exists=0;
-            // high nibble = TA1 , TB1 , TC1 , TD1
-            if(buf[n-1] & 0x10)
-                atr_size++;
-            if(buf[n-1] & 0x20)
-                atr_size++;
-            if(buf[n-1] & 0x40)
-                atr_size++;
-            if(buf[n-1] & 0x80)
-            {
-                atr_size++;
-                TDi_exists=atr_size;
-            }
-        }
-    }           
-#else
     while(n<SCI_MAX_ATR_SIZE && !IO_Serial_Read(ATR_TIMEOUT, 1, buf+n))
     {
@@ -109 +58 @@
     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
         buf[0] = 0x3B;
-#endif
     
     if(n==0) {

branches/monitor-improvement/module-dvbapi.c

@@ -1031 +1031 @@
 
     if (cfg->dvbapi_boxtype[0]==0) {
-        cs_strncpy(cfg->dvbapi_boxtype, "dreambox", sizeof(cfg->dvbapi_boxtype));
+        strncpy(cfg->dvbapi_boxtype, "dreambox", sizeof(cfg->dvbapi_boxtype)-1);
         cs_log("dvbapi: boxtype not set. Assume boxtype=%s.", cfg->dvbapi_boxtype);
     } else