It's hard to keep these drivers to compile under 2.4. because of the

ongoing i2c changes in 2.5. Because of the fact that they are already
in the kernel and won't change any more, they can be removed here
and added to the build-2.4 directory.

1 files changed, 0 insertions, 460 deletions

diff --git a/linux/drivers/media/video/saa7111.c b/linux/drivers/media/video/saa7111.c
deleted file mode 100644
index 286ee8f0d..000000000
--- a/linux/drivers/media/video/saa7111.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/* 
-    saa7111 - Philips SAA7111A video decoder driver version 0.0.3
-
-    Copyright (C) 1998 Dave Perks <dperks@ibm.net>
-
-    Slight changes for video timing and attachment output by
-    Wolfgang Scherr <scherr@net4you.net>
-    
-    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
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-
-#include <linux/videodev.h>
-#include <linux/version.h>
-#include <linux/i2c.h>
-
-#include <linux/video_decoder.h>
-
-#define DEBUG(x)		/* Debug driver */
-
-/* ----------------------------------------------------------------------- */
-
-struct saa7111 {
-	struct i2c_client *client;
-	int addr;
-	struct semaphore lock;
-	unsigned char reg[32];
-
-	int norm;
-	int input;
-	int enable;
-	int bright;
-	int contrast;
-	int hue;
-	int sat;
-};
-
-static unsigned short normal_i2c[] = { 0x24, 0x25, I2C_CLIENT_END };	
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };	
-
-I2C_CLIENT_INSMOD;
-
-static struct i2c_client client_template;
-/* ----------------------------------------------------------------------- */
-static int saa7111_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
-{
-	int i;
-	struct saa7111 *decoder;
-	struct i2c_client *client;
-
-	/* who wrote this? init[] is used for i2c_master_send() which expects an array that
-	   will be used for the 'buf' part of an i2c message unchanged. so, the first byte
-	   needs to be the subaddress to start with, then follow the data bytes... */
-	static const unsigned char init[] = {
-		0x00,	  /* start address */
-	
-		0x00,	  /* 00 - ID byte */
-		0x00,	  /* 01 - reserved */
-
-		/*front end */
-		0xd0,	  /* 02 - FUSE=3, GUDL=2, MODE=0 */
-		0x23,	  /* 03 - HLNRS=0, VBSL=1, WPOFF=0, HOLDG=0, GAFIX=0, GAI1=256, GAI2=256 */
-		0x00,	  /* 04 - GAI1=256 */
-		0x00,	  /* 05 - GAI2=256 */
-
-		/* decoder */
-		0xf3,	  /* 06 - HSB at  13(50Hz) /  17(60Hz) pixels after end of last line */
-		0x13,	  /* 07 - HSS at 113(50Hz) / 117(60Hz) pixels after end of last line */
-		0xc8,	  /* 08 - AUFD=1, FSEL=1, EXFIL=0, VTRC=1, HPLL=0, VNOI=0 */
-		0x01,	  /* 09 - BYPS=0, PREF=0, BPSS=0, VBLB=0, UPTCV=0, APER=1 */
-		0x80,	  /* 0a - BRIG=128 */
-		0x47,	  /* 0b - CONT=1.109 */
-		0x40,	  /* 0c - SATN=1.0 */
-		0x00,	  /* 0d - HUE=0 */
-		0x01,	  /* 0e - CDTO=0, CSTD=0, DCCF=0, FCTC=0, CHBW=1 */
-		0x00,	  /* 0f - reserved */
-		0x48,	  /* 10 - OFTS=1, HDEL=0, VRLN=1, YDEL=0 */
-		0x1c,	  /* 11 - GPSW=0, CM99=0, FECO=0, COMPO=1, OEYC=1, OEHV=1, VIPB=0, COLO=0 */
-		0x00,	  /* 12 - output control 2 */
-		0x00,	  /* 13 - output control 3 */
-		0x00,	  /* 14 - reserved */
-		0x00,	  /* 15 - VBI */
-		0x00,	  /* 16 - VBI */
-		0x00,	  /* 17 - VBI */
-	};
-	client = kmalloc(sizeof(*client), GFP_KERNEL);
-	if(client == NULL) 
-		return -ENOMEM;
-	client_template.adapter = adap;
-	client_template.addr = addr;
-	memcpy(client, &client_template, sizeof(*client));
-
-	decoder = kmalloc(sizeof(*decoder), GFP_KERNEL);
-	if (decoder == NULL)
-	{
-		kfree(client);
-		return -ENOMEM;
-	}
-
-	memset(decoder, 0, sizeof(*decoder));
-	decoder->client = client;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	client->data = decoder;		
-#else
-	i2c_set_clientdata(client, decoder);
-#endif
-	decoder->addr = addr;
-	decoder->norm = VIDEO_MODE_NTSC;
-	decoder->input = 0;
-	decoder->enable = 1;
-	decoder->bright = 32768;
-	decoder->contrast = 32768;
-	decoder->hue = 32768;
-	decoder->sat = 32768;
-
-	i = i2c_master_send(client, init, sizeof(init));
-	if (i < 0) {
-		printk(KERN_ERR "%s_attach: init status %d\n",
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-		       client->name, i);
-#else
-		       client->dev.name, i);
-#endif
-	} else {
-		printk(KERN_INFO "%s_attach: chip version %x @ 0x%08x\n",
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-		       client->name, i2c_smbus_read_byte_data(client, 0x00) >> 4,addr);
-#else
-		       client->dev.name, i2c_smbus_read_byte_data(client, 0x00) >> 4,addr);
-#endif
-	}
-
-	init_MUTEX(&decoder->lock);
-	i2c_attach_client(client);
-	MOD_INC_USE_COUNT;
-	return 0;
-}
-static int saa7111_probe(struct i2c_adapter *adap)
-{
-	/* probing unknown devices on any Matrox i2c-bus takes ages due to the
-	   slow bit banging algorithm used. because of the fact a saa7111(a)
-	   is *never* present on a Matrox gfx card, we can skip such adapters
-	   here */
-	if( 0 != (adap->id & I2C_HW_B_G400)) {
-		return -ENODEV;
-	}
-	
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	printk("saa7111: probing %s i2c adapter [id=0x%x]\n",
-                       adap->name,adap->id);
-#else
-	printk("saa7111: probing %s i2c adapter [id=0x%x]\n",
-                       adap->dev.name,adap->id);
-#endif
-	return i2c_probe(adap, &addr_data, saa7111_attach);
-}
-
-static int saa7111_detach(struct i2c_client *client)
-{
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	struct saa7111 *decoder = client->data;
-#else
-	struct saa7111 *decoder = i2c_get_clientdata(client);
-#endif
-	i2c_detach_client(client);
-	kfree(decoder);
-	kfree(client);
-	MOD_DEC_USE_COUNT;
-	return 0;
-}
-
-static int saa7111_command(struct i2c_client *client, unsigned int cmd,
-			   void *arg)
-{
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	struct saa7111 *decoder = client->data;
-#else
-	struct saa7111 *decoder = i2c_get_clientdata(client);
-#endif
-	switch (cmd) {
-
-#if defined(DECODER_DUMP)
-	case DECODER_DUMP:
-		{
-			int i;
-
-			for (i = 0; i < 32; i += 16) {
-				int j;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-				printk("KERN_DEBUG %s: %03x", client->name,
-#else
-				printk("KERN_DEBUG %s: %03x", client->dev.name,
-#endif
-				       i);
-				for (j = 0; j < 16; ++j) {
-					printk(" %02x",
-					       i2c_smbus_read_byte_data(client,
-							    i + j));
-				}
-				printk("\n");
-			}
-		}
-		break;
-#endif				/* defined(DECODER_DUMP) */
-	case DECODER_GET_CAPABILITIES:
-		{
-			struct video_decoder_capability *cap = arg;
-
-			cap->flags
-			    = VIDEO_DECODER_PAL
-			    | VIDEO_DECODER_NTSC
-			    | VIDEO_DECODER_AUTO | VIDEO_DECODER_CCIR;
-			cap->inputs = 8;
-			cap->outputs = 1;
-		}
-		break;
-	case DECODER_GET_STATUS:
-		{
-			int *iarg = arg;
-			int status;
-			int res;
-
-			status = i2c_smbus_read_byte_data(client, 0x1f);
-			res = 0;
-			if ((status & (1 << 6)) == 0) {
-				res |= DECODER_STATUS_GOOD;
-			}
-			switch (decoder->norm) {
-			case VIDEO_MODE_NTSC:
-				res |= DECODER_STATUS_NTSC;
-				break;
-			case VIDEO_MODE_PAL:
-				res |= DECODER_STATUS_PAL;
-				break;
-			default:
-			case VIDEO_MODE_AUTO:
-				if ((status & (1 << 5)) != 0) {
-					res |= DECODER_STATUS_NTSC;
-				} else {
-					res |= DECODER_STATUS_PAL;
-				}
-				break;
-			}
-			if ((status & (1 << 0)) != 0) {
-				res |= DECODER_STATUS_COLOR;
-			}
-			*iarg = res;
-		}
-		break;
-
-	case DECODER_SET_NORM:
-		{
-			int *iarg = arg;
-
-			switch (*iarg) {
-
-			case VIDEO_MODE_NTSC:
-				i2c_smbus_write_byte_data(client, 0x08,
-					      (decoder->
-					       reg[0x08] & 0x3f) | 0x40);
-				break;
-
-			case VIDEO_MODE_PAL:
-				i2c_smbus_write_byte_data(client, 0x08,
-					      (decoder->
-					       reg[0x08] & 0x3f) | 0x00);
-				break;
-
-			case VIDEO_MODE_AUTO:
-				i2c_smbus_write_byte_data(client, 0x08,
-					      (decoder->
-					       reg[0x08] & 0x3f) | 0x80);
-				break;
-
-			default:
-				return -EINVAL;
-
-			}
-			decoder->norm = *iarg;
-		}
-		break;
-
-	case DECODER_SET_INPUT:
-		{
-			int *iarg = arg;
-
-			if (*iarg < 0 || *iarg > 7) {
-				return -EINVAL;
-			}
-
-			if (decoder->input != *iarg) {
-				decoder->input = *iarg;
-				/* select mode */
-				i2c_smbus_write_byte_data(client, 0x02,
-					      (decoder->
-					       reg[0x02] & 0xf8) |
-					      decoder->input);
-				/* bypass chrominance trap for modes 4..7 */
-				i2c_smbus_write_byte_data(client, 0x09,
-					      (decoder->
-					       reg[0x09] & 0x7f) |
-					      ((decoder->input >
-						3) ? 0x80 : 0));
-			}
-		}
-		break;
-
-	case DECODER_SET_OUTPUT:
-		{
-			int *iarg = arg;
-
-			/* not much choice of outputs */
-			if (*iarg != 0) {
-				return -EINVAL;
-			}
-		}
-		break;
-
-	case DECODER_ENABLE_OUTPUT:
-		{
-			int *iarg = arg;
-			int enable = (*iarg != 0);
-
-			if (decoder->enable != enable) {
-				decoder->enable = enable;
-
-// RJ: If output should be disabled (for playing videos), we also need a open PLL.
-//     The input is set to 0 (where no input source is connected), although this
-//     is not necessary.
-//
-//     If output should be enabled, we have to reverse the above.
-
-				if (decoder->enable) {
-					i2c_smbus_write_byte_data(client, 0x02,
-						      (decoder->
-						       reg[0x02] & 0xf8) |
-						      decoder->input);
-					i2c_smbus_write_byte_data(client, 0x08,
-						      (decoder->
-						       reg[0x08] & 0xfb));
-					i2c_smbus_write_byte_data(client, 0x11,
-						      (decoder->
-						       reg[0x11] & 0xf3) |
-						      0x0c);
-				} else {
-					i2c_smbus_write_byte_data(client, 0x02,
-						      (decoder->
-						       reg[0x02] & 0xf8));
-					i2c_smbus_write_byte_data(client, 0x08,
-						      (decoder->
-						       reg[0x08] & 0xfb) |
-						      0x04);
-					i2c_smbus_write_byte_data(client, 0x11,
-						      (decoder->
-						       reg[0x11] & 0xf3));
-				}
-			}
-		}
-		break;
-
-	case DECODER_SET_PICTURE:
-		{
-			struct video_picture *pic = arg;
-
-			if (decoder->bright != pic->brightness) {
-				/* We want 0 to 255 we get 0-65535 */
-				decoder->bright = pic->brightness;
-				i2c_smbus_write_byte_data(client, 0x0a,
-					      decoder->bright >> 8);
-			}
-			if (decoder->contrast != pic->contrast) {
-				/* We want 0 to 127 we get 0-65535 */
-				decoder->contrast = pic->contrast;
-				i2c_smbus_write_byte_data(client, 0x0b,
-					      decoder->contrast >> 9);
-			}
-			if (decoder->sat != pic->colour) {
-				/* We want 0 to 127 we get 0-65535 */
-				decoder->sat = pic->colour;
-				i2c_smbus_write_byte_data(client, 0x0c,
-					      decoder->sat >> 9);
-			}
-			if (decoder->hue != pic->hue) {
-				/* We want -128 to 127 we get 0-65535 */
-				decoder->hue = pic->hue;
-				i2c_smbus_write_byte_data(client, 0x0d,
-					      (decoder->hue - 32768) >> 8);
-			}
-		}
-		break;
-
-	default:
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-static struct i2c_driver i2c_driver_saa7111 = {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,54)
-	.owner		= THIS_MODULE,
-#endif
-	.name 		= "saa7111",		 /* name */
-	.id 		= I2C_DRIVERID_SAA7111A, /* ID */
-	.flags 		= I2C_DF_NOTIFY,
-	.attach_adapter = saa7111_probe,
-	.detach_client 	= saa7111_detach,
-	.command 	= saa7111_command
-};
-
-static struct i2c_client client_template = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	.name 	= "saa7111_client",
-#else
-	.dev	= {
-		.name	= "saa7111_client",
-	},
-#endif
-	.id 	= -1,
-	.driver = &i2c_driver_saa7111
-};
-
-static int saa7111_init(void)
-{
-	return i2c_add_driver(&i2c_driver_saa7111);
-}
-
-static void saa7111_exit(void)
-{
-	i2c_del_driver(&i2c_driver_saa7111);
-}
-
-module_init(saa7111_init);
-module_exit(saa7111_exit);
-MODULE_LICENSE("GPL");