diff options
author | Gareth Williams <gareth@garethwilliams.me.uk> | 2011-12-24 03:47:29 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-06 08:27:33 -0500 |
commit | 4d28d3d9978b84326a4608c25bda484973bba0a6 (patch) | |
tree | 28ba84c15ec5be920b45711eb5d432ff0c5f5d00 /drivers | |
parent | 6c3b906cc9f73144ceb4ebbb193bebc596063d38 (diff) |
[media] Added USB Id & configuration array for Honestech Vidbox NW03
Adds support for the Honestech Vidbox NW03 USB capture device.
Signed-off-by: Gareth Williams <gareth@garethwilliams.me.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 18 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 67b897336281..b95e66146501 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -1892,6 +1892,22 @@ struct em28xx_board em28xx_boards[] = { | |||
1892 | .has_dvb = 1, | 1892 | .has_dvb = 1, |
1893 | .ir_codes = RC_MAP_PINNACLE_PCTV_HD, | 1893 | .ir_codes = RC_MAP_PINNACLE_PCTV_HD, |
1894 | }, | 1894 | }, |
1895 | /* eb1a:5006 Honestech VIDBOX NW03 | ||
1896 | * Empia EM2860, Philips SAA7113, Empia EMP202, No Tuner */ | ||
1897 | [EM2860_BOARD_HT_VIDBOX_NW03] = { | ||
1898 | .name = "Honestech Vidbox NW03", | ||
1899 | .tuner_type = TUNER_ABSENT, | ||
1900 | .decoder = EM28XX_SAA711X, | ||
1901 | .input = { { | ||
1902 | .type = EM28XX_VMUX_COMPOSITE1, | ||
1903 | .vmux = SAA7115_COMPOSITE0, | ||
1904 | .amux = EM28XX_AMUX_LINE_IN, | ||
1905 | }, { | ||
1906 | .type = EM28XX_VMUX_SVIDEO, | ||
1907 | .vmux = SAA7115_SVIDEO3, /* S-VIDEO needs confirming */ | ||
1908 | .amux = EM28XX_AMUX_LINE_IN, | ||
1909 | } }, | ||
1910 | }, | ||
1895 | }; | 1911 | }; |
1896 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); | 1912 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); |
1897 | 1913 | ||
@@ -2037,6 +2053,8 @@ struct usb_device_id em28xx_id_table[] = { | |||
2037 | .driver_info = EM28174_BOARD_PCTV_460E }, | 2053 | .driver_info = EM28174_BOARD_PCTV_460E }, |
2038 | { USB_DEVICE(0x2040, 0x1605), | 2054 | { USB_DEVICE(0x2040, 0x1605), |
2039 | .driver_info = EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C }, | 2055 | .driver_info = EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C }, |
2056 | { USB_DEVICE(0xeb1a, 0x5006), | ||
2057 | .driver_info = EM2860_BOARD_HT_VIDBOX_NW03 }, | ||
2040 | { }, | 2058 | { }, |
2041 | }; | 2059 | }; |
2042 | MODULE_DEVICE_TABLE(usb, em28xx_id_table); | 2060 | MODULE_DEVICE_TABLE(usb, em28xx_id_table); |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index b1199ef6da68..2dbb12c73339 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -124,6 +124,7 @@ | |||
124 | #define EM28174_BOARD_PCTV_460E 80 | 124 | #define EM28174_BOARD_PCTV_460E 80 |
125 | #define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C 81 | 125 | #define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C 81 |
126 | #define EM2884_BOARD_CINERGY_HTC_STICK 82 | 126 | #define EM2884_BOARD_CINERGY_HTC_STICK 82 |
127 | #define EM2860_BOARD_HT_VIDBOX_NW03 83 | ||
127 | 128 | ||
128 | /* Limits minimum and default number of buffers */ | 129 | /* Limits minimum and default number of buffers */ |
129 | #define EM28XX_MIN_BUF 4 | 130 | #define EM28XX_MIN_BUF 4 |