bttv synchronizing patch

PATCH In review Mauro Carvalho Chehab 2 participants 2 messages Jun 10, 2005 – Jun 11, 2005 1 message not in the archive Media (V4L/DVB)

lore

Share & tools

lore

Mauro Carvalho Chehab

author

2005-06-10 17:33 UTC #0 lore raw

PATCH 1/1 bttv synchronizing patch

This patch synchronizes current bttv support on V4L with linux kernel and adds support to Adlink RTV24 card.

It is asked that *every* patch to V4L stuff to be first submitted to
[email protected].

Signed-off-by Mauro Carvalho Chehab <[email protected]>

Signed-off-by Peter Skipworth <[email protected]>

Signed-off-by Nickolay V Shmyrev <[email protected]>

drivers/media/video/bttv.h +2 -2

diff -u linux-2.6.12/drivers/media/video/bttv.h linux/drivers/media/video/bttv.h
@@ -1,5 +1,5 @@
 /*
- * $Id: bttv.h,v 1.17 2005/02/22 14:06:32 kraxel Exp $
+ * $Id: bttv.h,v 1.18 2005/05/24 23:41:42 nsh Exp $
  *
  *  bttv - Bt848 frame grabber driver
  *

@@ -135,7 +135,7 @@
 #define BTTV_DVICO_DVBT_LITE  0x80
 #define BTTV_TIBET_CS16  0x83
 #define BTTV_KODICOM_4400R  0x84
-#define BTTV_ADLINK_RTV24   0x86
+#define BTTV_ADLINK_RTV24   0x85
 
 /* i2c address list */
 #define I2C_TSA5522        0xc2

drivers/media/video/bttvp.h +1 -1

diff -u linux-2.6.12/drivers/media/video/bttvp.h linux/drivers/media/video/bttvp.h
@@ -229,6 +229,7 @@
 /* our devices */
 #define BTTV_MAX 16
 extern unsigned int bttv_num;
+extern struct bttv bttvs[BTTV_MAX];
 
 #define BTTV_MAX_FBUF   0x208000
 #define VBIBUF_SIZE     (2048*VBI_MAXLINES*2)

@@ -375,7 +376,6 @@
 	unsigned int users;
 	struct bttv_fh init;
 };
-extern struct bttv bttvs[BTTV_MAX];
 
 /* private ioctls */
 #define BTTV_VERSION            _IOR('v' , BASE_VIDIOCPRIVATE+6, int)

drivers/media/video/bttv-driver.c +1 -1

diff -u linux-2.6.12/drivers/media/video/bttv-driver.c linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.37 2005/02/21 13:57:59 kraxel Exp $
+    $Id: bttv-driver.c,v 1.38 2005/06/10 17:20:24 mchehab Exp $
 
     bttv - Bt848 frame grabber driver

drivers/media/video/bttv-cards.c +61 ~~-50~~

173 lines not on this page · raw message

drivers/media/video/bttv-i2c.c +1 -1

diff -u linux-2.6.12/drivers/media/video/bttv-i2c.c linux/drivers/media/video/bttv-i2c.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-i2c.c,v 1.18 2005/02/16 12:14:10 kraxel Exp $
+    $Id: bttv-i2c.c,v 1.21 2005/06/10 17:20:24 mchehab Exp $
 
     bttv-i2c.c  --  all the i2c code is here

A message that is not in the archive (sent off-list or not yet received): [email protected]

Michael Krufky

2005-06-11 06:45 UTC #2 lore raw

Quoted 10 lines · Andrew Morton

Quoted 4 lines · Mauro Carvalho Chehab
It is asked that *every* patch to V4L stuff to be first submitted to
[email protected].
In that case you might want to double-check the patches which I have queued for post-2.6.12:

Quoted 12 lines

fix-for-cx88-cardsc-for-dvico-fusionhdtv-3-gold-q.patch bttv-support-for-adlink-rtv24-capture-card.patch bttv-support-for-adlink-rtv24-capture-card-tidy.patch bttv-support-for-adlink-rtv24-capture-card-more-tidy.patch v4l-saa7134-ntsc-vbi-fix.patch v4l-pal-m-chroma-subcarrier-frequency-fix.patch video-for-linux-docummentation.patch v4l-add-support-for-pixelview-ultra-pro.patch dvico-fusionhdtv3-gold-t-documentation-fix.patch v4l-support-tuner-thomson-ddt-7611-atsc-ntsc.patch

The following three patches are from me:

fix-for-cx88-cardsc-for-dvico-fusionhdtv-3-gold-q.patch dvico-fusionhdtv3-gold-t-documentation-fix.patch v4l-support-tuner-thomson-ddt-7611-atsc-ntsc.patch

...and they depend on the following two patches submitted by Mauro:

video-for-linux-docummentation.patch
v4l-add-support-for-pixelview-ultra-pro.patch

...When these patches are applied in the order listed in Andrew's email, the result is the same as what I currently have in v4l cvs.

Signature · 1 line

Michael Krufky