SOURCES: 32_bttv-2.4.26.diff - updated for 2.4.34.1

[qboosh]

Author: qboosh                       Date: Mon Feb 19 10:54:27 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.4.34.1

---- Files affected:
SOURCES:
   32_bttv-2.4.26.diff (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/32_bttv-2.4.26.diff
diff -u SOURCES/32_bttv-2.4.26.diff:1.2 SOURCES/32_bttv-2.4.26.diff:1.3
--- SOURCES/32_bttv-2.4.26.diff:1.2	Thu Jan 20 14:52:46 2005
+++ SOURCES/32_bttv-2.4.26.diff	Mon Feb 19 11:54:21 2007
@@ -10684,9 +10684,8 @@
  extern void bttv_bit_setscl(void *data, int state);
  extern void bttv_bit_setsda(void *data, int state);
  extern void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg);
-diff -up linux-2.4.26/drivers/media/video/bttvp.h linux/drivers/media/video/bttvp.h
---- linux-2.4.26/drivers/media/video/bttvp.h	2004-04-21 13:43:20.000000000 +0200
-+++ linux/drivers/media/video/bttvp.h	2004-04-21 14:15:43.000000000 +0200
+--- linux-2.4.34/drivers/media/video/bttvp.h.orig	2006-12-23 21:34:20.000000000 +0100
++++ linux-2.4.34/drivers/media/video/bttvp.h	2007-02-19 11:51:35.448134000 +0100
 @@ -1,11 +1,10 @@
  /*
      bttv - Bt848 frame grabber driver
@@ -10701,7 +10700,7 @@
  
      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
-@@ -26,132 +25,333 @@
+@@ -26,131 +25,332 @@
  #define _BTTVP_H_
  
  #include <linux/version.h>
@@ -10933,11 +10932,10 @@
 +/* our devices */
  #define BTTV_MAX 16
 -extern unsigned int bttv_num;			/* number of Bt848s in use */
+-
+-#define UNSET -1U
 +extern unsigned int bttv_num;
- extern struct bttv bttvs[BTTV_MAX];
  
--#define UNSET -1U
--
 -#ifdef VIDEODAT_HACK
 -# define VBI_MAXLINES   19
 -#else
@@ -10947,11 +10945,11 @@
  #define VBIBUF_SIZE     (2048*VBI_MAXLINES*2)
 -#define MAX_GBUFFERS	64
 -#define RISCMEM_LEN	(32744*2)
--
--#define BTTV_MAX_FBUF	0x208000
 +#define BTTV_TIMEOUT    (HZ/2) /* 0.5 seconds */
 +#define BTTV_FREE_IDLE  (HZ)   /* one second */
  
+-#define BTTV_MAX_FBUF	0x208000
+-
 -struct bttv_window 
 -{
 -	int x, y;
@@ -11117,7 +11115,7 @@
  
  	/* miro/pinnacle + Aimslab VHX
  	   philips matchbox (tea5757 radio tuner) support */
-@@ -167,68 +367,45 @@ struct bttv {
+@@ -166,70 +366,46 @@
  	int mbox_iow;
  	int mbox_csel;
  
@@ -11170,20 +11168,22 @@
 -	unsigned int last_field; /* number of last grabbed field */
 -	int i2c_command;
 -	int triton1;
+-
+-	int errors;
+-	int needs_restart;
+-
+-	wait_queue_head_t gpioq;
+-	int shutdown;
+-        void (*audio_hook)(struct bttv *btv, struct video_audio *v, int set);
 +	unsigned int users;
 +	struct bttv_fh init;
-+};
+ };
  
--	int errors;
--	int needs_restart;
 +/* private ioctls */
 +#define BTTV_VERSION            _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
 +#define BTTV_VBISIZE            _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
- 
--	wait_queue_head_t gpioq;
--	int shutdown;
--        void (*audio_hook)(struct bttv *btv, struct video_audio *v, int set);
--};
++
+ extern struct bttv bttvs[BTTV_MAX];
  #endif
  
 -#define btwrite(dat,adr)    writel((dat), (char *) (btv->bt848_mem+(adr)))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/32_bttv-2.4.26.diff?r1=1.2&r2=1.3&f=u