summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cx23885.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-20 21:49:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-20 21:49:25 -0300
commita0445b01893489ee01d54d08da80d29a24434e0a (patch)
tree183ffaf24616779e2550c86540bf445e86f3b13d /linux/drivers/media/video/cx23885/cx23885.h
parent59ac780bc36a1d932e6290e0ea492085f2ec35cd (diff)
parentbf2a43cd610fd4c43b23e6dc87e086848de1b290 (diff)
downloadmediapointer-dvb-s2-a0445b01893489ee01d54d08da80d29a24434e0a.tar.gz
mediapointer-dvb-s2-a0445b01893489ee01d54d08da80d29a24434e0a.tar.bz2
merge: http://udev.netup.ru/hg/v4l-dvb-commits
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885.h')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h
index 2a384e6aa..6ddabc263 100644
--- a/linux/drivers/media/video/cx23885/cx23885.h
+++ b/linux/drivers/media/video/cx23885/cx23885.h
@@ -78,6 +78,7 @@
#define CX23885_BOARD_HAUPPAUGE_HVR1210 21
#define CX23885_BOARD_MYGICA_X8506 22
#define CX23885_BOARD_MAGICPRO_PROHDTVE2 23
+#define CX23885_BOARD_HAUPPAUGE_HVR1850 24
#define GPIO_0 0x00000001
#define GPIO_1 0x00000002
@@ -89,6 +90,12 @@
#define GPIO_7 0x00000080
#define GPIO_8 0x00000100
#define GPIO_9 0x00000200
+#define GPIO_10 0x00000400
+#define GPIO_11 0x00000800
+#define GPIO_12 0x00001000
+#define GPIO_13 0x00002000
+#define GPIO_14 0x00004000
+#define GPIO_15 0x00008000
/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
#define CX23885_NORMS (\
@@ -333,6 +340,7 @@ struct cx23885_dev {
CX23885_BRIDGE_UNDEFINED = 0,
CX23885_BRIDGE_885 = 885,
CX23885_BRIDGE_887 = 887,
+ CX23885_BRIDGE_888 = 888,
} bridge;
/* Analog video */
@@ -506,6 +514,9 @@ extern void cx23885_417_check_encoder(struct cx23885_dev *dev);
extern void cx23885_mc417_init(struct cx23885_dev *dev);
extern int mc417_memory_read(struct cx23885_dev *dev, u32 address, u32 *value);
extern int mc417_memory_write(struct cx23885_dev *dev, u32 address, u32 value);
+extern void mc417_gpio_set(struct cx23885_dev *dev, u32 mask);
+extern void mc417_gpio_clear(struct cx23885_dev *dev, u32 mask);
+extern void mc417_gpio_enable(struct cx23885_dev *dev, u32 mask, int asoutput);
/* ----------------------------------------------------------- */