diff --git a/cx231xx-cards.c b/cx231xx-cards.c index a431a99..66df4d5 100644 --- a/cx231xx-cards.c +++ b/cx231xx-cards.c @@ -1001,6 +1001,37 @@ struct cx231xx_board cx231xx_boards[] = { .gpio = NULL, } }, }, + [CX231XX_BOARD_BAUHN_DVD_MAKER] = { + .name = "Bauhn DVD Maker", + .tuner_type = TUNER_ABSENT, + .decoder = CX231XX_AVDECODER, + .output_mode = OUT_MODE_VIP11, + .ctl_pin_status_mask = 0xFFFFFFC4, + .agc_analog_digital_select_gpio = 0x1c, + .gpio_pin_status_mask = 0x4001000, + .norm = V4L2_STD_PAL, + .no_alt_vanc = 1, + .external_av = 1, + /* Actually, it has a 417, but it isn't working correctly. + * So set to 0 for now until someone can manage to get this + * to work reliably. */ + .has_417 = 0, + + .input = {{ + .type = CX231XX_VMUX_COMPOSITE1, + .vmux = CX231XX_VIN_2_1, + .amux = CX231XX_AMUX_LINE_IN, + .gpio = NULL, + }, { + .type = CX231XX_VMUX_SVIDEO, + .vmux = CX231XX_VIN_1_1 | + (CX231XX_VIN_1_2 << 8) | + CX25840_SVIDEO_ON, + .amux = CX231XX_AMUX_LINE_IN, + .gpio = NULL, + } + }, + } }; const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); @@ -1081,6 +1112,8 @@ struct usb_device_id cx231xx_id_table[] = { .driver_info = CX231XX_BOARD_ASTROMETA_T2HYBRID}, {USB_DEVICE(0x199e, 0x8002), .driver_info = CX231XX_BOARD_THE_IMAGING_SOURCE_DFG_USB2_PRO}, + {USB_DEVICE(0x1d19, 0x6108), + .driver_info = CX231XX_BOARD_BAUHN_DVD_MAKER}, {}, }; @@ -1442,7 +1475,8 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev, /*To workaround error number=-71 on EP0 for VideoGrabber, need set alt here.*/ if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER || - dev->model == CX231XX_BOARD_HAUPPAUGE_USBLIVE2) { + dev->model == CX231XX_BOARD_HAUPPAUGE_USBLIVE2 || + dev->model == CX231XX_BOARD_BAUHN_DVD_MAKER) { cx231xx_set_alt_setting(dev, INDEX_VIDEO, 3); cx231xx_set_alt_setting(dev, INDEX_VANC, 1); } diff --git a/cx231xx.h b/cx231xx.h index fa640bf..75a51ff 100644 --- a/cx231xx.h +++ b/cx231xx.h @@ -82,6 +82,7 @@ #define CX231XX_BOARD_THE_IMAGING_SOURCE_DFG_USB2_PRO 25 #define CX231XX_BOARD_HAUPPAUGE_935C 26 #define CX231XX_BOARD_HAUPPAUGE_975 27 +#define CX231XX_BOARD_BAUHN_DVD_MAKER 28 /* Limits minimum and default number of buffers */ #define CX231XX_MIN_BUF 4