1 files changed, 79 insertions, 143 deletions

diff --git a/v4l_experimental/pvrusb2/pvrusb2-video.c b/v4l_experimental/pvrusb2/pvrusb2-video.c
index 7b4e973c5..3dc18ec55 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-video.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-video.c
@@ -1,6 +1,6 @@
 /*
  *
- *  $Id: pvrusb2-video.c,v 1.1 2005/11/14 13:31:24 mchehab Exp $
+ *  $Id: pvrusb2-video.c,v 1.2 2005/11/27 23:01:16 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -27,184 +27,120 @@
    used internally by the driver; higher level code should only
    interact through the interface provided by pvrusb2-hdw.h.
 
-   This source file is specifically designed to interface with the
-   saa711x support that is available in the v4l available starting
-   with linux 2.6.15.
+   Since there are several possible choices of low level drivers, we
+   go through a layer of indirection in an attempt to select the right
+   choice.  This module implements that indirection.
 
 */
 
-#include "pvrusb2-i2c.h"
+#include "compat.h"
 #include "pvrusb2-video.h"
-#include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
-#include <linux/videodev.h>
-#include <media/v4l2-common.h>
+#ifndef PVR2_SUPPRESS_SAA711X
+#include "pvrusb2-video-v4l.h"
+#endif
+#ifdef PVR2_ENABLE_SAA7115
+#include "pvrusb2-video-ivtv.h"
+#endif
+#include "pvrusb2-debug.h"
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
 
-#define pvr2_decoder_trace(...) pvr2_trace(PVR2_TRACE_DECODER,__VA_ARGS__)
 
-int pvr2_decoder_enable_output(struct pvr2_hdw *hdw,int fl)
+struct pvr2_decoder *pvr2_decoder_create(struct pvr2_hdw *hdw)
 {
-	int status;
-	pvr2_decoder_trace("pvr2_decoder_enable_output(%d)",fl);
-	if (fl) {
-		status = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_STREAMON,0);
-	} else {
-		status = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_STREAMOFF,0);
+	struct pvr2_decoder *dcp;
+
+#ifndef PVR2_SUPPRESS_SAA711X
+	dcp = pvr2_decoder_v4l_create(hdw);
+	if (dcp) {
+		pvr2_trace(PVR2_TRACE_INIT,"Using v4l video decoder driver");
+		return dcp;
 	}
-	if (!status) {
-		hdw->subsys_enabled_mask =
-			((hdw->subsys_enabled_mask &
-			  ~PVR2_SUBSYS_DIGITIZER_RUN) |
-			 (fl ? PVR2_SUBSYS_DIGITIZER_RUN : 0));
+#endif
+
+#ifdef PVR2_ENABLE_SAA7115
+	dcp = pvr2_decoder_ivtv_create(hdw);
+	if (dcp) {
+		pvr2_trace(PVR2_TRACE_INIT,"Using ivtv video decoder driver");
+		return dcp;
 	}
-	return status;
+#endif
+
+	pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+		   "Failed to select a viable v4l video decoder driver");
+	return 0;
 }
 
-int pvr2_decoder_set_input(struct pvr2_hdw *hdw)
+
+void pvr2_decoder_destroy(struct pvr2_decoder *dcp)
 {
-	int status;
-	int v = 0;
-	pvr2_decoder_trace("pvr2_decoder_set_input(%d)",
-			   hdw->controls[PVR2_CID_INPUT].value);
-	switch(hdw->controls[PVR2_CID_INPUT].value){
-	case PVR2_CVAL_INPUT_TV:
-		v = 4;
-		break;
-	case PVR2_CVAL_INPUT_COMPOSITE:
-		v = 5;
-		break;
-	case PVR2_CVAL_INPUT_SVIDEO:
-		v = 8;
-		break;
-	case PVR2_CVAL_INPUT_RADIO:
-		// ????? No idea yet what to do here
-	default:
-		return -EINVAL;
-	}
-	status = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_INPUT,&v);
-	if (!status) {
-		hdw->subsys_enabled_mask |= PVR2_SUBSYS_DIGITIZER_CFG_INPUT;
+	if (!dcp) return;
+	if (dcp->func_table->destroy_func) {
+		dcp->func_table->destroy_func(dcp);
+	} else {
+		kfree(dcp);
 	}
-	return status;
 }
 
-int pvr2_decoder_set_bcsh(struct pvr2_hdw *hdw)
+
+int pvr2_decoder_set_norm(struct pvr2_decoder *dcp)
 {
-	struct v4l2_control ctrl;
-	int ret;
-	memset(&ctrl,0,sizeof(ctrl));
-
-	pvr2_decoder_trace("pvr2_decoder_set_bcsh b=%d c=%d s=%d h=%d",
-			   hdw->controls[PVR2_CID_BRIGHTNESS].value,
-			   hdw->controls[PVR2_CID_CONTRAST].value,
-			   hdw->controls[PVR2_CID_SATURATION].value,
-			   hdw->controls[PVR2_CID_HUE].value);
-
-	ctrl.id = V4L2_CID_BRIGHTNESS;
-	ctrl.value = hdw->controls[PVR2_CID_BRIGHTNESS].value;
-	ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_CTRL,&ctrl);
-	if (ret) return ret;
-	ctrl.id = V4L2_CID_CONTRAST;
-	ctrl.value = hdw->controls[PVR2_CID_CONTRAST].value;
-	ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_CTRL,&ctrl);
-	if (ret) return ret;
-	ctrl.id = V4L2_CID_SATURATION;
-	ctrl.value = hdw->controls[PVR2_CID_SATURATION].value;
-	ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_CTRL,&ctrl);
-	if (ret) return ret;
-	ctrl.id = V4L2_CID_HUE;
-	ctrl.value = hdw->controls[PVR2_CID_HUE].value;
-	ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_CTRL,&ctrl);
-	if (ret) return ret;
-
-	hdw->subsys_enabled_mask |= PVR2_SUBSYS_DIGITIZER_CFG_BCSH;
-	return 0;
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->set_norm_func(dcp);
 }
 
