diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-26 18:44:40 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-26 18:44:40 +0200 |
| commit | f7c0c71736f1ecdc77c1ed681e45db0fea08af5b (patch) | |
| tree | 12a47fbd0652d2a7d662545ce0dcd3307104e4e2 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | d0ba237cfdce0751f117e7b91758bc9cae3c7451 (diff) | |
| download | mediapointer-dvb-s2-f7c0c71736f1ecdc77c1ed681e45db0fea08af5b.tar.gz mediapointer-dvb-s2-f7c0c71736f1ecdc77c1ed681e45db0fea08af5b.tar.bz2 | |
saa7134-empress: insert leading null bytes for Beholder M6 empress cards
From: Dmitry Belimov <d.belimov@gmail.com>
Additional code to improve the init sequence and add board type tests
were done by Hans Verkuil.
Priority: normal
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index 5225ed6b8..1451fdf99 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/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; } |