Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a3bab8e authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11204): pvrusb2: Remove old i2c layer; we use v4l2-subdev now 



This change removes the old i2c module controlling layer from the
pvrusb2 driver.  This is code that first had appeared in the driver
back in December 2005.  It's history.  Now we use v4l2-subdev.  Please
note also that with this change, the driver will no longer be usable
in kernels older that 2.6.22.

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2eb563b7

drivers/media/video/pvrusb2/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -2,11 +2,10 @@ obj-pvrusb2-sysfs-$(CONFIG_VIDEO_PVRUSB2_SYSFS) := pvrusb2-sysfs.o 
obj-pvrusb2-debugifc-$(CONFIG_VIDEO_PVRUSB2_DEBUGIFC) := pvrusb2-debugifc.o

obj-pvrusb2-dvb-$(CONFIG_VIDEO_PVRUSB2_DVB) := pvrusb2-dvb.o



pvrusb2-objs	:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \

		   pvrusb2-i2c-track.o \

		   pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \

pvrusb2-objs	:= pvrusb2-i2c-core.o \

		   pvrusb2-audio.o \

		   pvrusb2-encoder.o pvrusb2-video-v4l.o \

		   pvrusb2-eeprom.o pvrusb2-tuner.o \

		   pvrusb2-eeprom.o \

		   pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \

		   pvrusb2-ctrl.o pvrusb2-std.o pvrusb2-devattr.o \

		   pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \

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

+0 −127
Original line number Diff line number Diff line
@@ -55,133 +55,6 @@ static const struct routing_scheme routing_schemes[] = { 
	},

};





struct pvr2_msp3400_handler {

	struct pvr2_hdw *hdw;

	struct pvr2_i2c_client *client;

	struct pvr2_i2c_handler i2c_handler;

	unsigned long stale_mask;

};









/* This function selects the correct audio input source */

static void set_stereo(struct pvr2_msp3400_handler *ctxt)

{

	struct pvr2_hdw *hdw = ctxt->hdw;

	struct v4l2_routing route;

	const struct routing_scheme *sp;

	unsigned int sid = hdw->hdw_desc->signal_routing_scheme;



	pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo");



	if ((sid < ARRAY_SIZE(routing_schemes)) &&

	    ((sp = routing_schemes + sid) != NULL) &&

	    (hdw->input_val >= 0) &&

	    (hdw->input_val < sp->cnt)) {

		route.input = sp->def[hdw->input_val];

	} else {

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "*** WARNING *** i2c msp3400 v4l2 set_stereo:"

			   " Invalid routing scheme (%u) and/or input (%d)",

			   sid,hdw->input_val);

		return;

	}

	route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);

	pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route);

}





static int check_stereo(struct pvr2_msp3400_handler *ctxt)

{

	struct pvr2_hdw *hdw = ctxt->hdw;

	return hdw->input_dirty;

}





struct pvr2_msp3400_ops {

	void (*update)(struct pvr2_msp3400_handler *);

	int (*check)(struct pvr2_msp3400_handler *);

};





static const struct pvr2_msp3400_ops msp3400_ops[] = {

	{ .update = set_stereo, .check = check_stereo},

};





static int msp3400_check(struct pvr2_msp3400_handler *ctxt)

{

	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {

		msk = 1 << idx;

		if (ctxt->stale_mask & msk) continue;

		if (msp3400_ops[idx].check(ctxt)) {

			ctxt->stale_mask |= msk;

		}

	}

	return ctxt->stale_mask != 0;

}





static void msp3400_update(struct pvr2_msp3400_handler *ctxt)

{

	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < ARRAY_SIZE(msp3400_ops); idx++) {

		msk = 1 << idx;

		if (!(ctxt->stale_mask & msk)) continue;

		ctxt->stale_mask &= ~msk;

		msp3400_ops[idx].update(ctxt);

	}

}





static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt)

{

	ctxt->client->handler = NULL;

	kfree(ctxt);

}





static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt,

					  char *buf,unsigned int cnt)

{

	return scnprintf(buf,cnt,"handler: pvrusb2-audio v4l2");

}





static const struct pvr2_i2c_handler_functions msp3400_funcs = {

	.detach = (void (*)(void *))pvr2_msp3400_detach,

	.check = (int (*)(void *))msp3400_check,

	.update = (void (*)(void *))msp3400_update,

	.describe = (unsigned int (*)(void *,char *,unsigned int))pvr2_msp3400_describe,

};