-int pvr2_decoder_is_tuned(struct pvr2_hdw *hdw)
-{
-	struct v4l2_tuner vt;
-	int ret;
 
-	memset(&vt,0,sizeof(vt));
-	ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_G_TUNER,&vt);
-	if (ret < 0) return 0;
-	return vt.signal != 0;
+int pvr2_decoder_set_input(struct pvr2_decoder *dcp)
+{
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->set_input_func(dcp);
 }
 
-int pvr2_decoder_set_size(struct pvr2_hdw *hdw)
+
+int pvr2_decoder_set_size(struct pvr2_decoder *dcp)
 {
-	struct v4l2_format fmt;
-	int ret;
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->set_size_func(dcp);
+}
 
-	memset(&fmt,0,sizeof(fmt));
 
-	fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	fmt.fmt.pix.width = hdw->controls[PVR2_CID_HRES].value;
-	fmt.fmt.pix.height = hdw->controls[PVR2_CID_VRES].value;
+int pvr2_decoder_set_audio(struct pvr2_decoder *dcp)
+{
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->set_audio_func(dcp);
+}
 
-	pvr2_decoder_trace("pvr2_decoder_set_size(%dx%d)",
-			   fmt.fmt.pix.width,fmt.fmt.pix.height);
 
-	ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_FMT,&fmt);
-	if (ret) return ret;
+int pvr2_decoder_set_bcsh(struct pvr2_decoder *dcp)
+{
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->set_bcsh_func(dcp);
+}
 
-	hdw->subsys_enabled_mask |= PVR2_SUBSYS_DIGITIZER_CFG_SIZE;
-	return 0;
+
+int pvr2_decoder_is_tuned(struct pvr2_decoder *dcp)
+{
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->is_tuned_func(dcp);
 }
 
-int pvr2_decoder_set_audio(struct pvr2_hdw *hdw)
+
+int pvr2_decoder_enable_output(struct pvr2_decoder *dcp)
 {
-	int ret;
-	enum v4l2_audio_clock_freq val;
-
-	pvr2_decoder_trace("pvr2_decoder_set_audio %d",
-			   hdw->controls[PVR2_CID_SRATE].value);
-	switch (hdw->controls[PVR2_CID_SRATE].value) {
-	default:
-	case PVR2_CVAL_SRATE_48:
-		val = V4L2_AUDCLK_48_KHZ;
-		break;
-	case PVR2_CVAL_SRATE_44_1:
-		val = V4L2_AUDCLK_441_KHZ;
-		break;
-	}
-	ret = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_INT_AUDIO_CLOCK_FREQ,&val);
-	if (ret) return ret;
-	hdw->subsys_enabled_mask |= PVR2_SUBSYS_DIGITIZER_CFG_AUDIO;
-	return 0;
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->enable_func(dcp);
 }
 
-int pvr2_decoder_set_norm(struct pvr2_hdw *hdw)
+
+int pvr2_decoder_disable_output(struct pvr2_decoder *dcp)
 {
-	v4l2_std_id std;
-	int status;
-	pvr2_decoder_trace("pvr2_decoder_set_norm %d",
-			   hdw->controls[PVR2_CID_VIDEOSTANDARD].value);
-	switch (hdw->controls[PVR2_CID_VIDEOSTANDARD].value) {
-	default:
-	case PVR2_CVAL_VIDEOSTANDARD_NTSC_M:
-		std = V4L2_STD_NTSC;
-		break;
-	case PVR2_CVAL_VIDEOSTANDARD_SECAM_L:
-		std = V4L2_STD_SECAM;
-		break;
-	case PVR2_CVAL_VIDEOSTANDARD_PAL_I:
-		std = V4L2_STD_PAL_I;
-		break;
-	case PVR2_CVAL_VIDEOSTANDARD_PAL_DK:
-		std = V4L2_STD_PAL_DK;
-		break;
-	case PVR2_CVAL_VIDEOSTANDARD_PAL_BG:
-		std = V4L2_STD_PAL_BG;
-		break;
-	}
-	status = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_STD,&std);
-	if (status) return status;
-	hdw->subsys_enabled_mask |= PVR2_SUBSYS_DIGITIZER_CFG_NORM;
-	return 0;
+	if (!dcp) return -EINVAL;
+	return dcp->func_table->disable_func(dcp);
 }
 
+
 /*
   Stuff for Emacs to see, in order to encourage consistent editing style:
   *** Local Variables: ***