linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / video / saa7127.c

diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index ad401bd..9e4c178 100644 (file)
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -54,7 +54,6 @@
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
-#include <media/saa7127.h>
 
 static int debug = 0;
 static int test_image = 0;
@@ -224,6 +223,22 @@ static struct i2c_reg_value saa7127_init_config_50hz[] = {
        { 0, 0 }
 };
 
+/* Enumeration for the Supported input types */
+enum saa7127_input_type {
+       SAA7127_INPUT_TYPE_NORMAL,
+       SAA7127_INPUT_TYPE_TEST_IMAGE
+};
+
+/* Enumeration for the Supported Output signal types */
+enum saa7127_output_type {
+       SAA7127_OUTPUT_TYPE_BOTH,
+       SAA7127_OUTPUT_TYPE_COMPOSITE,
+       SAA7127_OUTPUT_TYPE_SVIDEO,
+       SAA7127_OUTPUT_TYPE_RGB,
+       SAA7127_OUTPUT_TYPE_YUV_C,
+       SAA7127_OUTPUT_TYPE_YUV_V
+};
+
 /*
  **********************************************************************
  *
@@ -270,7 +285,7 @@ static const char * const wss_strs[] = {
        "letterbox 16:9 top",
        "invalid",
        "invalid",
-       "16:9 full format anamorphic",
+       "16:9 full format anamorphic"
        "4:3 full format",
        "invalid",
        "invalid",
@@ -547,7 +562,7 @@ static int saa7127_command(struct i2c_client *client,
 {
        struct saa7127_state *state = i2c_get_clientdata(client);
        struct v4l2_format *fmt = arg;
-       struct v4l2_routing *route = arg;
+       int *iarg = arg;
 
        switch (cmd) {
        case VIDIOC_S_STD:
@@ -559,23 +574,15 @@ static int saa7127_command(struct i2c_client *client,
                *(v4l2_std_id *)arg = state->std;
                break;
 
-       case VIDIOC_INT_G_VIDEO_ROUTING:
-               route->input = state->input_type;
-               route->output = state->output_type;
-               break;
-
-       case VIDIOC_INT_S_VIDEO_ROUTING:
-       {
-               int rc = 0;
+       case VIDIOC_S_INPUT:
+               if (state->input_type == *iarg)
+                       break;
+               return saa7127_set_input_type(client, *iarg);
 
-               if (state->input_type != route->input) {
-                       rc = saa7127_set_input_type(client, route->input);
-               }
-               if (rc == 0 && state->output_type != route->output) {
-                       rc = saa7127_set_output_type(client, route->output);
-               }
-               return rc;
-       }
+       case VIDIOC_S_OUTPUT:
+               if (state->output_type == *iarg)
+                       break;
+               return saa7127_set_output_type(client, *iarg);
 
        case VIDIOC_STREAMON:
        case VIDIOC_STREAMOFF: