Allow backwards compatability with kernels < 2.6.12; add $id to tuner.h

4 files changed, 39 insertions, 5 deletions

diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c
index cd48516a9..16a4560d1 100644
--- a/linux/drivers/media/video/video-buf-dvb.c
+++ b/linux/drivers/media/video/video-buf-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: video-buf-dvb.c,v 1.8 2005/06/14 22:53:55 hhackmann Exp $
+ * $Id: video-buf-dvb.c,v 1.9 2005/06/18 04:00:19 mkrufky Exp $
  *
  * some helper function for simple DVB cards which simply DMA the
  * complete transport stream and let the computer sort everything else
@@ -149,10 +149,16 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
 		       dvb->name, result);
 		goto fail_adapter;
 	}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	dvb->adapter.priv = adapter_priv;
-
 	/* register frontend */
 	result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
+#else
+	dvb->adapter->priv = adapter_priv;
+	/* register frontend */
+	result = dvb_register_frontend(dvb->adapter, dvb->frontend);
+#endif
+
 	if (result < 0) {
 		printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",
 		       dvb->name, result);
@@ -178,7 +184,11 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
 	dvb->dmxdev.filternum    = 256;
 	dvb->dmxdev.demux        = &dvb->demux.dmx;
 	dvb->dmxdev.capabilities = 0;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
+#else
+	result = dvb_dmxdev_init(&dvb->dmxdev, dvb->adapter);
+#endif
 	if (result < 0) {
 		printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
 		       dvb->name, result);
@@ -209,7 +219,11 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
 	}
 
 	/* register network adapter */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
+#else
+	dvb_net_init(dvb->adapter, &dvb->net, &dvb->demux.dmx);
+#endif
 	return 0;
 
 fail_fe_conn:
@@ -223,7 +237,11 @@ fail_dmxdev:
 fail_dmx:
 	dvb_unregister_frontend(dvb->frontend);
 fail_frontend:
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	dvb_unregister_adapter(&dvb->adapter);
+#else
+	dvb_unregister_adapter(dvb->adapter);
+#endif
 fail_adapter:
 	return result;
 }
@@ -236,7 +254,11 @@ void videobuf_dvb_unregister(struct videobuf_dvb *dvb)
 	dvb_dmxdev_release(&dvb->dmxdev);
 	dvb_dmx_release(&dvb->demux);
 	dvb_unregister_frontend(dvb->frontend);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	dvb_unregister_adapter(&dvb->adapter);
+#else
+	dvb_unregister_adapter(dvb->adapter);
+#endif
 }
 
 EXPORT_SYMBOL(videobuf_dvb_register);
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 325397891..aa729ed9b 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,6 @@
 
-/*
+/* $Id: tuner.h,v 1.27 2005/06/18 04:00:19 mkrufky Exp $
+ *
     tuner.h - definition for different tuners
 
     Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h
index 865836f50..848459f79 100644
--- a/linux/include/media/video-buf-dvb.h
+++ b/linux/include/media/video-buf-dvb.h
@@ -1,5 +1,5 @@
 /*
- * $Id: video-buf-dvb.h,v 1.6 2005/06/14 22:53:55 hhackmann Exp $
+ * $Id: video-buf-dvb.h,v 1.7 2005/06/18 04:00:19 mkrufky Exp $
  */
 
 #include <dvbdev.h>
@@ -20,7 +20,11 @@ struct videobuf_dvb {
 	int                        nfeeds;
 
 	/* videobuf_dvb_(un)register manges this */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
 	struct dvb_adapter         adapter;
+#else
+	struct dvb_adapter         *adapter;
+#endif
 	struct dvb_demux           demux;
 	struct dmxdev              dmxdev;
 	struct dmx_frontend        fe_hw;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 1dbe3323e..afdd18613 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-17 23:54 mkrufky
+	* video-buf-dvb.c, video-buf-dvb.h:
+	- Allow backwards compatability with kernels < 2.6.12
+
+	* tuner.h
+	- ad $id
+
 2005-06-18  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 	* Make.config, Makefile, cx88-core.c, cx88-video.c: 
 	* cx88.h, msp3400.c, saa6752hs.c:
@@ -77,7 +84,7 @@
 	- Make all radio tuners use CAP_LOW by default.
 
 2005-06-15 13:50 mkrufky
-	* Make.conf:
+	* Make.config:
 
 	- Undo change accidentally made in previous commit