[DVB patch 10/48] dibusb: support Hauppauge WinTV NOVA-T USB2

2005-03-21 Thread Johannes Stezenbach
o added support for Hauppauge WinTV NOVA-T USB2 (clone of MOD3000P by DiBcom)
(Patrick Boettcher)

Signed-off-by: Johannes Stezenbach <[EMAIL PROTECTED]>

 Documentation/dvb/README.dibusb|8 ++--
 drivers/media/dvb/dibusb/dvb-dibusb-core.c |   28 +++-
 2 files changed, 25 insertions(+), 11 deletions(-)

Index: linux-2.6.12-rc1-mm1/Documentation/dvb/README.dibusb
===
--- linux-2.6.12-rc1-mm1.orig/Documentation/dvb/README.dibusb   2005-03-22 
00:15:04.0 +0100
+++ linux-2.6.12-rc1-mm1/Documentation/dvb/README.dibusb2005-03-22 
00:15:09.0 +0100
@@ -1,4 +1,4 @@
-Documentation for dib3000mb frontend driver and dibusb device driver
+Documentation for dib3000* frontend drivers and dibusb device driver
 
 
 Copyright (C) 2004-5 Patrick Boettcher ([EMAIL PROTECTED]),
@@ -74,6 +74,9 @@ Supported devices USB2.0
 
 - Artec T1 USB TVBOX (FX2) (2)
 
+- Hauppauge WinTV NOVA-T USB2
+   http://www.hauppauge.com/
+
 - DiBcom USB2.0 DVB-T reference device (non-public)
 
 1) It is working almost.
@@ -81,10 +84,11 @@ Supported devices USB2.0
 
 
 0. NEWS:
+  2004-02-02 - added support for the Hauppauge Win-TV Nova-T USB2
   2004-01-31 - distorted streaming is finally gone for USB1.1 devices
   2004-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb
  - first almost working version for HanfTek UMT-010
