summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-23 21:45:24 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-24 16:26:51 -0300
commitfa3fcceb30eb8a3cb2ac299c207c6f89b9aed379 (patch)
tree5cd9df4a0591aec9c1e69f19c2f34c40a0914f2a /include/media
parentc72602b8250cc0d3ace59d1a7334c5cd7aa9490e (diff)
downloadlinux-3.10-fa3fcceb30eb8a3cb2ac299c207c6f89b9aed379.tar.gz
linux-3.10-fa3fcceb30eb8a3cb2ac299c207c6f89b9aed379.tar.bz2
linux-3.10-fa3fcceb30eb8a3cb2ac299c207c6f89b9aed379.zip
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.h30
-rw-r--r--include/media/rds.h44
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 00000000000..4212832d48a
--- /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/include/media/rds.h b/include/media/rds.h
new file mode 100644
index 00000000000..951c1ae0be7
--- /dev/null
+++ b/include/media/rds.h
@@ -0,0 +1,44 @@
+/*
+
+ Types and defines needed for RDS. This is included by
+ saa6588.c and every driver (e.g. bttv-driver.c) that wants
+ to use the saa6588 module.
+
+ Instead of having a seperate rds.h, I'd prefer to include
+ this stuff in one of the already existing files like tuner.h
+
+ (c) 2005 by Hans J. Koch
+
+ 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.
+
+*/
+
+#ifndef _RDS_H
+#define _RDS_H
+
+struct rds_command {
+ unsigned int block_count;
+ int result;
+ unsigned char __user *buffer;
+ struct file *instance;
+ poll_table *event_list;
+};
+
+#define RDS_CMD_OPEN _IOW('R',1,int)
+#define RDS_CMD_CLOSE _IOW('R',2,int)
+#define RDS_CMD_READ _IOR('R',3,int)
+#define RDS_CMD_POLL _IOR('R',4,int)
+
+#endif