From e49bb6b1caf8169505d2d84a8181d77c6d3f9acf Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 21 Oct 2007 12:40:56 -0400 Subject: tuner: move analog_tuner_ops into dvb_frontend_ops From: Michael Krufky Signed-off-by: Michael Krufky Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 3 linux/drivers/media/video/tda8290.c | 8 +- linux/drivers/media/video/tda9887.c | 4 - linux/drivers/media/video/tuner-core.c | 91 +++++++++++++----------- linux/drivers/media/video/tuner-driver.h | 4 - 5 files changed, 63 insertions(+), 47 deletions(-) --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linux/drivers/media/dvb/dvb-core') diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h index d6e90cec7..86ca54413 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -64,6 +64,8 @@ struct dvb_tuner_info { u32 bandwidth_step; }; +struct analog_tuner_ops; + struct analog_parameters { unsigned int frequency; unsigned int mode; @@ -148,6 +150,7 @@ struct dvb_frontend_ops { int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire); struct dvb_tuner_ops tuner_ops; + struct analog_tuner_ops *analog_demod_ops; }; #define MAX_EVENT 8 -- cgit v1.2.3 From 7546de2f97f5d0ce1c30c79aa289f39ae014681b Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 21 Oct 2007 14:22:25 -0400 Subject: tuner: move analog_demod_priv into struct dvb_frontend From: Michael Krufky Signed-off-by: Michael Krufky Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 1 linux/drivers/media/video/tda8290.c | 40 ++++++++++++------------ linux/drivers/media/video/tda9887.c | 14 ++++---- linux/drivers/media/video/tuner-core.c | 11 ------ linux/drivers/media/video/tuner-driver.h | 1 5 files changed, 29 insertions(+), 38 deletions(-) --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 1 + 1 file changed, 1 insertion(+) (limited to 'linux/drivers/media/dvb/dvb-core') diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h index 86ca54413..204994a60 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -175,6 +175,7 @@ struct dvb_frontend { void* tuner_priv; void* frontend_priv; void* sec_priv; + void* analog_demod_priv; }; extern int dvb_register_frontend(struct dvb_adapter* dvb, -- cgit v1.2.3 From 1dc24f728097d312f26ea779561fba5da19de63b Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 21 Oct 2007 23:12:16 -0400 Subject: dvb_frontend: codingstyle cleanups From: Michael Krufky thanks to checkpatch.pl Signed-off-by: Michael Krufky Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- linux/drivers/media/dvb/dvb-core/dvb_frontend.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'linux/drivers/media/dvb/dvb-core') diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h index 204994a60..d99fe67ae 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -171,19 +171,19 @@ struct dvb_fe_events { struct dvb_frontend { struct dvb_frontend_ops ops; struct dvb_adapter *dvb; - void* demodulator_priv; - void* tuner_priv; - void* frontend_priv; - void* sec_priv; - void* analog_demod_priv; + void *demodulator_priv; + void *tuner_priv; + void *frontend_priv; + void *sec_priv; + void *analog_demod_priv; }; -extern int dvb_register_frontend(struct dvb_adapter* dvb, - struct dvb_frontend* fe); +extern int dvb_register_frontend(struct dvb_adapter *dvb, + struct dvb_frontend *fe); -extern int dvb_unregister_frontend(struct dvb_frontend* fe); +extern int dvb_unregister_frontend(struct dvb_frontend *fe); -extern void dvb_frontend_detach(struct dvb_frontend* fe); +extern void dvb_frontend_detach(struct dvb_frontend *fe); extern void dvb_frontend_reinitialise(struct dvb_frontend *fe); -- cgit v1.2.3