diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-09-09 16:03:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:49 -0400 |
commit | e52e98a7eccfb0e7e91630d01690fb11d77db77d (patch) | |
tree | d910e743159977ee695c40b795a4b84d43a4dbcb /drivers/media/video/cx88/cx88-reg.h | |
parent | 24a70fdce872d70171b1f49dcd1a7c3a4e8396b2 (diff) |
[PATCH] v4l: CX88 updates and card additions
- Remove $Id CVS logs for V4L files
- add ioctl indirection via cx88_ioctl_hook and cx88_ioctl_translator to
cx88-blackbird.c.
- declare the indirection hooks from cx88-blackbird.c.
- dcprintk macro which uses core instead of dev->core on cx88-video.c.
- replace dev->core occurances with core on cx88-video.c.
- CodingStyle fixes.
- MaxInput replaced by a define.
- cx8801 structures moved from cx88.h.
- The output_mode needs to be set for the Hauppauge Nova-T DVB-T
for versions after 2.6.12.
- Corrected GPIO values for cx88 cards #28 & #31 for s-video and composite.
- Updated DViCO FusionHDTV5 Gold & added DVB support.
- Fixed DViCO FusionHDTV 3 Gold-Q GPIO.
- Some clean up in cx88-tvaudio.c
- replaced hex values when writing to AUD_CTL to EN_xx for better reading.
- Allow select by hand between Mono, Lang1, Lang2 and Stereo for BTSC.
- Support for stereo NICAM and BTSC improved.
- Broken stereo check removed.
- Added support for remote control to Cinergy DVBT-1400.
- local var renamed from rc5 to a better name (ircode).
- LGDT330X QAM lock bug fixes.
- Some reorg: move some bits to struct cx88_core, factor out common ioctl's
to cx88_do_ioctl.
- Get rid of '//' comments, replace them with #if 0 and /**/.
- Minor clean-ups: remove dcprintk and replace all instances of "dev->core"
with "core".
- Added some registers to control PCI controller at CX2388x chips.
- New tuner standby API.
- Small mpeg fixes and cleanups for blackbird.
- fix mpeg packet size & count
- add VIDIOC_QUERYCAP ioctl for the mpeg stream
- return more information in struct v4l2_format
- fix default window height
- small cleanups
Signed-off-by: Uli Luckas <luckas@musoft.de>
Signed-off-by: Torsten Seeboth <Torsten.Seeboth@t-online.de>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Patrick Boettcher <patrick.boettcher@desy.de>
Signed-off-by: Catalin Climov <catalin@climov.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-reg.h')
-rw-r--r-- | drivers/media/video/cx88/cx88-reg.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-reg.h b/drivers/media/video/cx88/cx88-reg.h index 37f82662d265..0a3a62fc9bbb 100644 --- a/drivers/media/video/cx88/cx88-reg.h +++ b/drivers/media/video/cx88/cx88-reg.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | $Id: cx88-reg.h,v 1.8 2005/07/07 13:58:38 mchehab Exp $ | ||
3 | 2 | ||
4 | cx88x-hw.h - CX2388x register offsets | 3 | cx88x-hw.h - CX2388x register offsets |
5 | 4 | ||
@@ -40,6 +39,29 @@ | |||
40 | #define CX88X_EN_TBFX 0x02 | 39 | #define CX88X_EN_TBFX 0x02 |
41 | #define CX88X_EN_VSFX 0x04 | 40 | #define CX88X_EN_VSFX 0x04 |
42 | 41 | ||
42 | /* ---------------------------------------------------------------------- */ | ||
43 | /* PCI controller registers */ | ||
44 | |||
45 | /* Command and Status Register */ | ||
46 | #define F0_CMD_STAT_MM 0x2f0004 | ||
47 | #define F1_CMD_STAT_MM 0x2f0104 | ||
48 | #define F2_CMD_STAT_MM 0x2f0204 | ||
49 | #define F3_CMD_STAT_MM 0x2f0304 | ||
50 | #define F4_CMD_STAT_MM 0x2f0404 | ||
51 | |||
52 | /* Device Control #1 */ | ||
53 | #define F0_DEV_CNTRL1_MM 0x2f0040 | ||
54 | #define F1_DEV_CNTRL1_MM 0x2f0140 | ||
55 | #define F2_DEV_CNTRL1_MM 0x2f0240 | ||
56 | #define F3_DEV_CNTRL1_MM 0x2f0340 | ||
57 | #define F4_DEV_CNTRL1_MM 0x2f0440 | ||
58 | |||
59 | /* Device Control #1 */ | ||
60 | #define F0_BAR0_MM 0x2f0010 | ||
61 | #define F1_BAR0_MM 0x2f0110 | ||
62 | #define F2_BAR0_MM 0x2f0210 | ||
63 | #define F3_BAR0_MM 0x2f0310 | ||
64 | #define F4_BAR0_MM 0x2f0410 | ||
43 | 65 | ||
44 | /* ---------------------------------------------------------------------- */ | 66 | /* ---------------------------------------------------------------------- */ |
45 | /* DMA Controller registers */ | 67 | /* DMA Controller registers */ |