- added support for "Ultima Electronic/Artec T1 USB TVBOX" (another dibusb clone) reported by Christian Motschke, thanks

- make some doc notes about it

3 files changed, 18 insertions, 9 deletions

diff --git a/linux/drivers/media/dvb/dibusb/Kconfig b/linux/drivers/media/dvb/dibusb/Kconfig
index f328ab5b3..a6d6329f2 100644
--- a/linux/drivers/media/dvb/dibusb/Kconfig
+++ b/linux/drivers/media/dvb/dibusb/Kconfig
@@ -1,5 +1,5 @@
 config DVB_DIBUSB
-	tristate "Twinhan/KWorld/Hama USB DVB-T devices"
+	tristate "Twinhan/KWorld/Hama/Artec USB DVB-T devices"
 	depends on DVB_CORE && USB
 	select FW_LOADER
 	help
@@ -12,13 +12,18 @@ config DVB_DIBUSB
 	    KWorld V-Stream XPERT DTV - DVB-T USB
 	    Hama DVB-T USB-Box
 	    DiBcom reference device (non-public)
-	  
+	    Ultima Electronic/Artec T1 USB TVBOX
+
 	  The VP7041 seems to be identical to "CTS Portable" (Chinese 
 	  Television System).
 
 	  These devices can be understood as budget ones, they "only" deliver
 	  the MPEG data.
 
+	  Currently all known copies of the DiBcom reference design have the DiBcom 3000MB 
+	  frontend onboard. Please enable and load this one manually in order to use this
+	  device.
+	  
 	  A firmware is needed to use the device. See Documentation/dvb/README.dibusb
 	  details.
 
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c
index 12e4c4343..6c0ee84e8 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c
@@ -71,6 +71,8 @@ static struct usb_device_id dibusb_table [] = {
 	{ USB_DEVICE(USB_KWORLD_VENDOR_ID, USB_VSTREAM_PRODUCT_ID) },
 	{ USB_DEVICE(USB_DIBCOM_VENDOR_ID, USB_DIBCOM_PRODUCT_PREFW_ID) },
 	{ USB_DEVICE(USB_DIBCOM_VENDOR_ID, USB_DIBCOM_PRODUCT_ID) },
+	{ USB_DEVICE(USB_ULTIMA_ELECTRONIC_ID, USB_ULTIMA_ELEC_PROD_PREFW_ID) },
+	{ USB_DEVICE(USB_ULTIMA_ELECTRONIC_ID, USB_ULTIMA_ELEC_PROD_ID) },
 	{ }					/* Terminating entry */
 };
 
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h
index 1b1ff4678..a04e8d8cf 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h
@@ -19,17 +19,19 @@
 #define USB_IMC_NETWORKS_VENDOR_ID		0x13d3
 #define USB_KWORLD_VENDOR_ID			0xeb1a
 #define USB_DIBCOM_VENDOR_ID			0x10b8
+#define USB_ULTIMA_ELECTRONIC_ID		0x05d8
 
 /* Product IDs before loading the firmware */
 #define USB_VP7041_PRODUCT_PREFW_ID		0x3201
 #define USB_VSTREAM_PRODUCT_PREFW_ID	0x17de
 #define USB_DIBCOM_PRODUCT_PREFW_ID		0x0bb8
-
+#define USB_ULTIMA_ELEC_PROD_PREFW_ID	0x8105
 
 /* product ID afterwards */
 #define USB_VP7041_PRODUCT_ID			0x3202
 #define USB_VSTREAM_PRODUCT_ID			0x17df
 #define USB_DIBCOM_PRODUCT_ID			0x0bb9
+#define USB_ULTIMA_ELEC_PROD_ID			0x8106
 
 /* CS register start/stop the usb controller cpu */
 #define DIBUSB_CPU_CSREG				0x7F92
@@ -94,7 +96,7 @@ static const char * valid_firmware_filenames[] = {
 	"dvb-dibusb-5.0.0.11.fw",
 };
 
-#define DIBUSB_SUPPORTED_DEVICES	3
+#define DIBUSB_SUPPORTED_DEVICES	4
 
 /* USB Driver stuff */
 static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = {
@@ -113,12 +115,12 @@ static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = {
 		.name = "DiBcom USB reference design",
 		.demod_addr = DIBUSB_DEMOD_I2C_ADDR_DEFAULT,
 	},
-/*	{
- 		.cold_product_id = USB_HAMA_PRODUCT_PREFW_ID,
-		.warm_product_id = USB HAMA_PRODUCT_ID,
-		.name = "HAMA USB DVB-T device",
+	{
+ 		.cold_product_id = USB_ULTIMA_ELEC_PROD_PREFW_ID,
+		.warm_product_id = USB_ULTIMA_ELEC_PROD_ID,
+		.name = "Ultima Electronic/Artec T1 USB TVBOX",
 		.demod_addr = DIBUSB_DEMOD_I2C_ADDR_DEFAULT,
-	}, */
+	}, 
 };
 
 #define COMMAND_PIPE	usb_sndbulkpipe(dib->udev, 0x01)