Changeset 41047 for titan

Timestamp:

10/22/17 18:46:22 (6 years ago)

Author:

gost

Message:

[titan] fix step1 fbc Port

File:

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

titan/titan/frontenddev.h

@@ -200 +200 @@
 {
         struct dvbdev* dvbnode = dvbdev;
+        char *tmpstr = NULL;
         char *buf = NULL;
         int fbc = 0;
@@ -231 +232 @@
                         }
                         sprintf(buf, "/proc/stb/frontend/%d/input",dvbnode->devnr);
-                        
-                        if(ostrcmp("fe_00", getconfig(dvbnode->feshortname, NULL)) == 0)
-                          writesys(buf, "A", 1);
-                        else if(ostrcmp("fe_01", getconfig(dvbnode->feshortname, NULL)) == 0)
-                                writesys(buf, "B", 1);
-                        else if(ostrcmp("fe_00", dvbnode->feshortname) == 0)
-                                writesys(buf, "A", 1);
-                        else if(ostrcmp("fe_01", dvbnode->feshortname) == 0)
-                                writesys(buf, "B", 1);
+                        tmpstr = ostrcat(dvbnode->feshortname, "_fbc", 0, 0);
+                        writesys(buf, getconfig(tmpstr, NULL), 1); 
                         free(buf); buf = NULL;
+                        free(tmpstr); tmpstr = NULL;
                 }
                 //check if tuner is deactivate
@@ -289 +284 @@
                 if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo->type == tpnode->fetype)
                 {
-                        if(dvbnode->feakttransponder != NULL)
-                                debug(200, "dvbnode->feakttransponder->orbitalpos:%i tpnode->orbitalpos:%i", dvbnode->feakttransponder->orbitalpos, tpnode->orbitalpos);
                         if(dvbnode->feakttransponder != NULL && dvbnode->feakttransponder->orbitalpos == tpnode->orbitalpos && dvbnode->feakttransponder->frequency == tpnode->frequency && dvbnode->feaktpolarization == tpnode->polarization)
                         {
@@ -338 +331 @@
                         {
                                 tmpdvbnode = fegetbyshortname(tmpstr);
-                                if(tmpdvbnode != NULL && tmpdvbnode->feakttransponder != NULL && tmpdvbnode->feaktpolarization != tpnode->polarization && (tmpdvbnode->felock != 0 || (flag == 2 && tmpdvbnode->felock == 0)))
+                                if(tmpdvbnode != NULL && tmpdvbnode->feakttransponder != NULL && (tmpdvbnode->feaktpolarization != tpnode->polarization || tmpdvbnode->feakttransponder->orbitalpos != tpnode->orbitalpos) && (tmpdvbnode->felock != 0 || (flag == 2 && tmpdvbnode->felock == 0)))
                                 {
                                         dvbnode = dvbnode->next;
@@ -1951 +1944 @@
                                         if(dvbnode->feinfo->type == FE_QPSK)
                                                 fesetvoltage(dvbnode, SEC_VOLTAGE_OFF, 15);
+                                                
+                                        if(y < 10)
+                                                tmpstr = ostrcat(tmpstr, "fe_0", 1, 0);
+                                        else
+                                                tmpstr = ostrcat(tmpstr, "fe_1", 1, 0);
+                                        tmpstr = ostrcat(tmpstr, oitoa(y), 1, 1);
+                                        tmpstr = ostrcat(tmpstr, "_fbc", 1, 0);
+                                        if(ostrstr(feinfo->name, "BCM45208") != NULL) //fbc Tuner
+                                        {
+                                                if(getconfig(tmpstr, NULL) == NULL)
+                                                        addconfig(tmpstr, "A");
+                                        }
+                                        else
+                                                addconfig(tmpstr, "");
+                                        free(tmpstr), tmpstr = NULL;
                                 }
                         }