Changeset 41099

Timestamp:

11/02/17 20:25:14 (6 years ago)

Author:

andyjetset

Message:

delete frontend.h Version 41098 and add Version 41075

File:

• titan/titan/frontenddev.h (modified) (14 diffs)

titan/titan/frontenddev.h

@@ -311 +311 @@
         else
                 dvbnode = dvbdev;
-
 
         //suche tuner der die gewuenschte orbitalpos kann und nicht belegt ist
@@ -407 +406 @@
                                                 return dvbnode;
                                         }
-                                        
-                                        found = 0;
-                                        while(CharPtrTmp[found] != NULL)
+                                        if(tmpdvbnode != NULL)
                                         {
-                                                CharPtrTmp[found]->feaktband = band;
-                                                CharPtrTmp[found]->feaktpolarization = tpnode->polarization;
-                                                found = found + 1;
+                                                tmpdvbnode->feaktband = band;
+                                                tmpdvbnode->feaktpolarization = tpnode->polarization;
                                         }
-                                        //if(tmpdvbnode != NULL)
-                                        //{
-                                        //      tmpdvbnode->feaktband = band;
-                                        //      tmpdvbnode->feaktpolarization = tpnode->polarization;
-                                        //}
                                         dvbnode->felasttransponder = dvbnode->feakttransponder;
                                         dvbnode->feakttransponder = tpnode;
@@ -562 +553 @@
                                                 return dvbnode;
                                         }
-                                        found = 0;
-                                        while(CharPtrTmp[found] != NULL)
+                                        if(tmpdvbnode != NULL)
                                         {
-                                                CharPtrTmp[found]->feaktband = band;
-                                                CharPtrTmp[found]->feaktpolarization = tpnode->polarization;
-                                                found = found + 1;
+                                                tmpdvbnode->feaktband = band;
+                                                tmpdvbnode->feaktpolarization = tpnode->polarization;
                                         }
-                                        //if(tmpdvbnode != NULL)
-                                        //{
-                                        //      tmpdvbnode->feaktband = band;
-                                        //      tmpdvbnode->feaktpolarization = tpnode->polarization;
-                                        //}
                                         dvbnode->felasttransponder = dvbnode->feakttransponder;
                                         dvbnode->feakttransponder = tpnode;
@@ -711 +695 @@
                         return 0;
                 }
-                if(node != NULL && ostrstr(node->feinfo->name, "BCM45208") != NULL)
-                {
-                        if(status & FE_TIMEDOUT)
-                        {
-                                debug(200, "wait for tuner end with FE_TIMEDOUT");
-                                return 1;
-                        }
-                }
                 usleep(1000);
         }
         debug(200, "wait for tuner end");
+
         //if(ev.status & FE_HAS_LOCK)
         //      return 0;
@@ -1398 +1375 @@
 //#ifdef ARM
 //#ifdef MIPSEL
-#if DVB_API_VERSION >= 5
-//#if DVB_API_VERSION > 5 || DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 10
-
-        int test1 = 0;
-        int test2 = 0;
+#if DVB_API_VERSION > 5 || DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 10
+
         struct dtv_property prop[1];
         prop[0].cmd = DTV_STAT_CNR;
@@ -1417 +1391 @@
                 for(unsigned int i=0; i<prop[0].u.st.len; i++)
                 {
-                        if (prop[0].u.st.stat[i].scale == FE_SCALE_DECIBEL && test1 == 0)
-                        {
-                                test1 = 1;
+                        if (prop[0].u.st.stat[i].scale == FE_SCALE_DECIBEL)
                                 signalqualitydb = prop[0].u.st.stat[i].svalue / 10;
-                                printf("***** new snr signalqualitydb:%d\n", signalqualitydb);
-                        }
-                        else if (prop[0].u.st.stat[i].scale == FE_SCALE_RELATIVE && test2 == 0)
-                        {
-                                test2 = 1;
+                        else if (prop[0].u.st.stat[i].scale == FE_SCALE_RELATIVE)
                                 signalquality = prop[0].u.st.stat[i].svalue;
-                                printf("***** new snr signalquality:%d\n", signalquality);
-                        }
                 }
         }
@@ -1441 +1407 @@
                 
                 ioctl(node->fd, FE_READ_SNR, &snr);
