Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f4b725 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Linus Torvalds
Browse files

[PATCH] dvb: Add support for the Artec T1 USB2.0 box 



Adding support for the Artec T1 USB2.0 box (real USB2.0)

Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f93cf038

drivers/media/dvb/dvb-usb/dibusb-mb.c

+55 −4
Original line number Diff line number Diff line
@@ -82,13 +82,15 @@ static int dibusb_tuner_probe_and_attach(struct dvb_usb_device *d) 
static struct dvb_usb_properties dibusb1_1_properties;

static struct dvb_usb_properties dibusb1_1_an2235_properties;

static struct dvb_usb_properties dibusb2_0b_properties;

static struct dvb_usb_properties artec_t1_usb2_properties;



static int dibusb_probe(struct usb_interface *intf,

		const struct usb_device_id *id)

{

	if (dvb_usb_device_init(intf,&dibusb1_1_properties,THIS_MODULE,NULL) == 0 ||

		dvb_usb_device_init(intf,&dibusb1_1_an2235_properties,THIS_MODULE,NULL) == 0 ||

		dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0)

		dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0 ||

		dvb_usb_device_init(intf,&artec_t1_usb2_properties,THIS_MODULE,NULL) == 0)

		return 0;



	return -EINVAL;
@@ -128,10 +130,13 @@ static struct usb_device_id dibusb_dib3000mb_table [] = { 


/* 27 */	{ USB_DEVICE(USB_VID_KWORLD,		USB_PID_KWORLD_VSTREAM_COLD) },



/* 28 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,		USB_PID_ULTIMA_TVBOX_USB2_COLD) },

/* 29 */	{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC,		USB_PID_ULTIMA_TVBOX_USB2_WARM) },



// #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs



#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs

/* 28 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },

/* 30 */	{ USB_DEVICE(USB_VID_ANCHOR,		USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) },

#endif

			{ }		/* Terminating entry */

};
@@ -264,7 +269,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = { 
		},

#ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs

		{	"Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)",

			{ &dibusb_dib3000mb_table[28], NULL },

			{ &dibusb_dib3000mb_table[30], NULL },

			{ NULL },

		},

#endif
@@ -273,7 +278,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = { 


static struct dvb_usb_properties dibusb2_0b_properties = {

	.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,

	.pid_filter_count = 32,

	.pid_filter_count = 16,



	.usb_ctrl = CYPRESS_FX2,
@@ -321,6 +326,52 @@ static struct dvb_usb_properties dibusb2_0b_properties = { 
	}

};



static struct dvb_usb_properties artec_t1_usb2_properties = {

	.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,

	.pid_filter_count = 16,



	.usb_ctrl = CYPRESS_FX2,



	.firmware = "dvb-usb-dibusb-6.0.0.8.fw",



	.size_of_priv     = sizeof(struct dibusb_state),



	.streaming_ctrl   = dibusb2_0_streaming_ctrl,

	.pid_filter       = dibusb_pid_filter,

	.pid_filter_ctrl  = dibusb_pid_filter_ctrl,

	.power_ctrl       = dibusb2_0_power_ctrl,

	.frontend_attach  = dibusb_dib3000mb_frontend_attach,

	.tuner_attach     = dibusb_tuner_probe_and_attach,



	.rc_interval      = DEFAULT_RC_INTERVAL,

	.rc_key_map       = dibusb_rc_keys,

	.rc_key_map_size  = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */

	.rc_query         = dibusb_rc_query,



	.i2c_algo         = &dibusb_i2c_algo,



	.generic_bulk_ctrl_endpoint = 0x01,

	/* parameter for the MPEG2-data transfer */

	.urb = {

		.type = DVB_USB_BULK,

		.count = 7,

		.endpoint = 0x06,

		.u = {

			.bulk = {

				.buffersize = 4096,

			}

		}

	},



	.num_device_descs = 1,

	.devices = {

		{	"Artec T1 USB2.0",

			{ &dibusb_dib3000mb_table[28], NULL },

			{ &dibusb_dib3000mb_table[29], NULL },

		},

	}

};



static struct usb_driver dibusb_driver = {

	.owner		= THIS_MODULE,

	.name		= "dvb_usb_dibusb_mb",

drivers/media/dvb/dvb-usb/dibusb.h

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ 
#ifndef _DVB_USB_DIBUSB_H_

#define _DVB_USB_DIBUSB_H_



#ifndef DVB_USB_LOG_PREFIX

 #define DVB_USB_LOG_PREFIX "dibusb"

#endif

#include "dvb-usb.h"



#include "dib3000.h"

drivers/media/dvb/dvb-usb/dvb-usb-ids.h

+5 −0
Original line number Diff line number Diff line
@@ -43,10 +43,14 @@ 
#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_HOOK_DEFAULT			0x0064

#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM	0x0065

#define USB_PID_DIBCOM_MOD3000_COLD			0x0bb8

#define USB_PID_DIBCOM_MOD3000_WARM			0x0bb9

#define USB_PID_DIBCOM_MOD3001_COLD			0x0bc6

#define USB_PID_DIBCOM_MOD3001_WARM			0x0bc7

#define USB_PID_DIBCOM_STK7700				0x1e14

#define USB_PID_DIBCOM_STK7700_REENUM		0x1e15

#define USB_PID_DIBCOM_ANCHOR_2135_COLD		0x2131

#define USB_PID_GRANDTEC_DVBT_USB_COLD		0x0fa0

#define USB_PID_GRANDTEC_DVBT_USB_WARM		0x0fa1
@@ -68,6 +72,7 @@ 
#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_WARM		0x810a

#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