correct fe_specinv values (#882)

* correct fe_specinv values correct fe_specinv values to use the right values for dad * remove get_specinv remove get_specinv as it's a duplicate of get_inversion * missing axe and netceiver specinv removal
catalinii · Jul 16, 2021 · 47146d3 · 47146d3
1 parent efca5a9
commit 47146d3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/src/adapter.c b/src/adapter.c
@@ -1365,7 +1365,7 @@ char *describe_adapter(int sid, int aid, char *dad, int ld) {
             (double)t->freq / 1000, t->bw / 1000000, get_delsys(t->sys),
             get_modulation(t->mtype), t->sr / 1000, t->c2tft,
             itoa_positive(ds, t->ds), itoa_positive(plp_isi, t->plp_isi),
-            get_specinv(t->inversion));
+            get_inversion(t->inversion));
 
     if (use_ad) {
         int len1 = len;

diff --git a/src/axe.c b/src/axe.c
@@ -619,7 +619,7 @@ int axe_tune(int aid, transponder *tp) {
 
         LOG("tuning to %d delsys: %s bw:%d inversion:%s mod:%s fec:%s guard:%s "
             "transmission: %s, ts clear = %jd",
-            freq, fe_delsys[tp->sys], tp->bw, fe_specinv[tp->inversion],
+            freq, fe_delsys[tp->sys], tp->bw, fe_inversion[tp->inversion],
             fe_modulation[tp->mtype], fe_fec[tp->fec], fe_gi[tp->gi],
             fe_tmode[tp->tmode], bclear)
         break;
@@ -643,7 +643,7 @@ int axe_tune(int aid, transponder *tp) {
         // valid for DD DVB-C2 devices
 
         LOG("tuning to %d sr:%d specinv:%s delsys:%s mod:%s ts clear = %jd",
-            freq, tp->sr, fe_specinv[tp->inversion], fe_delsys[tp->sys],
+            freq, tp->sr, fe_inversion[tp->inversion], fe_delsys[tp->sys],
             fe_modulation[tp->mtype], bclear)
         break;
 

diff --git a/src/axe.h b/src/axe.h
@@ -4,6 +4,8 @@
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 
+extern char *fe_inversion[];
+
 typedef struct fe_frontend_status fe_frontend_status_t;
 
 struct fe_frontend_status {

diff --git a/src/dvb.c b/src/dvb.c
@@ -96,9 +96,6 @@ char *fe_gi[] = {"132",  "116",   "18",    "14",    " ", // auto
 char *fe_hierarchy[] = {"HIERARCHY_NONE", "HIERARCHY_1",    "HIERARCHY_2",
                         "HIERARCHY_4",    "HIERARCHY_AUTO", NULL};
 
-char *fe_specinv[] = {"off", "on", " ", // auto
-                      NULL};
-
 char *fe_inversion[] = {"0", "1", " ", // auto
                         NULL};
 
@@ -123,7 +120,6 @@ make_func(fec);
 make_func(modulation);
 make_func(tmode);
 make_func(gi);
-make_func(specinv);
 make_func(inversion);
 make_func(pol);
 make_func(pls_mode);
@@ -874,7 +870,7 @@ int dvb_tune(int aid, transponder *tp) {
 
         LOG("tuning to %d delsys: %s bw:%d inversion:%s mod:%s fec:%s guard:%s "
             "transmission: %s, ts clear = %jd",
-            freq, get_delsys(tp->sys), tp->bw, get_specinv(tp->inversion),
+            freq, get_delsys(tp->sys), tp->bw, get_inversion(tp->inversion),
             get_modulation(tp->mtype), get_fec(tp->fec), get_gi(tp->gi),
             get_tmode(tp->tmode), bclear)
         break;
@@ -906,7 +902,7 @@ int dvb_tune(int aid, transponder *tp) {
 #endif
 
         LOG("tuning to %d sr:%d specinv:%s delsys:%s mod:%s ts clear = %jd",
-            freq, tp->sr, get_specinv(tp->inversion), get_delsys(tp->sys),
+            freq, tp->sr, get_inversion(tp->inversion), get_delsys(tp->sys),
             get_modulation(tp->mtype), bclear)
         break;
 
@@ -920,7 +916,7 @@ int dvb_tune(int aid, transponder *tp) {
 
         LOG("tuning to %d delsys:%s mod:%s specinv:%s ts clear = %jd", freq,
             get_delsys(tp->sys), get_modulation(tp->mtype),
-            get_specinv(tp->inversion), bclear)
+            get_inversion(tp->inversion), bclear)
 
         break;
 
@@ -938,7 +934,7 @@ int dvb_tune(int aid, transponder *tp) {
 #endif
 
         LOG("tuning to %d delsys: %s bw:%d inversion:%s , ts clear = %jd", freq,
-            get_delsys(tp->sys), tp->bw, get_specinv(tp->inversion), bclear);
+            get_delsys(tp->sys), tp->bw, get_inversion(tp->inversion), bclear);
 
         break;
     default:

diff --git a/src/dvb.h b/src/dvb.h
@@ -301,7 +301,6 @@ char *get_fec(int i);
 char *get_modulation(int i);
 char *get_tmode(int i);
 char *get_gi(int i);
-char *get_specinv(int i);
 char *get_pol(int i);
 char *get_inversion(int i);
 char *get_pls_mode(int i);
@@ -310,7 +309,6 @@ extern char *fe_delsys[];
 extern char *fe_fec[];
 extern char *fe_tmode[];
 extern char *fe_modulation[];
-extern char *fe_specinv[];
 extern char *fe_gi[];
 
 #endif /*  */
diff --git a/src/netceiver.c b/src/netceiver.c
@@ -45,7 +45,6 @@ extern char *fe_modulation[];
 extern char *fe_tmode[];
 extern char *fe_gi[];
 extern char *fe_hierarchy[];
-extern char *fe_specinv[];
 extern char *fe_pol[];
 
 int netcv_close(adapter *ad) {