openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] tuner.h: rename TUNER_PAD_IF_OUTPUT to TUNER_PAD_OUTPUT 

The output of a tuner is not only IF frequencies. They may also
output audio on some of its pins, and may even be a zero-IF tuner,
with outputs a baseband. So, rename the PAD name to make it
clearer and add a proper documentation about that at tuner.h.

No functional changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2016-01-27 08:39:33 -02:00
parent 8dfbcc4351
commit 163c9bca10
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/dvb-core/dvbdev.c
View File

@ -661,7 +661,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
if (ntuner && ndemod) { if (ntuner && ndemod) {
ret = media_create_pad_links(mdev, ret = media_create_pad_links(mdev,
MEDIA_ENT_F_TUNER, MEDIA_ENT_F_TUNER,
tuner, TUNER_PAD_IF_OUTPUT, tuner, TUNER_PAD_OUTPUT,
MEDIA_ENT_F_DTV_DEMOD, MEDIA_ENT_F_DTV_DEMOD,
demod, 0, MEDIA_LNK_FL_ENABLED, demod, 0, MEDIA_LNK_FL_ENABLED,
false); false);

2
drivers/media/usb/au0828/au0828-core.c
View File

@ -276,7 +276,7 @@ static int au0828_create_media_graph(struct au0828_dev *dev)
return -EINVAL; return -EINVAL;
if (tuner) { if (tuner) {
ret = media_create_pad_link(tuner, TUNER_PAD_IF_OUTPUT, ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,
decoder, 0, decoder, 0,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret) if (ret)

2
drivers/media/usb/cx231xx/cx231xx-cards.c
View File

@ -1259,7 +1259,7 @@ static int cx231xx_create_media_graph(struct cx231xx *dev)
return 0; return 0;
if (tuner) { if (tuner) {
ret = media_create_pad_link(tuner, TUNER_PAD_IF_OUTPUT, decoder, 0, ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT, decoder, 0,
MEDIA_LNK_FL_ENABLED); MEDIA_LNK_FL_ENABLED);
if (ret < 0) if (ret < 0)
return ret; return ret;

2
drivers/media/usb/dvb-usb-v2/mxl111sf.c
View File

@ -888,7 +888,7 @@ static int mxl111sf_attach_tuner(struct dvb_usb_adapter *adap)
state->tuner.function = MEDIA_ENT_F_TUNER; state->tuner.function = MEDIA_ENT_F_TUNER;
state->tuner.name = "mxl111sf tuner"; state->tuner.name = "mxl111sf tuner";
state->tuner_pads[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK; state->tuner_pads[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
state->tuner_pads[TUNER_PAD_IF_OUTPUT].flags = MEDIA_PAD_FL_SOURCE; state->tuner_pads[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
ret = media_entity_pads_init(&state->tuner, ret = media_entity_pads_init(&state->tuner,
TUNER_NUM_PADS, state->tuner_pads); TUNER_NUM_PADS, state->tuner_pads);

2
drivers/media/v4l2-core/tuner-core.c
View File

@ -697,7 +697,7 @@ static int tuner_probe(struct i2c_client *client,
register_client: register_client:
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
t->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK; t->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
t->pad[TUNER_PAD_IF_OUTPUT].flags = MEDIA_PAD_FL_SOURCE; t->pad[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;
t->sd.entity.function = MEDIA_ENT_F_TUNER; t->sd.entity.function = MEDIA_ENT_F_TUNER;
t->sd.entity.name = t->name; t->sd.entity.name = t->name;

21
include/media/tuner.h
View File

@ -21,11 +21,26 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
/* Tuner PADs */ /**
/* FIXME: is this the right place for it? */ * enum tuner_pad_index - tuner pad index
*
* @TUNER_PAD_RF_INPUT: Radiofrequency (RF) sink pad, usually linked to a
* RF connector entity.
* @TUNER_PAD_OUTPUT: Tuner output pad. This is actually more complex than
* a single pad output, as, in addition to luminance and
* chrominance IF a tuner may have internally an
* audio decoder (like xc3028) or it may produce an audio
* IF that will be used by an audio decoder like msp34xx.
* It may also have an IF-PLL demodulator on it, like
* tuners with tda9887. Yet, currently, we don't need to
* represent all the dirty details, as this is transparent
* for the V4L2 API usage. So, let's represent all kinds
* of different outputs as a single source pad.
* @TUNER_NUM_PADS: Number of pads of the tuner.
*/
enum tuner_pad_index { enum tuner_pad_index {
TUNER_PAD_RF_INPUT, TUNER_PAD_RF_INPUT,
TUNER_PAD_IF_OUTPUT, TUNER_PAD_OUTPUT,
TUNER_NUM_PADS TUNER_NUM_PADS
}; };