- Compile fixes against 2.5.63 (daemonize() has been changed)

- Fix various warnings against 2.5.63 (export-objs has been removed)
- Fix Kconfig/Makefiles
- add the "dpc7146" driver for the analog Philips reference design
- Removed unnecessary "Config.in"

9 files changed, 398 insertions, 30 deletions

diff --git a/linux/drivers/media/Config.in b/linux/drivers/media/Config.in
deleted file mode 100644
index 67b663158..000000000
--- a/linux/drivers/media/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Multimedia device configuration
-#
-mainmenu_option next_comment
-comment 'Multimedia devices'
-
-tristate 'Video For Linux' CONFIG_VIDEO_DEV
-if [ "$CONFIG_VIDEO_DEV" != "n" ]; then
-   source drivers/media/video/Config.in
-   source drivers/media/radio/Config.in
-   source drivers/media/dvb/Config.in
-fi
-
-endmenu
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig
index 22b991a9b..0814912c5 100644
--- a/linux/drivers/media/Kconfig
+++ b/linux/drivers/media/Kconfig
@@ -21,7 +21,7 @@ config VIDEO_DEV
 	  Documentation/video4linux/API.html.  Documentation for V4L2 is
 	  available on the web at http://bytesex.org/v4l/
 
-	  This driver is also available as a module called videodev.o ( = code
+	  This driver is also available as a module called videodev ( = code
 	  which can be inserted in and removed from the running kernel
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
diff --git a/linux/drivers/media/common/Kconfig b/linux/drivers/media/common/Kconfig
index 206ab6ea0..844e82dff 100644
--- a/linux/drivers/media/common/Kconfig
+++ b/linux/drivers/media/common/Kconfig
@@ -1,7 +1,7 @@
 config VIDEO_SAA7146
         tristate
-        default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y
-        default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m
+        default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y
+        default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m
         depends on VIDEO_DEV && PCI
 
 config VIDEO_VIDEOBUF
diff --git a/linux/drivers/media/common/Makefile b/linux/drivers/media/common/Makefile
index 526bf968c..6dababae9 100644
--- a/linux/drivers/media/common/Makefile
+++ b/linux/drivers/media/common/Makefile
@@ -1,5 +1,3 @@
-export-objs     :=  saa7146_core.o saa7146_fops.o saa7146_video.o saa7146_vbi.o video-buf.o
-
 saa7146-objs    := saa7146_i2c.o saa7146_core.o 
 saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o  
 
diff --git a/linux/drivers/media/dvb/dvb-core/Makefile b/linux/drivers/media/dvb/dvb-core/Makefile
index ec55e17d5..f0c7c7c4f 100644
--- a/linux/drivers/media/dvb/dvb-core/Makefile
+++ b/linux/drivers/media/dvb/dvb-core/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the kernel DVB device drivers.
 #
 
-export-objs     := dvb_ksyms.o dvb_ringbuffer.o
-
 dvb-core-objs = dvbdev.o compat.o dmxdev.o dvb_demux.o dvb_filter.o \
 		dvb_frontend.o dvb_i2c.o dvb_net.o dvb_ksyms.o dvb_ringbuffer.o
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 7acab95e5..8a0f81934 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -435,7 +435,7 @@ int dvb_frontend_thread (void *data)
 	dprintk ("%s\n", __FUNCTION__);
 
 	lock_kernel ();
-	daemonize ();
+	daemonize ("dvb fe");
 /*	not needed anymore in 2.5.x, done in daemonize() */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 	reparent_to_init ();
diff --git a/linux/drivers/media/video/dpc7146.c b/linux/drivers/media/video/dpc7146.c
new file mode 100644
index 000000000..4c524568f
--- /dev/null
+++ b/linux/drivers/media/video/dpc7146.c
@@ -0,0 +1,388 @@
+/*
+    dpc7146.c - v4l2 driver for the dpc7146 demonstration board
+    
+    Copyright (C) 2000-2003 Michael Hunold <michael@mihu.de>
+
+    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.
+*/
+
+#define DEBUG_VARIABLE debug
+#include "saa7146_vv.h"
+
+#include <linux/video_decoder.h>	/* for saa7111a */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
+	#define KBUILD_MODNAME dpc7146
+#endif
+
+#define I2C_SAA7111A            0x24
+
+/* All unused bytes are reserverd. */
+#define SAA711X_CHIP_VERSION            0x00
+#define SAA711X_ANALOG_INPUT_CONTROL_1  0x02
+#define SAA711X_ANALOG_INPUT_CONTROL_2  0x03
+#define SAA711X_ANALOG_INPUT_CONTROL_3  0x04
+#define SAA711X_ANALOG_INPUT_CONTROL_4  0x05
+#define SAA711X_HORIZONTAL_SYNC_START   0x06
+#define SAA711X_HORIZONTAL_SYNC_STOP    0x07
+#define SAA711X_SYNC_CONTROL            0x08
+#define SAA711X_LUMINANCE_CONTROL       0x09
+#define SAA711X_LUMINANCE_BRIGHTNESS    0x0A
+#define SAA711X_LUMINANCE_CONTRAST      0x0B
+#define SAA711X_CHROMA_SATURATION       0x0C
+#define SAA711X_CHROMA_HUE_CONTROL      0x0D
+#define SAA711X_CHROMA_CONTROL          0x0E
+#define SAA711X_FORMAT_DELAY_CONTROL    0x10
+#define SAA711X_OUTPUT_CONTROL_1        0x11
+#define SAA711X_OUTPUT_CONTROL_2        0x12
+#define SAA711X_OUTPUT_CONTROL_3        0x13
+#define SAA711X_V_GATE_1_START          0x15
+#define SAA711X_V_GATE_1_STOP           0x16
+#define SAA711X_V_GATE_1_MSB            0x17
+#define SAA711X_TEXT_SLICER_STATUS      0x1A
+#define SAA711X_DECODED_BYTES_OF_TS_1   0x1B
+#define SAA711X_DECODED_BYTES_OF_TS_2   0x1C
+#define SAA711X_STATUS_BYTE             0x1F
+
+#define DPC_BOARD_CAN_DO_VBI(dev)   (dev->revision != 0) 
+
+static int debug = 0;
+MODULE_PARM(debug,"i");
+MODULE_PARM_DESC(debug, "debug verbosity");
+
+/* global variables */
+int dpc_num = 0;
+
+#define DPC_INPUTS	2
+static struct v4l2_input dpc_inputs[DPC_INPUTS] = {
+	{ 0, "Port A",	V4L2_INPUT_TYPE_CAMERA,	2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },
+	{ 1, "Port B",	V4L2_INPUT_TYPE_CAMERA,	2, 0, V4L2_STD_PAL_BG|V4L2_STD_NTSC_M, 0 },
+};
+
+#define DPC_AUDIOS	0
+
+static struct saa7146_extension_ioctls ioctls[] = {
+	{ VIDIOC_G_INPUT,	SAA7146_EXCLUSIVE },
+	{ VIDIOC_S_INPUT,	SAA7146_EXCLUSIVE },
+	{ VIDIOC_ENUMINPUT, 	SAA7146_EXCLUSIVE },
+	{ VIDIOC_S_STD,		SAA7146_AFTER },
+	{ 0,			0 }
+};
+
+struct dpc
+{
+	struct video_device	video_dev;
+	struct video_device	vbi_dev;
+
+	struct i2c_adapter	i2c_adapter;	
+	struct i2c_client	*saa7111a;
+	
+	int cur_input;	/* current input */
+};
+
+/* fixme: add vbi stuff here, look at dpc.c */
+
+static int dpc_probe(struct saa7146_dev* dev)
+{
+	struct dpc* dpc = 0;	
+	int i = 0;
+
+	dpc = (struct dpc*)kmalloc(sizeof(struct dpc), GFP_KERNEL);
+	if( NULL == dpc ) {
+		printk("dpc_v4l2.o: dpc_attach: not enough kernel memory.\n");
+		return -ENOMEM;
+	}
+	memset(dpc, 0x0, sizeof(struct dpc));	
+
+	/* FIXME: enable i2c-port pins, video-port-pins
+	   video port pins should be enabled here ?! */
+	saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
+
+	saa7146_i2c_adapter_prepare(dev, &dpc->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
+	if(i2c_add_adapter(&dpc->i2c_adapter) < 0) {
+		DEB_S(("cannot register i2c-device. skipping.\n"));
+		kfree(dpc);
+		return -EFAULT;
+	}
+
+	/* loop through all i2c-devices on the bus and look who is there */
+	for(i = 0; i < dpc->i2c_adapter.client_count; i++) {
+		if( I2C_SAA7111A == dpc->i2c_adapter.clients[i]->addr ) 
+			dpc->saa7111a = dpc->i2c_adapter.clients[i];
+	}
+
+	/* check if all devices are present */
+	if( 0 == dpc->saa7111a ) {
+		DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n"));	
+		kfree(dpc);
+		return -ENODEV;
+	}
+	
+	/* all devices are present, probe was successful */	
+	DEB_D(("dpc_v4l2.o: dpc_probe succeeded for this device.\n"));	
+
+	/* we store the pointer in our private data field */
+	(struct dpc*)dev->ext_priv = dpc;
+
+	return 0;
+}
+
+/* bring hardware to a sane state. this has to be done, just in case someone
+   wants to capture from this device before it has been properly initialized.
+   the capture engine would badly fail, because no valid signal arrives on the
+   saa7146, thus leading to timeouts and stuff. */
+static int dpc_init_done(struct saa7146_dev* dev)
+{
+	struct dpc* dpc = (struct dpc*)dev->ext_priv;
+
+	DEB_D(("dpc_v4l2.o: dpc_init_done called.\n"));
+
+	/* initialize the helper ics to useful values */
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x00, 0x11);
+
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x02, 0xc0);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x03, 0x30);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x04, 0x00);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x05, 0x00);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x06, 0xde);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x07, 0xad);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x08, 0xa8);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x09, 0x00);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x0a, 0x80);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x0b, 0x47);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x0c, 0x40);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x0d, 0x00);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x0e, 0x03);
+
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x10, 0xd0);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x11, 0x1c);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x12, 0xc1);
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x13, 0x30);
+
+	i2c_smbus_write_byte_data(dpc->saa7111a, 0x1f, 0x81);
+
+	return 0;
+}
+
+/* this function only gets called when the probing was successful */
+static int dpc_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
+{
+	struct dpc* dpc = (struct dpc*)dev->ext_priv;
+	
+	DEB_D(("dpc_v4l2.o: dpc_attach called.\n"));
+
+	/* checking for i2c-devices can be omitted here, because we
+	   already did this in "dpc_vl42_probe" */
+
+	saa7146_vv_init(dev);
+	if( 0 != saa7146_register_device(&dpc->video_dev, dev, "dpc", VFL_TYPE_GRABBER)) {
+		ERR(("cannot register capture v4l2 device. skipping.\n"));
+		return -1;
+	}
+	
+	/* initialization stuff (vbi) (only for revision > 0 and for extensions which want it)*/
+	if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {
+		if( 0 != saa7146_register_device(&dpc->vbi_dev, dev, "dpc", VFL_TYPE_VBI)) {
+			ERR(("cannot register vbi v4l2 device. skipping.\n"));
+		}
+	}
+
+	i2c_use_client(dpc->saa7111a);
+
+	printk("dpc: found 'dpc7146 demonstration board'-%d.\n",dpc_num);
+
+	dpc_num++;
+	
+	/* the rest */
+	dpc->cur_input = 0;
+	dpc_init_done(dev);
+	
+	return 0;
+}
+
+static int dpc_detach(struct saa7146_dev* dev)
+{
+	struct dpc* dpc = (struct dpc*)dev->ext_priv;
+	
+	DEB_EE(("dev:%p\n",dev));
+
+	i2c_release_client(dpc->saa7111a);
+
+	saa7146_unregister_device(&dpc->video_dev,dev);
+	if( 0 != DPC_BOARD_CAN_DO_VBI(dev)) {
+		saa7146_unregister_device(&dpc->vbi_dev,dev);
+	}
+	saa7146_vv_release(dev);
+
+	dpc_num--;
+
+	i2c_del_adapter(&dpc->i2c_adapter);
+	kfree(dpc);
+	return 0;
+}
+
+#ifdef axa
+int dpc_vbi_bypass(struct saa7146_dev* dev)
+{
+	struct dpc* dpc = (struct dpc*)dev->ext_priv;
+	
+	int i = 1;
+
+	/* switch bypass in saa7111a */
+	if ( 0 != dpc->saa7111a->driver->command(dpc->saa7111a,SAA711X_VBI_BYPASS, &i)) {
+		printk("dpc_v4l2.o: VBI_BYPASS: could not address saa7111a.\n");
+		return -1;
+	}			
+
+	return 0;
+}
+#endif
+
+static int dpc_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg) 
+{
+	struct dpc* dpc = (struct dpc*)dev->ext_priv;
+/*
+	struct saa7146_vv *vv = dev->vv_data; 
+*/
+	switch(cmd)
+	{
+	case VIDIOC_ENUMINPUT:
+	{
+		struct v4l2_input *i = arg;
+		DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i->index));
+		
+		if( i->index < 0 || i->index >= DPC_INPUTS) {
+			return -EINVAL;
+		}
+		
+		memcpy(i, &dpc_inputs[i->index], sizeof(struct v4l2_input));
+
+		DEB_D(("dpc_v4l2.o: v4l2_ioctl: VIDIOC_ENUMINPUT %d.\n",i->index));
+		return 0;
+	}
+	case VIDIOC_G_INPUT:
+	{
+		int *input = (int *)arg;
+		*input = dpc->cur_input;
+
+		DEB_D(("dpc_v4l2.o: VIDIOC_G_INPUT: %d\n",*input));
+		return 0;
+	}
+	case VIDIOC_S_INPUT:
+	{
+		int	input = *(int *)arg;
+
+		if (input < 0 || input >= DPC_INPUTS) {
+			return -EINVAL;
+		}
+	
+		dpc->cur_input = input;
+
+		/* fixme: switch input here, switch audio, too! */
+//		saa7146_set_hps_source_and_sync(dev, input_port_selection[input].hps_source, input_port_selection[input].hps_sync);
+		printk("dpc_v4l2.o: VIDIOC_S_INPUT: fixme switch input.\n");
+		
+		return 0;
+	}
+	default:
+/*
+		DEB_D(("dpc_v4l2.o: v4l2_ioctl does not handle this ioctl.\n"));
+*/
+		return -ENOIOCTLCMD;
+	}
+	return 0;
+}
+
+static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
+{
+	return 0;
+}
+
+static struct saa7146_standard standard[] = {
+	{ "PAL-BG",	V4L2_STD_PAL_BG,	SAA7146_PAL_VALUES },
+	{ "PAL-I",	V4L2_STD_PAL_I,		SAA7146_PAL_VALUES },
+	{ "NTSC",	V4L2_STD_NTSC,		SAA7146_NTSC_VALUES },
+	{ "SECAM", 	V4L2_STD_SECAM,		SAA7146_SECAM_VALUES },
+};
+
+static
+struct saa7146_extension extension;
+
+static
+struct saa7146_pci_extension_data dpc = {
+        .ext_priv = "Multimedia eXtension Board",
+        .ext = &extension,
+};
+
+static
+struct pci_device_id pci_tbl[] = {
+	{
+		.vendor    = PCI_VENDOR_ID_PHILIPS,
+		.device	   = PCI_DEVICE_ID_PHILIPS_SAA7146,
+		.subvendor = 0x0000,
+		.subdevice = 0x0000,
+		.driver_data = (unsigned long)&dpc,
+	}
+};
+
+static
+struct saa7146_ext_vv vv_data = {
+	.inputs		= DPC_INPUTS,
+	.capabilities	= V4L2_CAP_VBI_CAPTURE,
+	.stds		= &standard[0],
+	.num_stds	= sizeof(standard)/sizeof(struct saa7146_standard),
+	.std_callback	= &std_callback, 
+	.ioctls		= &ioctls[0],
+	.ioctl		= dpc_ioctl,
+};
+
+static
+struct saa7146_extension extension = {
+	.name		= "dpc7146 demonstration board",
+	.flags		= SAA7146_USE_I2C_IRQ,
+	
+	.pci_tbl	= &pci_tbl[0],
+	.module		= THIS_MODULE,
+	.ext_vv_data	= &vv_data,
+
+	.probe		= dpc_probe,
+	.attach		= dpc_attach,
+	.detach		= dpc_detach,
+
+	.irq_mask	= 0,
+	.irq_func	= NULL,
+};	
+
+int __init dpc_init_module(void) 
+{
+	if( 0 != saa7146_register_extension(&extension)) {
+		DEB_S(("failed to register extension.\n"));
+		return -ENODEV;
+	}
+	
+	return 0;
+}
+
+void __exit dpc_cleanup_module(void) 
+{
+	saa7146_unregister_extension(&extension);
+}
+
+module_init(dpc_init_module);
+module_exit(dpc_cleanup_module);
+
+MODULE_DESCRIPTION("video4linux-2 driver for the 'dpc7146 demonstration board'");
+MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
+MODULE_LICENSE("GPL");
diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c
index b12daa05d..b7e459371 100644
--- a/linux/drivers/media/video/mxb.c
+++ b/linux/drivers/media/video/mxb.c
@@ -3,6 +3,9 @@
     
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
 
