mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-14 06:24:53 +08:00
V4L/DVB (3432): Hauppauge HVR 900 Composite support
- Hauppauge HVR 900 Composite support Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
cbcf749382
commit
a94e95b443
@ -136,6 +136,28 @@ struct em28xx_board em28xx_boards[] = {
|
||||
.amux = 1,
|
||||
}},
|
||||
},
|
||||
[EM2880_BOARD_WINTV_HVR_900] = {
|
||||
.name = "WinTV HVR 900",
|
||||
.vchannels = 3,
|
||||
.norm = VIDEO_MODE_PAL,
|
||||
.has_tuner = 0,
|
||||
.tda9887_conf = TDA9887_PRESENT,
|
||||
.has_tuner = 1,
|
||||
.decoder = EM28XX_TVP5150,
|
||||
.input = {{
|
||||
.type = EM28XX_VMUX_COMPOSITE1,
|
||||
.vmux = 2,
|
||||
.amux = 0,
|
||||
},{
|
||||
.type = EM28XX_VMUX_TELEVISION,
|
||||
.vmux = 0,
|
||||
.amux = 1,
|
||||
},{
|
||||
.type = EM28XX_VMUX_SVIDEO,
|
||||
.vmux = 9,
|
||||
.amux = 1,
|
||||
}},
|
||||
},
|
||||
[EM2820_BOARD_MSI_VOX_USB_2] = {
|
||||
.name = "MSI VOX USB 2.0",
|
||||
.vchannels = 3,
|
||||
@ -254,13 +276,28 @@ struct usb_device_id em28xx_id_table [] = {
|
||||
{ USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
|
||||
{ USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
|
||||
{ USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
|
||||
{ USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_WINTV_HVR_900 },
|
||||
{ },
|
||||
};
|
||||
|
||||
void em28xx_pre_card_setup(struct em28xx *dev)
|
||||
{
|
||||
/* request some modules */
|
||||
switch(dev->model){
|
||||
case EM2880_BOARD_WINTV_HVR_900:
|
||||
{
|
||||
em28xx_write_regs_req(dev, 0x00, 0x08, "\x7d", 1); // reset through GPIO?
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void em28xx_card_setup(struct em28xx *dev)
|
||||
{
|
||||
/* request some modules */
|
||||
if (dev->model == EM2820_BOARD_HAUPPAUGE_WINTV_USB_2) {
|
||||
switch(dev->model){
|
||||
case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
|
||||
{
|
||||
struct tveeprom tv;
|
||||
#ifdef CONFIG_MODULES
|
||||
request_module("tveeprom");
|
||||
@ -278,6 +315,8 @@ void em28xx_card_setup(struct em28xx *dev)
|
||||
dev->has_msp34xx=1;
|
||||
} else
|
||||
dev->has_msp34xx=0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1766,6 +1766,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
|
||||
dev->vpic.depth = 16;
|
||||
dev->vpic.palette = VIDEO_PALETTE_YUV422;
|
||||
|
||||
em28xx_pre_card_setup(dev);
|
||||
#ifdef CONFIG_MODULES
|
||||
/* request some modules */
|
||||
if (dev->decoder == EM28XX_SAA7113 || dev->decoder == EM28XX_SAA7114)
|
||||
|
@ -41,6 +41,7 @@
|
||||
#define EM2800_BOARD_LEADTEK_WINFAST_USBII 7
|
||||
#define EM2800_BOARD_KWORLD_USB2800 8
|
||||
#define EM2820_BOARD_PINNACLE_DVC_90 9
|
||||
#define EM2880_BOARD_WINTV_HVR_900 10
|
||||
|
||||
#define UNSET -1
|
||||
|
||||
@ -327,6 +328,7 @@ int em28xx_set_alternate(struct em28xx *dev);
|
||||
|
||||
/* Provided by em28xx-cards.c */
|
||||
extern int em2800_variant_detect(struct usb_device* udev,int model);
|
||||
extern void em28xx_pre_card_setup(struct em28xx *dev);
|
||||
extern void em28xx_card_setup(struct em28xx *dev);
|
||||
extern struct em28xx_board em28xx_boards[];
|
||||
extern struct usb_device_id em28xx_id_table[];
|
||||
|
Loading…
Reference in New Issue
Block a user