patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 4e43ba8..5202dcc 100644 (file)
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -9,6 +9,9 @@
  * Changes by Ronald Bultje <rbultje@ronald.bitfreak.net>
  *    - moved over to linux>=2.4.x i2c protocol (1/1/2003)
  *
+ * Changes by Michael Hunold <michael@mihu.de>
+ *    - implemented DECODER_SET_GPIO, DECODER_INIT, DECODER_SET_VBI_BYPASS
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -112,7 +115,7 @@ saa7111_write_block (struct i2c_client *client,
                u8 block_data[32];
 
                msg.addr = client->addr;
-               msg.flags = client->flags;
+               msg.flags = 0;
                while (len >= 2) {
                        msg.buf = (char *) block_data;
                        msg.len = 0;
@@ -142,6 +145,13 @@ saa7111_write_block (struct i2c_client *client,
        return ret;
 }
 
+static int
+saa7111_init_decoder (struct i2c_client *client,
+             struct video_decoder_init *init)
+{
+       return saa7111_write_block(client, init->data, init->len);
+}
+
 static inline int
 saa7111_read (struct i2c_client *client,
              u8                 reg)
@@ -151,7 +161,7 @@ saa7111_read (struct i2c_client *client,
 
 /* ----------------------------------------------------------------------- */
 
-static const unsigned char init[] = {
+static const unsigned char saa7111_i2c_init[] = {
        0x00, 0x00,             /* 00 - ID byte */
        0x01, 0x00,             /* 01 - reserved */
 
@@ -201,8 +211,18 @@ saa7111_command (struct i2c_client *client,
        switch (cmd) {
 
        case 0:
-               //saa7111_write_block(client, init, sizeof(init));
-               break;
+       case DECODER_INIT:
+       {
+               struct video_decoder_init *init = arg;
+               if (NULL != init)
+                       return saa7111_init_decoder(client, init);
+               else {
+                       struct video_decoder_init vdi;
+                       vdi.data = saa7111_i2c_init;
+                       vdi.len = sizeof(saa7111_i2c_init);
+                       return saa7111_init_decoder(client, &vdi);
+               }
+       }
 
        case DECODER_DUMP:
        {
@@ -274,6 +294,32 @@ saa7111_command (struct i2c_client *client,
        }
                break;
 
+       case DECODER_SET_GPIO:
+       {
+               int *iarg = arg;
+               if (0 != *iarg) {
+                       saa7111_write(client, 0x11,
+                               (decoder->reg[0x11] | 0x80));
+               } else {
+                       saa7111_write(client, 0x11,
+                               (decoder->reg[0x11] & 0x7f));
+               }
+               break;
+       }
+
+       case DECODER_SET_VBI_BYPASS:
+       {
+               int *iarg = arg;
+               if (0 != *iarg) {
+                       saa7111_write(client, 0x13,
+                               (decoder->reg[0x13] & 0xf0) | 0x0a);
+               } else {
+                       saa7111_write(client, 0x13,
+                               (decoder->reg[0x13] & 0xf0));
+               }
+               break;
+       }
+
        case DECODER_SET_NORM:
        {
                int *iarg = arg;
@@ -465,6 +511,7 @@ saa7111_detect_client (struct i2c_adapter *adapter,
        int i;
        struct i2c_client *client;
        struct saa7111 *decoder;
+       struct video_decoder_init vdi;
 
        dprintk(1,
                KERN_INFO
@@ -509,7 +556,9 @@ saa7111_detect_client (struct i2c_adapter *adapter,
                return i;
        }
 
-       i = saa7111_write_block(client, init, sizeof(init));
+       vdi.data = saa7111_i2c_init;
+       vdi.len = sizeof(saa7111_i2c_init);
+       i = saa7111_init_decoder(client, &vdi);
        if (i < 0) {
                dprintk(1, KERN_ERR "%s_attach error: init status %d\n",
                        I2C_NAME(client), i);