+    Visit http://www.mihu.de/linux/saa7146/mxb/
+    for further details about this card.
+    
     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
@@ -201,7 +204,6 @@ static int mxb_vbi_bypass(struct saa7146_dev* dev)
 static int mxb_probe(struct saa7146_dev* dev)
 {
 	struct mxb* mxb = 0;
-
 	int i = 0;	
 
 	mxb = (struct mxb*)kmalloc(sizeof(struct mxb), GFP_KERNEL);
@@ -389,8 +391,7 @@ static int mxb_init_done(struct saa7146_dev* dev)
 	vm.in  = 3;
 	vm.out = 13;
 	mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm);
-
-							
+				
 	/* tune in some frequency on tuner */
 	mxb->tuner->driver->command(mxb->tuner, VIDIOCSFREQ, &freq);
 
diff --git a/linux/lib/Makefile b/linux/lib/Makefile
index 5071969b0..00e75e2b1 100644
--- a/linux/lib/Makefile
+++ b/linux/lib/Makefile
@@ -8,12 +8,9 @@
 
 L_TARGET := lib.a
 
-export-objs := cmdline.o dec_and_lock.o rwsem-spinlock.o rwsem.o \
-	       crc32.o rbtree.o radix-tree.o kobject.o
-
 obj-y := errno.o ctype.o string.o vsprintf.o brlock.o cmdline.o \
 	 bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \
-	 kobject.o
+	 kobject.o idr.o
 
 obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
 obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
@@ -28,7 +25,7 @@ obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
 obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
 
 include $(TOPDIR)/drivers/net/Makefile.lib
-include $(TOPDIR)/drivers/usb/class/Makefile.lib
+include $(TOPDIR)/drivers/usb/Makefile.lib
 include $(TOPDIR)/fs/Makefile.lib
 include $(TOPDIR)/net/bluetooth/bnep/Makefile.lib
 include $(TOPDIR)/drivers/media/dvb/dvb-core/Makefile.lib