V4L/DVB (3546): Fix Compilation after moving bttv code

- Missing a Makefile for bt8xx
- rds.h were at wrong directory, since it is a global header for an internal
  interface
- tda7432 and tda9875 were dependent from bttv.h
- bttv.h were holding i2c addresses

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile
new file mode 100644 (file)
index 0000000..94350f2
--- /dev/null
+++ b/drivers/media/video/bt8xx/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the video capture/playback device drivers.
+#
+
+bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \
+                      bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \
+                      bttv-input.o
+
+obj-$(CONFIG_VIDEO_BT848) += bttv.o
+
+EXTRA_CFLAGS += -I$(src)/..
+EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 2505ae5a7b9721f981f47dbdf3cd91d4bc64649a..71535775f2e86d96dda811230be613932289c581 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -42,7 +42,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
-#include "rds.h"
+#include <media/rds.h>
 
 
 unsigned int bttv_num;                 /* number of Bt848s in use */

diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index 9908c8e0c951636e68c1121f2e2b4a7262194020..ebde3e8219cf08c412a30501cee0ba739bb2a7d0 100644 (file)
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
+#include <media/i2c-addr.h>
 
 /* ---------------------------------------------------------- */
 /* exported by bttv-cards.c                                   */
@@ -168,25 +169,6 @@
 #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB     0x8f
 #define BTTV_BOARD_MACHTV_MAGICTV          0x90
 
-/* i2c address list */
-#define I2C_TSA5522        0xc2
-#define I2C_TDA7432        0x8a
-#define I2C_BT832_ALT1    0x88
-#define I2C_BT832_ALT2    0x8a // alternate setting
-#define I2C_TDA8425        0x82
-#define I2C_TDA9840        0x84
-#define I2C_TDA9850        0xb6 /* also used by 9855,9873 */
-#define I2C_TDA9874        0xb0 /* also used by 9875 */
-#define I2C_TDA9875        0xb0
-#define I2C_HAUPEE         0xa0
-#define I2C_STBEE          0xae
-#define I2C_VHX            0xc0
-#define I2C_MSP3400        0x80
-#define I2C_MSP3400_ALT    0x88
-#define I2C_TEA6300        0x80 /* also used by 6320 */
-#define I2C_DPL3518       0x84
-#define I2C_TDA9887       0x86
-
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10
 #define PT2254_R_CHANNEL 0x08

diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index d17395c4f55cb9a17b1e2e5adb0b6bc00df85cf5..a81285ca7d5bcbb98d54f8bb326536e064442815 100644 (file)
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -32,7 +32,7 @@
 #include <asm/uaccess.h>
 
 
-#include "rds.h"
+#include <media/rds.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {

diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 15405d1e16754931888c4c65b69e24ff68ff4223..c98571c9d5a639df1470003475f07c281580727f 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -960,7 +960,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        if (saa7134_no_overlay <= 0) {
                saa7134_video_template.type |= VID_TYPE_OVERLAY;
        } else {
-               printk("bttv: Overlay support disabled.\n");
+               printk("%s: Overlay support disabled.\n",dev->name);
        }
        dev->video_dev = vdev_init(dev,&saa7134_video_template,"video");
        err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,

diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index fc3d5824efffd330a828e64d04c5e58460ed118e..600dacb873f4c8f25505e116d552825355bfb020 100644 (file)
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -48,9 +48,9 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include "bttv.h"
 #include <media/audiochip.h>
 #include <media/v4l2-common.h>
+#include <media/i2c-addr.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
 # define VIDEO_AUDIO_BALANCE 32

diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index ef98c49822507f63d5ffbf710890541cdc8c2e6c..8a1e58e72c00beb5af5586e136f87a530f6c36d1 100644 (file)
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -30,14 +30,14 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
 
-#include "bttv.h"
 #include <media/audiochip.h>
 
+#include <media/i2c-addr.h>
+
 static int debug; /* insmod parameter */
 module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_LICENSE("GPL");
 
-
 /* Addresses to scan */
 static unsigned short normal_i2c[] =  {
     I2C_TDA9875 >> 1,

diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h
new file mode 100644 (file)
index 0000000..4212832
--- /dev/null
+++ b/include/media/i2c-addr.h
@@ -0,0 +1,30 @@
+/*
+ *  V4L I2C address list
+ *
+ *
+ *  Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
+ *     Based on a previous mapping by
+ *             Ralph Metzler (rjkm@thp.uni-koeln.de)
+ *             Gerd Knorr <kraxel@goldbach.in-berlin.de>
+ *
+ */
+
+/* bttv address list */
+#define I2C_TSA5522        0xc2
+#define I2C_TDA7432        0x8a
+#define I2C_BT832_ALT1    0x88
+#define I2C_BT832_ALT2    0x8a // alternate setting
+#define I2C_TDA8425        0x82
+#define I2C_TDA9840        0x84
+#define I2C_TDA9850        0xb6 /* also used by 9855,9873 */
+#define I2C_TDA9874        0xb0 /* also used by 9875 */
+#define I2C_TDA9875        0xb0
+#define I2C_HAUPEE         0xa0
+#define I2C_STBEE          0xae
+#define I2C_VHX            0xc0
+#define I2C_MSP3400        0x80
+#define I2C_MSP3400_ALT    0x88
+#define I2C_TEA6300        0x80 /* also used by 6320 */
+#define I2C_DPL3518       0x84
+#define I2C_TDA9887       0x86
+

diff --git a/drivers/media/video/rds.h b/include/media/rds.h
similarity index 99%
rename from drivers/media/video/rds.h
rename to include/media/rds.h
index 0d30eb744e61abae812fb8098007308e65bc5c89..951c1ae0be7436b606274a63276407f8f8e60a00 100644 (file)
--- a/drivers/media/video/rds.h
+++ b/include/media/rds.h
@@ -42,7 +42,3 @@ struct rds_command {
 #define RDS_CMD_POLL   _IOR('R',4,int)
 
 #endif
-
-
-
-