[2/2] libdvbv5: fix satellite LNBf handling

Commit Message

André Roth Sept. 13, 2014, 8:08 p.m. UTC

the LNBf is part of the public structure, remove it from
dvb_v5_fe_parms_priv.

fix typo for C++.

Signed-off-by: André Roth <[e-mail]>
---
 lib/include/libdvbv5/dvb-sat.h | 2 +-
 lib/libdvbv5/dvb-fe-priv.h     | 1 -
 lib/libdvbv5/dvb-sat.c         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/lib/include/libdvbv5/dvb-sat.h b/lib/include/libdvbv5/dvb-sat.h
index d80a619..c80545c 100644
--- a/lib/include/libdvbv5/dvb-sat.h
+++ b/lib/include/libdvbv5/dvb-sat.h
@@ -84,7 +84,7 @@  struct dvb_sat_lnb {
 struct dvb_v5_fe_parms;
 
 #ifdef __cplusplus
-extern "C"
+extern "C" {
 #endif
 
 /* From libsat.c */
diff --git a/lib/libdvbv5/dvb-fe-priv.h b/lib/libdvbv5/dvb-fe-priv.h
index 9194431..195c3bf 100644
--- a/lib/libdvbv5/dvb-fe-priv.h
+++ b/lib/libdvbv5/dvb-fe-priv.h
@@ -65,7 +65,6 @@  struct dvb_v5_fe_parms_priv {
 	struct dvb_v5_stats		stats;
 
 	/* Satellite specific stuff */
-	const struct dvb_sat_lnb       	*lnb;
 	int				high_band;
 	unsigned			freq_offset;
 };
diff --git a/lib/libdvbv5/dvb-sat.c b/lib/libdvbv5/dvb-sat.c
index 8befe28..e8df06b 100644
--- a/lib/libdvbv5/dvb-sat.c
+++ b/lib/libdvbv5/dvb-sat.c
@@ -356,7 +356,7 @@  static int dvbsat_diseqc_set_input(struct dvb_v5_fe_parms_priv *parms,
 int dvb_sat_set_parms(struct dvb_v5_fe_parms *p)
 {
 	struct dvb_v5_fe_parms_priv *parms = (void *)p;
-	const struct dvb_sat_lnb *lnb = parms->lnb;
+	const struct dvb_sat_lnb *lnb = p->lnb;
 	enum dvb_sat_polarization pol;
 	dvb_fe_retrieve_parm(&parms->p, DTV_POLARIZATION, &pol);
 	uint32_t freq;