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 /include/media | |
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>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/i2c-addr.h | 30 | ||||
-rw-r--r-- | include/media/rds.h | 44 |
2 files changed, 74 insertions, 0 deletions
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/include/media/rds.h b/include/media/rds.h new file mode 100644 index 000000000000..951c1ae0be74 --- /dev/null +++ b/include/media/rds.h | |||
@@ -0,0 +1,44 @@ | |||
1 | /* | ||
2 | |||
3 | Types and defines needed for RDS. This is included by | ||
4 | saa6588.c and every driver (e.g. bttv-driver.c) that wants | ||
5 | to use the saa6588 module. | ||
6 | |||
7 | Instead of having a seperate rds.h, I'd prefer to include | ||
8 | this stuff in one of the already existing files like tuner.h | ||
9 | |||
10 | (c) 2005 by Hans J. Koch | ||
11 | |||
12 | This program is free software; you can redistribute it and/or modify | ||
13 | it under the terms of the GNU General Public License as published by | ||
14 | the Free Software Foundation; either version 2 of the License, or | ||
15 | (at your option) any later version. | ||
16 | |||
17 | This program is distributed in the hope that it will be useful, | ||
18 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
19 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
20 | GNU General Public License for more details. | ||
21 | |||
22 | You should have received a copy of the GNU General Public License | ||
23 | along with this program; if not, write to the Free Software | ||
24 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
25 | |||
26 | */ | ||
27 | |||
28 | #ifndef _RDS_H | ||
29 | #define _RDS_H | ||
30 | |||
31 | struct rds_command { | ||
32 | unsigned int block_count; | ||
33 | int result; | ||
34 | unsigned char __user *buffer; | ||
35 | struct file *instance; | ||
36 | poll_table *event_list; | ||
37 | }; | ||
38 | |||
39 | #define RDS_CMD_OPEN _IOW('R',1,int) | ||
40 | #define RDS_CMD_CLOSE _IOW('R',2,int) | ||
41 | #define RDS_CMD_READ _IOR('R',3,int) | ||
42 | #define RDS_CMD_POLL _IOR('R',4,int) | ||
43 | |||
44 | #endif | ||