diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-23 19:45:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 14:26:51 -0500 |
commit | fa3fcceb30eb8a3cb2ac299c207c6f89b9aed379 (patch) | |
tree | 5cd9df4a0591aec9c1e69f19c2f34c40a0914f2a | |
parent | c72602b8250cc0d3ace59d1a7334c5cd7aa9490e (diff) |
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>
-rw-r--r-- | drivers/media/video/bt8xx/Makefile | 12 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 2 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 20 | ||||
-rw-r--r-- | drivers/media/video/saa6588.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tda7432.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tda9875.c | 4 | ||||
-rw-r--r-- | include/media/i2c-addr.h | 30 | ||||
-rw-r--r-- | include/media/rds.h (renamed from drivers/media/video/rds.h) | 4 |
9 files changed, 49 insertions, 29 deletions
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile new file mode 100644 index 000000000000..94350f21cdc0 --- /dev/null +++ b/drivers/media/video/bt8xx/Makefile | |||
@@ -0,0 +1,12 @@ | |||
1 | # | ||
2 | # Makefile for the video capture/playback device drivers. | ||
3 | # | ||
4 | |||
5 | bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ | ||
6 | bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \ | ||
7 | bttv-input.o | ||
8 | |||
9 | obj-$(CONFIG_VIDEO_BT848) += bttv.o | ||
10 | |||
11 | EXTRA_CFLAGS += -I$(src)/.. | ||
12 | 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 2505ae5a7b97..71535775f2e8 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <asm/io.h> | 42 | #include <asm/io.h> |
43 | #include <asm/byteorder.h> | 43 | #include <asm/byteorder.h> |
44 | 44 | ||
45 | #include "rds.h" | 45 | #include <media/rds.h> |
46 | 46 | ||
47 | 47 | ||
48 | unsigned int bttv_num; /* number of Bt848s in use */ | 48 | 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 9908c8e0c951..ebde3e8219cf 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
19 | #include <media/ir-common.h> | 19 | #include <media/ir-common.h> |
20 | #include <media/ir-kbd-i2c.h> | 20 | #include <media/ir-kbd-i2c.h> |
21 | #include <media/i2c-addr.h> | ||
21 | 22 | ||
22 | /* ---------------------------------------------------------- */ | 23 | /* ---------------------------------------------------------- */ |
23 | /* exported by bttv-cards.c */ | 24 | /* exported by bttv-cards.c */ |
@@ -168,25 +169,6 @@ | |||
168 | #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f | 169 | #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f |
169 | #define BTTV_BOARD_MACHTV_MAGICTV 0x90 | 170 | #define BTTV_BOARD_MACHTV_MAGICTV 0x90 |
170 | 171 | ||
171 | /* i2c address list */ | ||
172 | #define I2C_TSA5522 0xc2 | ||
173 | #define I2C_TDA7432 0x8a | ||
174 | #define I2C_BT832_ALT1 0x88 | ||
175 | #define I2C_BT832_ALT2 0x8a // alternate setting | ||
176 | #define I2C_TDA8425 0x82 | ||
177 | #define I2C_TDA9840 0x84 | ||
178 | #define I2C_TDA9850 0xb6 /* also used by 9855,9873 */ | ||
179 | #define I2C_TDA9874 0xb0 /* also used by 9875 */ | ||
180 | #define I2C_TDA9875 0xb0 | ||
181 | #define I2C_HAUPEE 0xa0 | ||
182 | #define I2C_STBEE 0xae | ||
183 | #define I2C_VHX 0xc0 | ||
184 | #define I2C_MSP3400 0x80 | ||
185 | #define I2C_MSP3400_ALT 0x88 | ||
186 | #define I2C_TEA6300 0x80 /* also used by 6320 */ | ||
187 | #define I2C_DPL3518 0x84 | ||
188 | #define I2C_TDA9887 0x86 | ||
189 | |||
190 | /* more card-specific defines */ | 172 | /* more card-specific defines */ |
191 | #define PT2254_L_CHANNEL 0x10 | 173 | #define PT2254_L_CHANNEL 0x10 |
192 | #define PT2254_R_CHANNEL 0x08 | 174 | #define PT2254_R_CHANNEL 0x08 |
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c index d17395c4f55c..a81285ca7d5b 100644 --- a/drivers/media/video/saa6588.c +++ b/drivers/media/video/saa6588.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
33 | 33 | ||
34 | 34 | ||
35 | #include "rds.h" | 35 | #include <media/rds.h> |
36 | 36 | ||
37 | /* Addresses to scan */ | 37 | /* Addresses to scan */ |
38 | static unsigned short normal_i2c[] = { | 38 | static unsigned short normal_i2c[] = { |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 15405d1e1675..c98571c9d5a6 100644 --- 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, | |||
960 | if (saa7134_no_overlay <= 0) { | 960 | if (saa7134_no_overlay <= 0) { |
961 | saa7134_video_template.type |= VID_TYPE_OVERLAY; | 961 | saa7134_video_template.type |= VID_TYPE_OVERLAY; |
962 | } else { | 962 | } else { |
963 | printk("bttv: Overlay support disabled.\n"); | 963 | printk("%s: Overlay support disabled.\n",dev->name); |
964 | } | 964 | } |
965 | dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); | 965 | dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); |
966 | err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER, | 966 | 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 fc3d5824efff..600dacb873f4 100644 --- a/drivers/media/video/tda7432.c +++ b/drivers/media/video/tda7432.c | |||
@@ -48,9 +48,9 @@ | |||
48 | #include <linux/i2c.h> | 48 | #include <linux/i2c.h> |
49 | #include <linux/i2c-algo-bit.h> | 49 | #include <linux/i2c-algo-bit.h> |
50 | 50 | ||
51 | #include "bttv.h" | ||
52 | #include <media/audiochip.h> | 51 | #include <media/audiochip.h> |
53 | #include <media/v4l2-common.h> | 52 | #include <media/v4l2-common.h> |
53 | #include <media/i2c-addr.h> | ||
54 | 54 | ||
55 | #ifndef VIDEO_AUDIO_BALANCE | 55 | #ifndef VIDEO_AUDIO_BALANCE |
56 | # define VIDEO_AUDIO_BALANCE 32 | 56 | # define VIDEO_AUDIO_BALANCE 32 |
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index ef98c4982250..8a1e58e72c00 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c | |||
@@ -30,14 +30,14 @@ | |||
30 | #include <linux/i2c-algo-bit.h> | 30 | #include <linux/i2c-algo-bit.h> |
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | 32 | ||
33 | #include "bttv.h" | ||
34 | #include <media/audiochip.h> | 33 | #include <media/audiochip.h> |
35 | 34 | ||
35 | #include <media/i2c-addr.h> | ||
36 | |||
36 | static int debug; /* insmod parameter */ | 37 | static int debug; /* insmod parameter */ |
37 | module_param(debug, int, S_IRUGO | S_IWUSR); | 38 | module_param(debug, int, S_IRUGO | S_IWUSR); |
38 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
39 | 40 | ||
40 | |||
41 | /* Addresses to scan */ | 41 | /* Addresses to scan */ |
42 | static unsigned short normal_i2c[] = { | 42 | static unsigned short normal_i2c[] = { |
43 | I2C_TDA9875 >> 1, | 43 | I2C_TDA9875 >> 1, |
diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h new file mode 100644 index 000000000000..4212832d48aa --- /dev/null +++ b/include/media/i2c-addr.h | |||
@@ -0,0 +1,30 @@ | |||
1 | /* | ||
2 | * V4L I2C address list | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org> | ||
6 | * Based on a previous mapping by | ||
7 | * Ralph Metzler (rjkm@thp.uni-koeln.de) | ||
8 | * Gerd Knorr <kraxel@goldbach.in-berlin.de> | ||
9 | * | ||
10 | */ | ||
11 | |||
12 | /* bttv address list */ | ||
13 | #define I2C_TSA5522 0xc2 | ||
14 | #define I2C_TDA7432 0x8a | ||
15 | #define I2C_BT832_ALT1 0x88 | ||
16 | #define I2C_BT832_ALT2 0x8a // alternate setting | ||
17 | #define I2C_TDA8425 0x82 | ||
18 | #define I2C_TDA9840 0x84 | ||
19 | #define I2C_TDA9850 0xb6 /* also used by 9855,9873 */ | ||
20 | #define I2C_TDA9874 0xb0 /* also used by 9875 */ | ||
21 | #define I2C_TDA9875 0xb0 | ||
22 | #define I2C_HAUPEE 0xa0 | ||
23 | #define I2C_STBEE 0xae | ||
24 | #define I2C_VHX 0xc0 | ||
25 | #define I2C_MSP3400 0x80 | ||
26 | #define I2C_MSP3400_ALT 0x88 | ||
27 | #define I2C_TEA6300 0x80 /* also used by 6320 */ | ||
28 | #define I2C_DPL3518 0x84 | ||
29 | #define I2C_TDA9887 0x86 | ||
30 | |||
diff --git a/drivers/media/video/rds.h b/include/media/rds.h index 0d30eb744e61..951c1ae0be74 100644 --- a/drivers/media/video/rds.h +++ b/include/media/rds.h | |||
@@ -42,7 +42,3 @@ struct rds_command { | |||
42 | #define RDS_CMD_POLL _IOR('R',4,int) | 42 | #define RDS_CMD_POLL _IOR('R',4,int) |
43 | 43 | ||
44 | #endif | 44 | #endif |
45 | |||
46 | |||
47 | |||
48 | |||