1 files changed, 20 insertions, 56 deletions

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
index ac798f4e0..79395d540 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -24,9 +24,8 @@
 #include "pvrusb2-audio.h"
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
-#include "msp3400.h"
 #include <linux/videodev.h>
-#include <media/audiochip.h>
+#include <media/msp3400.h>
 #include <media/v4l2-common.h>
 
 struct pvr2_msp3400_handler {
@@ -38,21 +37,6 @@ struct pvr2_msp3400_handler {
 };
 
 
-/*
-
-  MCI <isely@pobox.com> 10-Mar-2005 - Rather than operate the msp34xx
-  directly, we rely on the msp3400.ko module to do it for us.  We
-  really have to do this because that $##@!! module is going to attach
-  itself to us anyway, so we really can't operate the chip ourselves.
-  Unfortunately msp3400.ko is a real train wreck of a piece of code.
-  Most of the code below tries to tickle that module in just the right
-  way to get the results we need.  Yuck.  msp3400.c should be taken
-  out back and shot.  Based on my reading of the actual chip datasheet
-  it should in theory be possible to write a far cleaner and simpler
-  driver than what is currently there right now.
-
-*/
-
 static int xlat_audiomode_to_v4l2(int id)
 {
 	switch (id) {
@@ -77,10 +61,9 @@ static int xlat_audiomode_to_v4l2(int id)
 static void set_stereo(struct pvr2_msp3400_handler *ctxt)
 {
 	struct pvr2_hdw *hdw = ctxt->hdw;
-	unsigned short sarg = 0;
-	struct msp_matrix mspm;
+	struct v4l2_routing route;
 
-	pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 set_stereo");
+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo");
 
 	if (hdw->controls[PVR2_CID_INPUT].value == PVR2_CVAL_INPUT_TV) {
 		struct v4l2_tuner vt;
@@ -90,46 +73,27 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt)
 		pvr2_i2c_client_cmd(ctxt->client,VIDIOC_S_TUNER,&vt);
 	}
 
-	sarg = AUDIO_TUNER;
+	route.input = MSP_INPUT_DEFAULT;
+	route.output = MSP_OUTPUT(MSP_OUT_SCART1_DA);
 	switch (hdw->controls[PVR2_CID_INPUT].value) {
 	case PVR2_CVAL_INPUT_TV:
-		sarg = AUDIO_TUNER;
 		break;
 	case PVR2_CVAL_INPUT_RADIO:
 		/* Assume that msp34xx also handle FM decoding, in which case
 		   we're still using the tuner. */
-		sarg = AUDIO_TUNER;
+		/* HV: actually it is more likely to be the SCART2 input if
+		   the ivtv experience is any indication. */
+		route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
+				    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
 		break;
 	case PVR2_CVAL_INPUT_SVIDEO:
 	case PVR2_CVAL_INPUT_COMPOSITE:
-		sarg = AUDIO_EXTERN;
-		break;
-	}
-	pvr2_i2c_client_cmd(ctxt->client,AUDC_SET_INPUT,&sarg);
-
-	/* The above should have been enough to do the job, however
-	   msp3400.ko does an incomplete job of handling the scart
-	   routing.  Really.  It doesn't even bother to initialize the
-	   SC1 output at all.  So we have to help it here...
-	   Unfortunately this also means that we have include
-	   msp3400.c's header file and it currently isn't in a public
-	   place.  Damnit! */
-
-	mspm.input = SCART_IN1_DA;
-	switch (hdw->controls[PVR2_CID_INPUT].value) {
-	case PVR2_CVAL_INPUT_SVIDEO:
-	case PVR2_CVAL_INPUT_COMPOSITE:
-		/* Bypass the DSP and just use IN1.  In theory we
-		   should be able to permanent just use IN1_DA, but to
-		   do that msp3400.ko should be adjusting the DSP
-		   input SCART routing correctly when doing video in.
-		   Unfortunately that appears not to be the case.  I
-		   really hate that module. */
-		mspm.input = SCART_IN1;
+		/* SCART 1 input */
+		route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,
+				    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
 		break;
 	}
-	mspm.output = 1;
-	pvr2_i2c_client_cmd(ctxt->client,MSP_SET_MATRIX,&mspm);
+	pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route);
 }
 
 
@@ -184,19 +148,19 @@ static void msp3400_update(struct pvr2_msp3400_handler *ctxt)
 }
 
 
-/* This reads back the current volume parameters and signal type */
+/* This reads back the current signal type */
 static int get_audio_status(struct pvr2_msp3400_handler *ctxt)
 {
-	struct video_audio vt;
+	struct v4l2_tuner vt;
 	int stat;
 
 	memset(&vt,0,sizeof(vt));
-	stat = pvr2_i2c_client_cmd(ctxt->client,VIDIOCGAUDIO,&vt);
+	stat = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt);
 	if (stat < 0) return stat;
 
-	ctxt->hdw->flag_stereo = (vt.mode & VIDEO_SOUND_STEREO) != 0;
+	ctxt->hdw->flag_stereo = (vt.audmode & V4L2_TUNER_MODE_STEREO) != 0;
 	ctxt->hdw->flag_bilingual =
-		(vt.mode & (VIDEO_SOUND_LANG1|VIDEO_SOUND_LANG2)) != 0;
+		(vt.audmode & V4L2_TUNER_MODE_LANG2) != 0;
 	return 0;
 }
 
@@ -212,7 +176,7 @@ static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt)
 static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt,
 					  char *buf,unsigned int cnt)
 {
-	return scnprintf(buf,cnt,"handler: pvrusb2-audio");
+	return scnprintf(buf,cnt,"handler: pvrusb2-audio v4l2");
 }
 
 
@@ -245,7 +209,7 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 				  sizeof(msp3400_ops[0]))) - 1;
 	cp->handler = &ctxt->i2c_handler;
 	hdw->audio_stat = &ctxt->astat;
-	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L1 handler set up",
+	pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L2 handler set up",
 		   cp->client->addr);
 	return !0;
 }