Changeset 41330 for titan/titan/frontenddev.h

Timestamp:

12/01/17 18:16:49 (6 years ago)

Author:

gost

Message:

[titan] fix hybrid tuner... I hope

File:

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

titan/titan/frontenddev.h

@@ -1492 +1492 @@
         int test2 = 0;
         struct dtv_property prop[1];
+        memset(prop, 0, sizeof(prop));
         prop[0].cmd = DTV_STAT_CNR;
         struct dtv_properties props;
@@ -1497 +1498 @@
         props.num = 1;
         
+        int wasopen = 0;
+        
+        if(node->fd == -1)
+                node->fd = feopen(node, NULL);
+        else
+                wasopen = 1;
+                
         if(ioctl(node->fd, FE_GET_PROPERTY,  &props) < 0 && errno != ERANGE)
         {
@@ -1519 +1527 @@
                 }
         }
+        if(wasopen != 1)
+                feclose(node, -1);
 #endif
         if(!signalquality && !signalqualitydb)
@@ -1585 +1595 @@
 #if DVB_API_VERSION > 5 || DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 10
         struct dtv_property prop[1];
+        memset(prop, 0, sizeof(prop));
         prop[0].cmd = DTV_STAT_SIGNAL_STRENGTH;
         struct dtv_properties props;
         props.props = prop;
         props.num = 1;
+        
+        int wasopen = 0;
+        
+        if(node->fd == -1)
+                node->fd = feopen(node, NULL);
+        else
+                wasopen = 1;
+        
         if (ioctl(node->fd, FE_GET_PROPERTY, &props) < 0 && errno != ERANGE)
         {
@@ -1602 +1621 @@
         }
         if (signal)
+        {
+                if(wasopen != 1)
+                        feclose(node, -1);
                 return signal;
+        }
         // fallback to old DVB API
 //#endif
@@ -1619 +1642 @@
         { 
                 fe_status_t status = fereadstatus(node); 
-                if(status & FE_HAS_LOCK) signal = 65535; 
+                if(status & FE_HAS_LOCK) signal = 1; 
         }        
         return signal;
@@ -2170 +2193 @@
                                         if(getconfig(tmpstr, NULL) != NULL)
                                                 sethypridtuner(y, getconfig(tmpstr, NULL));
-                                        //free(tmpstr), tmpstr = NULL;
+                                        free(tmpstr), tmpstr = NULL;
 #endif
                                 }
@@ -2181 +2204 @@
 #ifdef MIPSEL
                                         if(fehyprid != NULL && getconfig(tmpstr, NULL) != NULL)
+                                        {
                                                 sethypridtunernew(dvbnode, getconfig(tmpstr, NULL));
+                                                feinfo = fegetinfo(NULL, fd);
+                                                dvbnode->feinfo = feinfo;
+                                        }
                                         free(tmpstr), tmpstr = NULL;
 #endif                                  
@@ -2280 +2307 @@
         int type = 0;
         int ret = 0;
+        int wasopen = 0;
         char* realname = gethypridtunerchoicesvaluename(tuner->devnr, value);
         
+        if(tuner->fd == -1)
+                tuner->fd = feopen(tuner, NULL);
+        else
+                wasopen = 1;
         
         printf("**** > realname: %s\n", realname);
@@ -2336 +2368 @@
         if (ioctl(tuner->fd, FE_SET_PROPERTY, &cmdseq) == -1)
         {
+                perr("FE_SET_PROPERTY");
                 err("FE_SET_PROPERTY failed -> use procfs to switch delivery system tuner %d mode %s type %d",tuner->devnr ,value, type);
         }
+                if(wasopen != 1)
+                        feclose(tuner, -1);
                 hypridtuner = getconfig("hypridtuner", NULL);
                 if(hypridtuner != NULL)