int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)

{

	struct pvr2_msp3400_handler *ctxt;

	if (cp->handler) return 0;



	ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);

	if (!ctxt) return 0;



	ctxt->i2c_handler.func_data = ctxt;

	ctxt->i2c_handler.func_table = &msp3400_funcs;

	ctxt->client = cp;

	ctxt->hdw = hdw;

	ctxt->stale_mask = (1 << ARRAY_SIZE(msp3400_ops)) - 1;

	cp->handler = &ctxt->i2c_handler;

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L2 handler set up",

		   cp->client->addr);

	return !0;

}



void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)

{

	if (hdw->input_dirty || hdw->force_dirty) {

drivers/media/video/pvrusb2/pvrusb2-audio.h

+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ 
#ifndef __PVRUSB2_AUDIO_H

#define __PVRUSB2_AUDIO_H



#include "pvrusb2-i2c-track.h"



int pvr2_i2c_msp3400_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);



#include "pvrusb2-hdw-internal.h"

void pvr2_msp3400_subdev_update(struct pvr2_hdw *, struct v4l2_subdev *);

#endif /* __PVRUSB2_AUDIO_H */

drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c

+0 −221
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


#include "pvrusb2-cx2584x-v4l.h"

#include "pvrusb2-video-v4l.h"

#include "pvrusb2-i2c-cmd-v4l2.h"





#include "pvrusb2-hdw-internal.h"
@@ -102,226 +101,6 @@ static const struct routing_scheme routing_schemes[] = { 
	},

};



struct pvr2_v4l_cx2584x {

	struct pvr2_i2c_handler handler;

	struct pvr2_decoder_ctrl ctrl;

	struct pvr2_i2c_client *client;

	struct pvr2_hdw *hdw;

	unsigned long stale_mask;

};





static void set_input(struct pvr2_v4l_cx2584x *ctxt)

{

	struct pvr2_hdw *hdw = ctxt->hdw;

	struct v4l2_routing route;

	enum cx25840_video_input vid_input;

	enum cx25840_audio_input aud_input;

	const struct routing_scheme *sp;

	unsigned int sid = hdw->hdw_desc->signal_routing_scheme;



	memset(&route,0,sizeof(route));



	if ((sid < ARRAY_SIZE(routing_schemes)) &&

	    ((sp = routing_schemes + sid) != NULL) &&

	    (hdw->input_val >= 0) &&

	    (hdw->input_val < sp->cnt)) {

		vid_input = sp->def[hdw->input_val].vid;

		aud_input = sp->def[hdw->input_val].aud;

	} else {

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "*** WARNING *** i2c cx2584x set_input:"

			   " Invalid routing scheme (%u) and/or input (%d)",

			   sid,hdw->input_val);

		return;

	}



	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx2584x set_input vid=0x%x aud=0x%x",

		   vid_input,aud_input);

	route.input = (u32)vid_input;

	pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_VIDEO_ROUTING,&route);

	route.input = (u32)aud_input;

	pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route);

}





static int check_input(struct pvr2_v4l_cx2584x *ctxt)

{

	struct pvr2_hdw *hdw = ctxt->hdw;

	return hdw->input_dirty != 0;

}





static void set_audio(struct pvr2_v4l_cx2584x *ctxt)

{

	u32 val;

	struct pvr2_hdw *hdw = ctxt->hdw;



	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx2584x set_audio %d",

		   hdw->srate_val);

	switch (hdw->srate_val) {

	default:

	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000:

		val = 48000;

		break;

	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100:

		val = 44100;

		break;

	case V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000:

		val = 32000;

		break;

	}

	pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_AUDIO_CLOCK_FREQ,&val);

}





static int check_audio(struct pvr2_v4l_cx2584x *ctxt)

{

	struct pvr2_hdw *hdw = ctxt->hdw;

	return hdw->srate_dirty != 0;

}





struct pvr2_v4l_cx2584x_ops {

	void (*update)(struct pvr2_v4l_cx2584x *);

	int (*check)(struct pvr2_v4l_cx2584x *);

};





