[media] libdvbv5: constify and hide dvb_sat_lnb

[mchehab@redhat.com: patch rebased to apply against the latest version]
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/lib/include/dvb-fe.h b/lib/include/dvb-fe.h
index 8877356..808e32c 100644 (file)
--- a/lib/include/dvb-fe.h
+++ b/lib/include/dvb-fe.h
@@ -90,7 +90,7 @@ struct dvb_v5_fe_parms {
        struct dvb_v5_stats             stats;
 
        /* Satellite specific stuff, specified by the library client */
-       struct dvb_sat_lnb              *lnb;
+       const struct dvb_sat_lnb        *lnb;
        int                             sat_number;
        unsigned                        freq_bpf;
 

diff --git a/lib/include/dvb-sat.h b/lib/include/dvb-sat.h
index 2e74a11..57e5511 100644 (file)
--- a/lib/include/dvb-sat.h
+++ b/lib/include/dvb-sat.h
@@ -47,7 +47,7 @@ extern "C" {
 int dvb_sat_search_lnb(const char *name);
 int print_lnb(int i);
 void print_all_lnb(void);
-struct dvb_sat_lnb *dvb_sat_get_lnb(int i);
+const struct dvb_sat_lnb *dvb_sat_get_lnb(int i);
 int dvb_sat_set_parms(struct dvb_v5_fe_parms *parms);
 int dvb_sat_get_parms(struct dvb_v5_fe_parms *parms);
 

diff --git a/lib/libdvbv5/dvb-sat.c b/lib/libdvbv5/dvb-sat.c
index c93b882..25995fb 100644 (file)
--- a/lib/libdvbv5/dvb-sat.c
+++ b/lib/libdvbv5/dvb-sat.c
@@ -25,7 +25,7 @@
 #include "dvb-fe.h"
 #include "dvb-v5-std.h"
 
-struct dvb_sat_lnb lnb[] = {
+static const struct dvb_sat_lnb lnb[] = {
        {
                .name = "Europe",
                .alias = "UNIVERSAL",
@@ -131,7 +131,7 @@ void print_all_lnb(void)
        }
 }
 
-struct dvb_sat_lnb *dvb_sat_get_lnb(int i)
+const struct dvb_sat_lnb *dvb_sat_get_lnb(int i)
 {
        if (i < 0 || i >= ARRAY_SIZE(lnb))
                return NULL;
@@ -347,7 +347,7 @@ static int dvbsat_diseqc_set_input(struct dvb_v5_fe_parms *parms, uint16_t t)
 
 int dvb_sat_set_parms(struct dvb_v5_fe_parms *parms)
 {
-       struct dvb_sat_lnb *lnb = parms->lnb;
+       const struct dvb_sat_lnb *lnb = parms->lnb;
        enum dvb_sat_polarization pol;
        dvb_fe_retrieve_parm(parms, DTV_POLARIZATION, &pol);
        uint32_t freq;