diff options
| -rw-r--r-- | linux/Documentation/dvb/README.dibusb | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dibusb/dvb-dibusb.h | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/linux/Documentation/dvb/README.dibusb b/linux/Documentation/dvb/README.dibusb index f868c2f5d..0c1da012c 100644 --- a/linux/Documentation/dvb/README.dibusb +++ b/linux/Documentation/dvb/README.dibusb @@ -122,7 +122,8 @@ can get it directly via for USB1.1 (AN2135) http://linuxtv.org/cgi-bin/cvsweb.cgi/dvb-kernel/firmware/dvb-dibusb-5.0.0.11.fw?rev=1.1&content-type=text/plain -for USB1.1 (AN2235) +for USB1.1 (AN2235) (a few Artec T1 devices) +http://linuxtv.org/cgi-bin/cvsweb.cgi/dvb-kernel/firmware/dvb-dibusb-an2235-1.fw?rev=1.1&content-type=text/plain for USB2.0 (FX2) http://linuxtv.org/cgi-bin/cvsweb.cgi/dvb-kernel/firmware/dvb-dibusb-6.0.0.5.fw?rev=1.1&content-type=text/plain diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c index 65fbd3940..7a064bbd9 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.c +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.c @@ -263,7 +263,7 @@ static int dibusb_interrupt_read_loop(struct usb_dibusb *dib) /* * TODO: a tasklet should run with a delay of 1/10 second * and feed an appropriate event device ? - * NEC protocol is used for remote controlls + * NEC protocol is used for remote controls */ static int dibusb_read_remote_control(struct usb_dibusb *dib) { @@ -274,7 +274,7 @@ static int dibusb_read_remote_control(struct usb_dibusb *dib) switch (rb[0]) { case DIBUSB_RC_NEC_KEY_PRESSED: - + /* rb[1-4] is the actual key */ break; case DIBUSB_RC_NEC_EMPTY: case DIBUSB_RC_NEC_KEY_REPEATED: diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h index 5431cd251..4e2a2e464 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb.h +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb.h @@ -26,6 +26,7 @@ static const char * dibusb_fw_filenames1_1[] = { }; static const char * dibusb_fw_filenames1_1_an2235[] = { + "dvb-dibusb-an2235-1.fw" }; static const char * dibusb_fw_filenames2_0[] = { @@ -105,7 +106,7 @@ struct dibusb_device { }; /* Vendor IDs */ -#define USB_VID_ANCHOR 0x0574 +#define USB_VID_ANCHOR 0x0547 #define USB_VID_AVERMEDIA 0x14aa #define USB_VID_COMPRO 0x185b #define USB_VID_DIBCOM 0x10b8 @@ -236,7 +237,12 @@ 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) }, -// #define CONFIG_DVB_DIBUSB_MISDESIGNED_AN2235 + +/* + * activate the following define when you have the device and want to compile + * build from build-2.6 in dvb-kernel + */ +// #define CONFIG_DVB_DIBUSB_MISDESIGNED_AN2235 #ifdef CONFIG_DVB_DIBUSB_MISDESIGNED_AN2235 { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) }, #endif |