Commit 275b2e28 authored by Pantelis Koukousoulas's avatar Pantelis Koukousoulas Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5034): Pvrusb2: Enable radio mode round #1 



This is the logic that supports switching modes via e.g.,
  echo radio > /sys/class/pvrusb2/sn-*/ctl_input/cur_val.

To do the mode switching we need to:
a) broadcast AUDC_SET_RADIO and
b) issue the CX2341X_ENC_MUTE_VIDEO command to the encoder. 

The first is done by adding a new pvr2_i2c_op and having it trigger on 
input change, the second by adding this command in pvr2_encoder_start() 
and requesting an encoder restart on input change by setting 
stale_subsys_mask appropriately. 

The clues about AUDC_SET_RADIO and CX2341X_ENC_MUTE_VIDEO were kindly 
provided by Hans Verkuil on the pvrusb2 mailing list. The idea to 
implement mode switching this way (on input change) is due to Mike Isely.

Why AUDC_SET_RADIO/VIDIOC_S_STD are used for switching? I can 't be sure, 
but I think this can be traced to a cornell student being the first to 
implement radio support in ivtv "as a different standard". I think the 
rest just evolved from there (it 's in the ivtv ML archives).

Signed-off-by: default avatarPantelis Koukousoulas <pakt223@freemail.gr>
Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0b600512

drivers/media/video/pvrusb2/pvrusb2-encoder.c

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,9 @@ int pvr2_encoder_start(struct pvr2_hdw *hdw) 
	pvr2_hdw_gpio_chg_dir(hdw,0xffffffff,0x00000481);

	pvr2_hdw_gpio_chg_out(hdw,0xffffffff,0x00000000);



	pvr2_encoder_vcmd(hdw,CX2341X_ENC_MUTE_VIDEO,1,

			  hdw->input_val == PVR2_CVAL_INPUT_RADIO ? 1 : 0);



	if (hdw->config == pvr2_config_vbi) {

		status = pvr2_encoder_vcmd(hdw,CX2341X_ENC_START_CAPTURE,2,

					   0x01,0x14);

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+7 −0
Original line number Diff line number Diff line
@@ -2260,6 +2260,13 @@ static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw) 
		stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_CFG);

	}



	if (hdw->input_dirty) {

		/* pk: If input changes to or from radio, then the encoder

		   needs to be restarted (for ENC_MUTE_VIDEO to work) */

		stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_RUN);

	}





	if (hdw->srate_dirty) {

		/* Write new sample rate into control structure since

		 * the master copy is stale.  We must track srate

drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c

+4 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define OP_AUDIORATE 4

#define OP_SIZE 5

#define OP_LOG 6

#define OP_RADIO 7



static const struct pvr2_i2c_op * const ops[] = {

	[OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
@@ -47,6 +48,7 @@ static const struct pvr2_i2c_op * const ops[] = { 
	[OP_FREQ] = &pvr2_i2c_op_v4l2_frequency,

	[OP_SIZE] = &pvr2_i2c_op_v4l2_size,

	[OP_LOG] = &pvr2_i2c_op_v4l2_log,

	[OP_RADIO] = &pvr2_i2c_op_v4l2_radio,

};



void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
@@ -58,7 +60,8 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) 
			(1 << OP_VOLUME) |

			(1 << OP_FREQ) |

			(1 << OP_SIZE) |

			(1 << OP_LOG));

			(1 << OP_LOG) |

			(1 << OP_RADIO));



	if (id == I2C_DRIVERID_MSP3400) {

		if (pvr2_i2c_msp3400_setup(hdw,cp)) {

drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c

+29 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "pvrusb2-hdw-internal.h"

#include "pvrusb2-debug.h"

#include <linux/videodev2.h>



#include <media/v4l2-common.h> /* AUDC_SET_RADIO */



static void set_standard(struct pvr2_hdw *hdw)

{
@@ -50,6 +50,32 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard = { 
};





static void set_radio(struct pvr2_hdw *hdw)

{

	pvr2_trace(PVR2_TRACE_CHIPS,

			   "i2c v4l2 set_radio()");



	if (hdw->input_val == PVR2_CVAL_INPUT_RADIO) {

		pvr2_i2c_core_cmd(hdw,AUDC_SET_RADIO,NULL);

	} else {

		set_standard(hdw);

	}

}





static int check_radio(struct pvr2_hdw *hdw)

{

	return hdw->input_dirty != 0;

}





const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio = {

	.check = check_radio,

	.update = set_radio,

	.name = "v4l2_radio",

};





static void set_bcsh(struct pvr2_hdw *hdw)

{

	struct v4l2_control ctrl;
@@ -145,7 +171,8 @@ static void set_frequency(struct pvr2_hdw *hdw) 
	memset(&freq,0,sizeof(freq));

	freq.frequency = fv / 62500;

	freq.tuner = 0;

	freq.type = V4L2_TUNER_ANALOG_TV;

	freq.type = (hdw->input_val == PVR2_CVAL_INPUT_RADIO) ?

		     V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

	pvr2_i2c_core_cmd(hdw,VIDIOC_S_FREQUENCY,&freq);

}

drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "pvrusb2-i2c-core.h"



extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard;

extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;

extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;

extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_volume;

extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency;

CRA Git | Maintained and supported by SUSTech CRA and CCSE