- added new device ids (unkown name) from new Twinhan driver

- notes in documentation
- some cleanups
- return values in firmware upload method (thanks to Ian <ian (a) imm.uklinux.net>)

1 files changed, 21 insertions, 5 deletions

diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h
index 331f85d3c..167367ad6 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h
@@ -7,6 +7,7 @@
  *	modify it under the terms of the GNU General Public License as
  *	published by the Free Software Foundation, version 2.
  *
+ * $Id: dvb-dibusb.h,v 1.5 2004/09/28 19:36:44 pmp Exp $
  *
  * for more information see dvb-dibusb.c .
  */
@@ -19,10 +20,11 @@
 /* Vendor IDs */
 #define USB_VID_TWINHAN_ID					0x1822
 #define USB_VID_IMC_NETWORKS_ID				0x13d3
-#define USB_VID_KWORLD_ID					0xeb1a
+#define USB_VID_EMPIA_ID					0xeb1a
 #define USB_VID_DIBCOM_ID					0x10b8
 #define USB_VID_ULTIMA_ELECTRONIC_ID		0x05d8
 #define USB_VID_COMPRO_ID					0x185b
+#define USB_VID_HYPER_PALTEK				0x1025
 
 /* Product IDs before loading the firmware */
 #define USB_PID_TWINHAN_VP7041_COLD_ID		0x3201
@@ -30,6 +32,7 @@
 #define USB_PID_DIBCOM_MOD3000_COLD_ID		0x0bb8
 #define USB_PID_ULTIMA_TVBOX_COLD_ID		0x8105
 #define USB_PID_COMPRO_DVBU2000_COLD_ID		0xd000
+#define USB_PID_UNK_HYPER_PALTEK_COLD_ID	0x005e
 
 /* product ID afterwards */
 #define USB_PID_TWINHAN_VP7041_WARM_ID		0x3202
@@ -37,6 +40,7 @@
 #define USB_PID_DIBCOM_MOD3000_WARM_ID		0x0bb9
 #define USB_PID_ULTIMA_TVBOX_WARM_ID		0x8106
 #define USB_PID_COMPRO_DVBU2000_WARM_ID		0xd001
+#define USB_PID_UNK_HYPER_PALTEK_WARM_ID	0x005f
 
 /* static array of valid firmware names, the best one first */
 static const char * valid_firmware_filenames[] = {
@@ -50,7 +54,7 @@ struct dibusb_device {
 	const char *name;
 };
 
-#define DIBUSB_SUPPORTED_DEVICES	5
+#define DIBUSB_SUPPORTED_DEVICES	6
 
 /* USB Driver stuff */
 static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = {
@@ -66,7 +70,7 @@ static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = {
 	},
 	{	.cold_product_id = USB_PID_DIBCOM_MOD3000_COLD_ID,
 		.warm_product_id = USB_PID_DIBCOM_MOD3000_WARM_ID,
-		.name = "DiBcom USB reference design",
+		.name = "DiBcom USB DVB-T reference design (MOD300)",
 		.demod_addr = DIBUSB_DEMOD_I2C_ADDR_DEFAULT,
 	},
 	{	.cold_product_id = USB_PID_ULTIMA_TVBOX_COLD_ID,
@@ -78,6 +82,11 @@ static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = {
 		.warm_product_id = USB_PID_COMPRO_DVBU2000_WARM_ID,
 		.name = "Compro Videomate DVB-U2000 - DVB-T USB",
 		.demod_addr = DIBUSB_DEMOD_I2C_ADDR_DEFAULT,
+	},
+	{	.cold_product_id = USB_PID_UNK_HYPER_PALTEK_COLD_ID,
+		.warm_product_id = USB_PID_UNK_HYPER_PALTEK_WARM_ID,
+		.name = "Unkown USB DVB-T device ???? please report the name to linux-dvb or to the author",
+		.demod_addr = DIBUSB_DEMOD_I2C_ADDR_DEFAULT,
 	}
 };
 
@@ -88,14 +97,16 @@ static struct usb_device_id dibusb_table [] = {
 	{ USB_DEVICE(USB_VID_TWINHAN_ID, 	USB_PID_TWINHAN_VP7041_WARM_ID) },
 	{ USB_DEVICE(USB_VID_IMC_NETWORKS_ID,USB_PID_TWINHAN_VP7041_COLD_ID) },
 	{ USB_DEVICE(USB_VID_IMC_NETWORKS_ID,USB_PID_TWINHAN_VP7041_WARM_ID) },
-	{ USB_DEVICE(USB_VID_KWORLD_ID,		USB_PID_KWORLD_VSTREAM_COLD_ID) },
-	{ USB_DEVICE(USB_VID_KWORLD_ID,		USB_PID_KWORLD_VSTREAM_WARM_ID) },
+	{ USB_DEVICE(USB_VID_EMPIA_ID,		USB_PID_KWORLD_VSTREAM_COLD_ID) },
+	{ USB_DEVICE(USB_VID_EMPIA_ID,		USB_PID_KWORLD_VSTREAM_WARM_ID) },
 	{ USB_DEVICE(USB_VID_DIBCOM_ID,		USB_PID_DIBCOM_MOD3000_COLD_ID) },
 	{ USB_DEVICE(USB_VID_DIBCOM_ID,		USB_PID_DIBCOM_MOD3000_WARM_ID) },
 	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC_ID, USB_PID_ULTIMA_TVBOX_COLD_ID) },
 	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC_ID, USB_PID_ULTIMA_TVBOX_WARM_ID) },
 	{ USB_DEVICE(USB_VID_COMPRO_ID,		USB_PID_COMPRO_DVBU2000_COLD_ID) },
 	{ USB_DEVICE(USB_VID_COMPRO_ID,		USB_PID_COMPRO_DVBU2000_WARM_ID) },
+	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_COLD_ID) },
+	{ USB_DEVICE(USB_VID_HYPER_PALTEK,	USB_PID_UNK_HYPER_PALTEK_WARM_ID) },
 	{ }                 /* Terminating entry */
 };
 
@@ -133,6 +144,7 @@ struct usb_dibusb {
 	struct dibusb_device * dibdev;
 
 	int feedcount;
+	int streaming;
 	struct urb * buf_urb[DIBUSB_TS_NUM_URBS];
 	u8 *buffer;
 	dma_addr_t dma_handle;
@@ -175,6 +187,10 @@ struct usb_dibusb {
 /* prefix for reading the current RC key */
 #define DIBUSB_REQ_POLL_REMOTE			0x04
 
+#define DIBUSB_RC_NEC_EMPTY				0x00
+#define DIBUSB_RC_NEC_KEY_PRESSED		0x01
+#define DIBUSB_RC_NEC_KEY_REPEATED		0x02
+
 /* 0x05 0xXX */
 #define DIBUSB_REQ_SET_STREAMING_MODE	0x05