diff options
author | Martin Samuelsson <sam@home.se> | 2006-04-27 09:17:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 00:59:28 -0400 |
commit | fbe60daac4c34e39d1ca69684bcb76e62461ac21 (patch) | |
tree | d399de101564f542681223a45c47caffcab71da0 /Documentation/video4linux/Zoran | |
parent | a87cde0bfbf0020a5d0a80f94a80fc1470546999 (diff) |
V4L/DVB (3916): AverMedia 6 Eyes AVS6EYES support
Add support for the AverMedia 6 Eyes MJPEG card.
- Updated drivers/media/video/Kconfig with AVS6EYES
options.
- Added CONFIG_VIDEO_ZORAN_AVS6EYES to
drivers/media/video/Makefile.
- Added I2C_DRIVERID_BT866 and I2C_DRIVERID_KS0127 to
include/linux/i2c-id.h
- Added drivers/media/video/ks0127.c, imported and modified from
the Marvel project.
- Added drivers/media/video/ks0127.h, imported and modified from
the Marvel project.
- Added drivers/media/video/bt866.c, ported from a 2.4 version
by Christer Weinigel.
- Added AVS6EYES to drivers/media/video/zoran_card.c
- Added input_mux to all cards in drivers/media/video/zoran_card.c
- Added input mux module parameter to drivers/media/video/zoran_card.c
- Added AVS6EYES to card_type in drivers/media/video/zoran.h
- Added input_mux to card_info in drivers/media/video/zoran.h
- Upped BUZ_MAX_INPUT in drivers/media/video/zoran.h from 8 to 16,
as the AVS6EYES has 10.
- Updated Documentation/video4linux/Zoran with information about AVS6EYES.
Signed-off-by: Martin Samuelsson <sam@home.se>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'Documentation/video4linux/Zoran')
-rw-r--r-- | Documentation/video4linux/Zoran | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran index be9f21b84555..040a2c841ae9 100644 --- a/Documentation/video4linux/Zoran +++ b/Documentation/video4linux/Zoran | |||
@@ -33,6 +33,21 @@ Inputs/outputs: Composite and S-video | |||
33 | Norms: PAL, SECAM (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps) | 33 | Norms: PAL, SECAM (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps) |
34 | Card number: 7 | 34 | Card number: 7 |
35 | 35 | ||
36 | AverMedia 6 Eyes AVS6EYES: | ||
37 | * Zoran zr36067 PCI controller | ||
38 | * Zoran zr36060 MJPEG codec | ||
39 | * Samsung ks0127 TV decoder | ||
40 | * Conexant bt866 TV encoder | ||
41 | Drivers to use: videodev, i2c-core, i2c-algo-bit, | ||
42 | videocodec, ks0127, bt866, zr36060, zr36067 | ||
43 | Inputs/outputs: Six physical inputs. 1-6 are composite, | ||
44 | 1-2, 3-4, 5-6 doubles as S-video, | ||
45 | 1-3 triples as component. | ||
46 | One composite output. | ||
47 | Norms: PAL, SECAM (720x576 @ 25 fps), NTSC (720x480 @ 29.97 fps) | ||
48 | Card number: 8 | ||
49 | Not autodetected, card=8 is necessary. | ||
50 | |||
36 | Linux Media Labs LML33: | 51 | Linux Media Labs LML33: |
37 | * Zoran zr36067 PCI controller | 52 | * Zoran zr36067 PCI controller |
38 | * Zoran zr36060 MJPEG codec | 53 | * Zoran zr36060 MJPEG codec |
@@ -192,6 +207,10 @@ Micronas vpx3220a TV decoder | |||
192 | was introduced in 1996, is used in the DC30 and DC30+ and | 207 | was introduced in 1996, is used in the DC30 and DC30+ and |
193 | can handle: PAL B/G/H/I, PAL N, PAL M, NTSC M, NTSC 44, PAL 60, SECAM,NTSC Comb | 208 | can handle: PAL B/G/H/I, PAL N, PAL M, NTSC M, NTSC 44, PAL 60, SECAM,NTSC Comb |
194 | 209 | ||
210 | Samsung ks0127 TV decoder | ||
211 | is used in the AVS6EYES card and | ||
212 | can handle: NTSC-M/N/44, PAL-M/N/B/G/H/I/D/K/L and SECAM | ||
213 | |||
195 | =========================== | 214 | =========================== |
196 | 215 | ||
197 | 1.2 What the TV encoder can do an what not | 216 | 1.2 What the TV encoder can do an what not |
@@ -221,6 +240,10 @@ ITT mse3000 TV encoder | |||
221 | was introduced in 1991, is used in the DC10 old | 240 | was introduced in 1991, is used in the DC10 old |
222 | can generate: PAL , NTSC , SECAM | 241 | can generate: PAL , NTSC , SECAM |
223 | 242 | ||
243 | Conexant bt866 TV encoder | ||
244 | is used in AVS6EYES, and | ||
245 | can generate: NTSC/PAL, PALM, PALN | ||
246 | |||
224 | The adv717x, should be able to produce PAL N. But you find nothing PAL N | 247 | The adv717x, should be able to produce PAL N. But you find nothing PAL N |
225 | specific in the registers. Seem that you have to reuse a other standard | 248 | specific in the registers. Seem that you have to reuse a other standard |
226 | to generate PAL N, maybe it would work if you use the PAL M settings. | 249 | to generate PAL N, maybe it would work if you use the PAL M settings. |