V4L/DVB (8795): saa7134-empress: insert leading null bytes for Beholder M6 empress...

Additional code to improve the init sequence and add board type tests
were done by Hans Verkuil.

Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 28499e591925e681740c37c6bebb4105b27185a4..f40cb0b479b16224ebe64b19539d4b68d5485a28 100644 (file)
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -653,7 +653,7 @@ static int saa6752hs_qmenu(struct saa6752hs_state *h,
        return v4l2_ctrl_query_menu(qmenu, &qctrl, NULL);
 }
 
-static int saa6752hs_init(struct i2c_client* client)
+static int saa6752hs_init(struct i2c_client *client, u32 leading_null_bytes)
 {
        unsigned char buf[9], buf2[4];
        struct saa6752hs_state *h;
@@ -705,6 +705,12 @@ static int saa6752hs_init(struct i2c_client* client)
        buf[1] = 0x05;
        i2c_master_send(client,buf,2);
 
+       /* Set leading null byte for TS */
+       buf[0] = 0xF6;
+       buf[1] = (leading_null_bytes >> 8) & 0xff;
+       buf[2] = leading_null_bytes & 0xff;
+       i2c_master_send(client, buf, 3);
+
        /* compute PAT */
        memcpy(localPAT, PAT, sizeof(PAT));
        localPAT[17] = 0xe0 | ((h->params.ts_pid_pmt >> 8) & 0x0f);
@@ -812,14 +818,13 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
        int i;
 
        switch (cmd) {
+       case VIDIOC_INT_INIT:
+               /* apply settings and start encoder */
+               saa6752hs_init(client, *(u32 *)arg);
+               break;
        case VIDIOC_S_EXT_CTRLS:
                if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                        return -EINVAL;
-               if (ctrls->count == 0) {
-                       /* apply settings and start encoder */
-                       saa6752hs_init(client);
-                       break;
-               }
                /* fall through */
        case VIDIOC_TRY_EXT_CTRLS:
        case VIDIOC_G_EXT_CTRLS:

diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index f5a186a13db22d437910c67b7ee385fb7520104b..946edf64dc28cf81a207611461e65230e85fd548 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -64,10 +64,19 @@ static void ts_reset_encoder(struct saa7134_dev* dev)
 
 static int ts_init_encoder(struct saa7134_dev* dev)
 {
-       struct v4l2_ext_controls ctrls = { V4L2_CTRL_CLASS_MPEG, 0 };
-
+       u32 leading_null_bytes = 0;
+
+       /* If more cards start to need this, then this
+          should probably be added to the card definitions. */
+       switch (dev->board) {
+       case SAA7134_BOARD_BEHOLD_M6:
+       case SAA7134_BOARD_BEHOLD_M63:
+       case SAA7134_BOARD_BEHOLD_M6_EXTRA:
+               leading_null_bytes = 1;
+               break;
+       }
        ts_reset_encoder(dev);
-       saa7134_i2c_call_clients(dev, VIDIOC_S_EXT_CTRLS, &ctrls);
+       saa7134_i2c_call_clients(dev, VIDIOC_INT_INIT, &leading_null_bytes);
        dev->empress_started = 1;
        return 0;
 }