-                
-                printf("***** old snr signalquality\n");                
-                
+                                
                 if(ostrstr(node->feinfo->name, "Si2166B") != NULL)
                 {
@@ -1452 +1416 @@
                         ret = snr*10;
                 }
-                else if(ostrstr(node->feinfo->name, "BCM4506") != NULL || ostrstr(node->feinfo->name, "BCM4506 (internal)") != NULL || ostrstr(node->feinfo->name, "BCM4505") != NULL || ostrstr(node->feinfo->name, "BCM73625 (G3)") != NULL || ostrstr(node->feinfo->name, "BCM45208") != NULL)
+                else if(ostrstr(node->feinfo->name, "BCM4506") != NULL || ostrstr(node->feinfo->name, "BCM4506 (internal)") != NULL || ostrstr(node->feinfo->name, "BCM4505") != NULL || ostrstr(node->feinfo->name, "BCM73625 (G3)") != NULL)
                 {
                         ret = (snr * 100) >> 8;
@@ -1489 +1453 @@
         }
         
-#if DVB_API_VERSION >= 5
+#ifdef ARM              
         struct dtv_property prop[1];
         prop[0].cmd = DTV_STAT_SIGNAL_STRENGTH;
@@ -1495 +1459 @@
         props.props = prop;
         props.num = 1;
-        if (ioctl(node->fd, FE_GET_PROPERTY, &props) < 0 && errno != ERANGE)
-        {
-                debug(200, "DTV_STAT_SIGNAL_STRENGTH failed");
-        }
-        else
-        {
-                for(unsigned int i=0; i<prop[0].u.st.len; i++)
-                {
-                        if (prop[0].u.st.stat[i].scale == FE_SCALE_RELATIVE)
-                                signal = prop[0].u.st.stat[i].uvalue;
-                }
-        }
-        if (signal)
-                return signal;
-        // fallback to old DVB API
-#endif  
-        if(ioctl(node->fd, FE_READ_SIGNAL_STRENGTH, &signal) < 0 && errno != ERANGE)
-        {
-                debug(200, "FE_READ_SIGNAL_STRENGTH failed");
-        }
-        else
-        {
-                if(ostrstr(node->feinfo->name, "Si2166B") != NULL || ostrstr(node->feinfo->name, "BCM45208") != NULL)
+        ioctl(node->fd, FE_GET_PROPERTY, &props);
+        for(unsigned int i=0; i<prop[0].u.st.len; i++)
+        {
+                if (prop[0].u.st.stat[i].scale == FE_SCALE_RELATIVE)
+                        signal = prop[0].u.st.stat[i].uvalue;
+        }
+        if (!signal)
+        {
+                ioctl(node->fd, FE_READ_SIGNAL_STRENGTH, &signal);
+                if(ostrstr(node->feinfo->name, "Si2166B") != NULL)
                         signal = signal * 1000;
                 debug(200, "frontend signal = %02x", (signal * 100) / 0xffff);
         }
         return signal;
+#else   
+        ioctl(node->fd, FE_READ_SIGNAL_STRENGTH, &signal);
+        debug(200, "frontend signal = %02x", (signal * 100) / 0xffff);
+        return signal;
+#endif
 }
 
@@ -1625 +1581 @@
                 default: fec = FEC_AUTO; break;
         }
+        
         int pilot = tpnode->pilot;
         switch(pilot)
@@ -1633 +1590 @@
                 default: pilot = PILOT_AUTO; break;
         }
+
         int rolloff = tpnode->rolloff;
         switch(rolloff)
@@ -2237 +2195 @@
         {
                 err("FE_SET_PROPERTY failed -> use procfs to switch delivery system tuner %d mode %s type %d",tuner->devnr ,value, type);
-        }
                 hypridtuner = getconfig("hypridtuner", NULL);
                 if(hypridtuner != NULL)
@@ -2261 +2218 @@
                         printf("set %s to %s RC:%i\n", buf, value, ret);
                 }
-                else
-                        err("set system tuner to %d ... file not found -> %s", value, buf);
+                err("set system tuner to %d ... file not found -> %s", value, buf);
                 free(buf); buf = NULL;
                 return 1; //true
-        
+        }
         return 0; //true