From ca11373ee66327573c4a133e613aa8b6b8f1cb7a Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Mon, 6 Dec 2004 08:04:07 +0000 Subject: added new usb ids --- linux/drivers/media/dvb/dibusb/Kconfig | 20 ++++++++++------ linux/drivers/media/dvb/dibusb/dvb-dibusb.h | 36 +++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 12 deletions(-) (limited to 'linux/drivers/media/dvb/dibusb') diff --git a/linux/drivers/media/dvb/dibusb/Kconfig b/linux/drivers/media/dvb/dibusb/Kconfig index 028980897..f0809d57c 100644 --- a/linux/drivers/media/dvb/dibusb/Kconfig +++ b/linux/drivers/media/dvb/dibusb/Kconfig @@ -33,19 +33,25 @@ config DVB_DIBUSB Say Y if you own such a device and want to use it. You should build it as a module. -config DVB_DIBUSB_MISDESIGNED_AN2235 - bool "Enable support for some Artec T1 device, which identifies as AN2235" +config DVB_DIBUSB_MISDESIGNED_DEVICES + bool "Enable support for some misdesigned (see help) devices, which identify with wrong IDs" depends on DVB_DIBUSB help - Somehow Artec forgot to program the eeprom for some of their T1 devices. So - comes that they identify with the default Vendor and Product ID of the Cypress - CY7C64613 (AN2235). + Somehow Artec/Ultima Electronic forgot to program the eeprom of some of their + USB1.1/USB2.0 devices. + So comes that they identify with the default Vendor and Product ID of the Cypress + CY7C64613 (AN2235) or Cypress FX2. - Say Y if your Artec device has 0x0574 as Vendor ID and 0x2235 as Product ID. + Affected device IDs: + 0x0574:0x2235 (Artec T1 USB1.1, cold) + 0x04b4:0x8613 (Artec T1 USB2.0, cold) + 0x0574:0x1002 (Artec T1 USB2.0, warm) + + Say Y if your device one of the mentioned IDs. config DVB_DIBCOM_DEBUG bool "Enable extended debug support for DiBcom USB device" depends on DVB_DIBUSB help Say Y if you want to enable debuging. See modinfo dvb-dibusb for - debug level. + debug levels. diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h index 30c2f168d..1b111d4a4 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h @@ -109,6 +109,8 @@ struct dibusb_device { #define USB_VID_ANCHOR 0x0547 #define USB_VID_AVERMEDIA 0x14aa #define USB_VID_COMPRO 0x185b +#define USB_VID_COMPRO_UNK 0x145f +#define USB_VID_CYPRESS 0x04b4 #define USB_VID_DIBCOM 0x10b8 #define USB_VID_EMPIA 0xeb1a #define USB_VID_GRANDTEC 0x5032 @@ -122,6 +124,8 @@ struct dibusb_device { #define USB_PID_AVERMEDIA_DVBT_USB_WARM 0x0002 #define USB_PID_COMPRO_DVBU2000_COLD 0xd000 #define USB_PID_COMPRO_DVBU2000_WARM 0xd001 +#define USB_PID_COMPRO_DVBU2000_UNK_COLD 0x010c +#define USB_PID_COMPRO_DVBU2000_UNK_WARM 0x010d #define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8 #define USB_PID_DIBCOM_MOD3000_WARM 0x0bb9 #define USB_PID_DIBCOM_MOD3001_COLD 0x0bc6 @@ -137,12 +141,15 @@ struct dibusb_device { #define USB_PID_ULTIMA_TVBOX_AN2235_COLD 0x8107 #define USB_PID_ULTIMA_TVBOX_AN2235_WARM 0x8108 #define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD 0x2235 +#define USB_PID_ULTIMA_TVBOX_USB2_COLD 0x8109 +#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD 0x8613 +#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM 0x1002 #define USB_PID_UNK_HYPER_PALTEK_COLD 0x005e #define USB_PID_UNK_HYPER_PALTEK_WARM 0x005f #define USB_PID_YAKUMO_DTT200U_COLD 0x0201 #define USB_PID_YAKUMO_DTT200U_WARM 0x0301 -#define DIBUSB_SUPPORTED_DEVICES 12 +#define DIBUSB_SUPPORTED_DEVICES 15 /* USB Driver stuff */ static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = { @@ -176,11 +183,26 @@ static struct dibusb_device dibusb_devices[DIBUSB_SUPPORTED_DEVICES] = { .warm_product_id = 0, /* undefined, this design becomes USB_PID_DIBCOM_MOD3000_WARM in warm state */ .parm = &dibusb_dev_parm[2], }, + { .name = "Artec T1 USB2.0 TVBOX (please report the warm ID)", + .cold_product_id = USB_PID_ULTIMA_TVBOX_USB2_COLD, + .warm_product_id = 0, /* don't know, it is most likely that the device will get another USB ID in warm state */ + .parm = &dibusb_dev_parm[1], + }, + { .name = "Artec T1 USB2.0 TVBOX with FX2 IDs (misdesigned, please report the warm ID)", + .cold_product_id = USB_PID_ULTIMA_TVBOX_USB2_FX_COLD, + .warm_product_id = USB_PID_ULTIMA_TVBOX_USB2_FX_WARM, /* undefined, it could be that the device will get another USB ID in warm state */ + .parm = &dibusb_dev_parm[1], + }, { .name = "Compro Videomate DVB-U2000 - DVB-T USB1.1", .cold_product_id = USB_PID_COMPRO_DVBU2000_COLD, .warm_product_id = USB_PID_COMPRO_DVBU2000_WARM, .parm = &dibusb_dev_parm[0], }, + { .name = "Compro Videomate DVB-U2000 - DVB-T USB1.1 (really ?? please report the name!)", + .cold_product_id = USB_PID_COMPRO_DVBU2000_UNK_COLD, + .warm_product_id = USB_PID_COMPRO_DVBU2000_UNK_WARM, + .parm = &dibusb_dev_parm[0], + }, { .name = "Unkown USB1.1 DVB-T device ???? please report the name to the author", .cold_product_id = USB_PID_UNK_HYPER_PALTEK_COLD, .warm_product_id = USB_PID_UNK_HYPER_PALTEK_WARM, @@ -237,14 +259,18 @@ static struct usb_device_id dibusb_table [] = { { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_AN2235_WARM) }, { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_YAKUMO_DTT200U_COLD) }, { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_YAKUMO_DTT200U_WARM) }, + { USB_DEVICE(USB_PID_COMPRO_DVBU2000_UNK_COLD, USB_VID_COMPRO_UNK) }, + { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ULTIMA_TVBOX_USB2_COLD) }, /* - * activate the following define when you have the device and want to compile - * build from build-2.6 in dvb-kernel + * 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_AN2235 -#ifdef CONFIG_DVB_DIBUSB_MISDESIGNED_AN2235 +// #define CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES +#ifdef CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) }, + { USB_DEVICE(USB_VID_CYPRESS, USB_PID_ULTIMA_TVBOX_USB2_FX_COLD) }, + { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_USB2_FX_WARM) }, #endif { } /* Terminating entry */ }; -- cgit v1.2.3