Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285675
b: refs/heads/master
c: 53844c4
h: refs/heads/master
i:
  285673: 8dc7fce
  285671: 0112061
v: v3
  • Loading branch information
Malcolm Priestley authored and Mauro Carvalho Chehab committed Jan 5, 2012
1 parent 43c732f commit 168f564
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6cb393c82255c448a92754f2a2a6b715bd9418dc
refs/heads/master: 53844c4fc7912fef2f56c1b3f851b30c8ebd1d8a
1 change: 1 addition & 0 deletions trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
#define USB_PID_INTEL_CE9500 0x9500
#define USB_PID_ITETECH_IT9135 0x9135
#define USB_PID_ITETECH_IT9135_9005 0x9005
#define USB_PID_ITETECH_IT9135_9006 0x9006
#define USB_PID_KWORLD_399U 0xe399
#define USB_PID_KWORLD_399U_2 0xe400
#define USB_PID_KWORLD_395U 0xe396
Expand Down
17 changes: 15 additions & 2 deletions trunk/drivers/media/dvb/dvb-usb/it913x.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ static int it913x_rc_query(struct dvb_usb_device *d)

/* Firmware sets raw */
const char fw_it9135_v1[] = "dvb-usb-it9135-01.fw";
const char fw_it9135_v2[] = "dvb-usb-it9135-02.fw";
const char fw_it9137[] = "dvb-usb-it9137-01.fw";

static int ite_firmware_select(struct usb_device *udev,
Expand All @@ -400,6 +401,9 @@ static int ite_firmware_select(struct usb_device *udev,
else if (le16_to_cpu(udev->descriptor.idProduct) ==
USB_PID_ITETECH_IT9135_9005)
sw = IT9135_V1_FW;
else if (le16_to_cpu(udev->descriptor.idProduct) ==
USB_PID_ITETECH_IT9135_9006)
sw = IT9135_V2_FW;
else
sw = IT9137_FW;

Expand All @@ -413,6 +417,11 @@ static int ite_firmware_select(struct usb_device *udev,
it913x_config.adc_x2 = 1;
props->firmware = fw_it9135_v1;
break;
case IT9135_V2_FW:
it913x_config.firmware_ver = 1;
it913x_config.adc_x2 = 1;
props->firmware = fw_it9135_v2;
break;
case IT9137_FW:
default:
it913x_config.firmware_ver = 0;
Expand Down Expand Up @@ -701,6 +710,7 @@ static struct usb_device_id it913x_table[] = {
{ USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135) },
{ USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV22_IT9137) },
{ USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135_9005) },
{ USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135_9006) },
{} /* Terminating entry */
};

Expand Down Expand Up @@ -776,7 +786,7 @@ static struct dvb_usb_device_properties it913x_properties = {
.rc_codes = RC_MAP_MSI_DIGIVOX_III,
},
.i2c_algo = &it913x_i2c_algo,
.num_device_descs = 4,
.num_device_descs = 5,
.devices = {
{ "Kworld UB499-2T T09(IT9137)",
{ &it913x_table[0], NULL },
Expand All @@ -790,6 +800,9 @@ static struct dvb_usb_device_properties it913x_properties = {
{ "ITE 9135(9005) Generic",
{ &it913x_table[3], NULL },
},
{ "ITE 9135(9006) Generic",
{ &it913x_table[4], NULL },
},
}
};

Expand Down Expand Up @@ -823,5 +836,5 @@ module_exit(it913x_module_exit);

MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
MODULE_DESCRIPTION("it913x USB 2 Driver");
MODULE_VERSION("1.14");
MODULE_VERSION("1.17");
MODULE_LICENSE("GPL");

0 comments on commit 168f564

Please sign in to comment.