- - found out, that Yakumo/HAMA/Typhoon are predessors of the 
HanfTek
+ - found out, that Yakumo/HAMA/Typhoon are predessors of the 
HanfTek UMT-010
   2004-01-10 - refactoring completed, now everything is very delightful
  - tuner quirks for some weird devices (Artec T1 AN2235 device has 
sometimes a
Panasonic Tuner assembled). Tunerprobing implemented. Thanks a 
lot to Gunnar Wittich.
Index: linux-2.6.12-rc1-mm1/drivers/media/dvb/dibusb/dvb-dibusb-core.c
===
--- linux-2.6.12-rc1-mm1.orig/drivers/media/dvb/dibusb/dvb-dibusb-core.c
2005-03-21 23:27:58.0 +0100
+++ linux-2.6.12-rc1-mm1/drivers/media/dvb/dibusb/dvb-dibusb-core.c 
2005-03-22 00:15:09.0 +0100
@@ -55,8 +55,9 @@ MODULE_PARM_DESC(rc_query_interval, "int
 #define USB_VID_DIBCOM 0x10b8
 #define USB_VID_EMPIA  0xeb1a
 #define USB_VID_GRANDTEC   0x5032
-#define USB_VID_HYPER_PALTEK   0x1025
 #define USB_VID_HANFTEK0x15f4
+#define USB_VID_HAUPPAUGE  0x2040
+#define USB_VID_HYPER_PALTEK   0x1025
 #define USB_VID_IMC_NETWORKS   0x13d3
 #define USB_VID_TWINHAN0x1822
 #define USB_VID_ULTIMA_ELECTRONIC  0x05d8
@@ -93,6 +94,8 @@ MODULE_PARM_DESC(rc_query_interval, "int
 #define USB_PID_HANFTEK_UMT_010_WARM   0x0025
 #define USB_PID_YAKUMO_DTT200U_COLD0x0201
 #define USB_PID_YAKUMO_DTT200U_WARM0x0301
+#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300
+#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301
 
 /* USB Driver stuff
  * table of devices that this driver is working with
@@ -143,16 +146,18 @@ static struct usb_device_id dib_table []
 /* 28 */   { USB_DEVICE(USB_VID_HANFTEK,   
USB_PID_HANFTEK_UMT_010_COLD) },
 /* 29 */   { USB_DEVICE(USB_VID_HANFTEK,   
USB_PID_HANFTEK_UMT_010_WARM) },
 
+/* 30 */   { USB_DEVICE(USB_VID_HAUPPAUGE, 
USB_PID_WINTV_NOVA_T_USB2_COLD) },
+/* 31 */   { USB_DEVICE(USB_VID_HAUPPAUGE, 
USB_PID_WINTV_NOVA_T_USB2_WARM) },
 /* 
  * activate the following define when you have one of the devices and want to 
  * build it from build-2.6 in dvb-kernel
  */
 // #define CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES 
 #ifdef CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES
-/* 30 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
-/* 31 */   { USB_DEVICE(USB_VID_CYPRESS,   
USB_PID_ULTIMA_TVBOX_USB2_FX_COLD) },
-/* 32 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_USB2_FX_WARM) },
-/* 33 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_DIBCOM_ANCHOR_2135_COLD) },
+/* 32 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+/* 33 */   { USB_DEVICE(USB_VID_CYPRESS,   
USB_PID_ULTIMA_TVBOX_USB2_FX_COLD) },
+/* 34 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_USB2_FX_WARM) },
+/* 35 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_DIBCOM_ANCHOR_2135_COLD) },
 #endif
{ } /* Terminating entry */

[DVB patch 10/48] dibusb: support Hauppauge WinTV NOVA-T USB2

2005-03-21 Thread Johannes Stezenbach
o added support for Hauppauge WinTV NOVA-T USB2 (clone of MOD3000P by DiBcom)
(Patrick Boettcher)

Signed-off-by: Johannes Stezenbach [EMAIL PROTECTED]

 Documentation/dvb/README.dibusb|8 ++--
 drivers/media/dvb/dibusb/dvb-dibusb-core.c |   28 +++-
 2 files changed, 25 insertions(+), 11 deletions(-)

Index: linux-2.6.12-rc1-mm1/Documentation/dvb/README.dibusb
===
--- linux-2.6.12-rc1-mm1.orig/Documentation/dvb/README.dibusb   2005-03-22 
00:15:04.0 +0100
+++ linux-2.6.12-rc1-mm1/Documentation/dvb/README.dibusb2005-03-22 
00:15:09.0 +0100
@@ -1,4 +1,4 @@
-Documentation for dib3000mb frontend driver and dibusb device driver
+Documentation for dib3000* frontend drivers and dibusb device driver
 
 
 Copyright (C) 2004-5 Patrick Boettcher ([EMAIL PROTECTED]),
@@ -74,6 +74,9 @@ Supported devices USB2.0
 
 - Artec T1 USB TVBOX (FX2) (2)
 
+- Hauppauge WinTV NOVA-T USB2
+   http://www.hauppauge.com/
+
 - DiBcom USB2.0 DVB-T reference device (non-public)
 
 1) It is working almost.
@@ -81,10 +84,11 @@ Supported devices USB2.0
 
 
 0. NEWS:
+  2004-02-02 - added support for the Hauppauge Win-TV Nova-T USB2
   2004-01-31 - distorted streaming is finally gone for USB1.1 devices
   2004-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb
  - first almost working version for HanfTek UMT-010
- - found out, that Yakumo/HAMA/Typhoon are predessors of the 
HanfTek
+ - found out, that Yakumo/HAMA/Typhoon are predessors of the 
HanfTek UMT-010
   2004-01-10 - refactoring completed, now everything is very delightful
  - tuner quirks for some weird devices (Artec T1 AN2235 device has 
sometimes a
Panasonic Tuner assembled). Tunerprobing implemented. Thanks a 
lot to Gunnar Wittich.
Index: linux-2.6.12-rc1-mm1/drivers/media/dvb/dibusb/dvb-dibusb-core.c
===
--- linux-2.6.12-rc1-mm1.orig/drivers/media/dvb/dibusb/dvb-dibusb-core.c
2005-03-21 23:27:58.0 +0100
+++ linux-2.6.12-rc1-mm1/drivers/media/dvb/dibusb/dvb-dibusb-core.c 
2005-03-22 00:15:09.0 +0100
@@ -55,8 +55,9 @@ MODULE_PARM_DESC(rc_query_interval, int
 #define USB_VID_DIBCOM 0x10b8
 #define USB_VID_EMPIA  0xeb1a
 #define USB_VID_GRANDTEC   0x5032
-#define USB_VID_HYPER_PALTEK   0x1025
 #define USB_VID_HANFTEK0x15f4
+#define USB_VID_HAUPPAUGE  0x2040
+#define USB_VID_HYPER_PALTEK   0x1025
 #define USB_VID_IMC_NETWORKS   0x13d3
 #define USB_VID_TWINHAN0x1822
 #define USB_VID_ULTIMA_ELECTRONIC  0x05d8
@@ -93,6 +94,8 @@ MODULE_PARM_DESC(rc_query_interval, int
 #define USB_PID_HANFTEK_UMT_010_WARM   0x0025
 #define USB_PID_YAKUMO_DTT200U_COLD0x0201
 #define USB_PID_YAKUMO_DTT200U_WARM0x0301
+#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300
+#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301
 
 /* USB Driver stuff
  * table of devices that this driver is working with
@@ -143,16 +146,18 @@ static struct usb_device_id dib_table []
 /* 28 */   { USB_DEVICE(USB_VID_HANFTEK,   
USB_PID_HANFTEK_UMT_010_COLD) },
 /* 29 */   { USB_DEVICE(USB_VID_HANFTEK,   
USB_PID_HANFTEK_UMT_010_WARM) },
 
+/* 30 */   { USB_DEVICE(USB_VID_HAUPPAUGE, 
USB_PID_WINTV_NOVA_T_USB2_COLD) },
+/* 31 */   { USB_DEVICE(USB_VID_HAUPPAUGE, 
USB_PID_WINTV_NOVA_T_USB2_WARM) },
 /* 
  * activate the following define when you have one of the devices and want to 
  * build it from build-2.6 in dvb-kernel
  */
 // #define CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES 
 #ifdef CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES
-/* 30 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
-/* 31 */   { USB_DEVICE(USB_VID_CYPRESS,   
USB_PID_ULTIMA_TVBOX_USB2_FX_COLD) },
-/* 32 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_USB2_FX_WARM) },
-/* 33 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_DIBCOM_ANCHOR_2135_COLD) },
+/* 32 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },
+/* 33 */   { USB_DEVICE(USB_VID_CYPRESS,   
USB_PID_ULTIMA_TVBOX_USB2_FX_COLD) },
+/* 34 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_ULTIMA_TVBOX_USB2_FX_WARM) },
+/* 35 */   { USB_DEVICE(USB_VID_ANCHOR,
USB_PID_DIBCOM_ANCHOR_2135_COLD) },
 #endif
{ } /* Terminating entry */
 };