static const struct pvr2_v4l_cx2584x_ops decoder_ops[] = {

	{ .update = set_input, .check = check_input},

	{ .update = set_audio, .check = check_audio},

};





static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt)

{

	ctxt->client->handler = NULL;

	pvr2_hdw_set_decoder(ctxt->hdw,NULL);

	kfree(ctxt);

}





static int decoder_check(struct pvr2_v4l_cx2584x *ctxt)

{

	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {

		msk = 1 << idx;

		if (ctxt->stale_mask & msk) continue;

		if (decoder_ops[idx].check(ctxt)) {

			ctxt->stale_mask |= msk;

		}

	}

	return ctxt->stale_mask != 0;

}





static void decoder_update(struct pvr2_v4l_cx2584x *ctxt)

{

	unsigned long msk;

	unsigned int idx;



	for (idx = 0; idx < ARRAY_SIZE(decoder_ops); idx++) {

		msk = 1 << idx;

		if (!(ctxt->stale_mask & msk)) continue;

		ctxt->stale_mask &= ~msk;

		decoder_ops[idx].update(ctxt);

	}

}





static void decoder_enable(struct pvr2_v4l_cx2584x *ctxt,int fl)

{

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_enable(%d)",fl);

	pvr2_v4l2_cmd_stream(ctxt->client,fl);

}





static int decoder_detect(struct pvr2_i2c_client *cp)

{

	int ret;

	/* Attempt to query the decoder - let's see if it will answer */

	struct v4l2_queryctrl qc;



	memset(&qc,0,sizeof(qc));



	qc.id = V4L2_CID_BRIGHTNESS;



	ret = pvr2_i2c_client_cmd(cp,VIDIOC_QUERYCTRL,&qc);

	return ret == 0; /* Return true if it answered */

}





static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt,

				     char *buf,unsigned int cnt)

{

	return scnprintf(buf,cnt,"handler: pvrusb2-cx2584x-v4l");

}





static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)

{

	int ret;

	ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);

}





static const struct pvr2_i2c_handler_functions hfuncs = {

	.detach = (void (*)(void *))decoder_detach,

	.check = (int (*)(void *))decoder_check,

	.update = (void (*)(void *))decoder_update,

	.describe = (unsigned int (*)(void *,char *,unsigned int))decoder_describe,

};





int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw,

			       struct pvr2_i2c_client *cp)

{

	struct pvr2_v4l_cx2584x *ctxt;



	if (hdw->decoder_ctrl) return 0;

	if (cp->handler) return 0;

	if (!decoder_detect(cp)) return 0;



	ctxt = kzalloc(sizeof(*ctxt),GFP_KERNEL);

	if (!ctxt) return 0;



	ctxt->handler.func_data = ctxt;

	ctxt->handler.func_table = &hfuncs;

	ctxt->ctrl.ctxt = ctxt;

	ctxt->ctrl.detach = (void (*)(void *))decoder_detach;

	ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable;

	ctxt->ctrl.force_reset = (void (*)(void*))decoder_reset;

	ctxt->client = cp;

	ctxt->hdw = hdw;

	ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1;

	pvr2_hdw_set_decoder(hdw,&ctxt->ctrl);

	cp->handler = &ctxt->handler;

	{

		/*

		  Mike Isely <isely@pobox.com> 19-Nov-2006 - This bit

		  of nuttiness for cx25840 causes that module to

		  correctly set up its video scaling.  This is really

		  a problem in the cx25840 module itself, but we work

		  around it here.  The problem has not been seen in

		  ivtv because there VBI is supported and set up.  We

		  don't do VBI here (at least not yet) and thus we

		  never attempted to even set it up.

		 */

		struct v4l2_format fmt;

		memset(&fmt,0,sizeof(fmt));

		fmt.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;

		pvr2_i2c_client_cmd(ctxt->client,VIDIOC_S_FMT,&fmt);

	}

	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x cx2584x V4L2 handler set up",

		   cp->client->addr);

	return !0;

}





void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)

{

	pvr2_trace(PVR2_TRACE_CHIPS, "subdev cx2584x update...");

drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h

+0 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ 






#include "pvrusb2-i2c-track.h"



int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);





#include "pvrusb2-hdw-internal.h"



void pvr2_cx25840_subdev_update(struct pvr2_hdw *, struct v4l2_subdev *sd);