summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/dvb/dvb-usb/af9015.c27
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
-rw-r--r--linux/drivers/media/dvb/frontends/af9013.c4
3 files changed, 17 insertions, 15 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/af9015.c b/linux/drivers/media/dvb/dvb-usb/af9015.c
index 776d01d4a..64d2d0f8c 100644
--- a/linux/drivers/media/dvb/dvb-usb/af9015.c
+++ b/linux/drivers/media/dvb/dvb-usb/af9015.c
@@ -54,7 +54,6 @@ static struct af9013_config af9015_af9013_config[] = {
.output_mode = AF9013_OUTPUT_MODE_USB,
.api_version = { 0, 1, 9, 0 },
.gpio[0] = AF9013_GPIO_HI,
- .gpio[1] = AF9013_GPIO_LO,
.gpio[3] = AF9013_GPIO_TUNER_ON,
}, {
@@ -662,7 +661,7 @@ static int af9015_download_firmware(struct usb_device *udev,
len = remainder;
req.data_len = len;
- req.data = (fw->data + i * FW_PACKET_MAX_DATA);
+ req.data = (u8 *)(fw->data + i * FW_PACKET_MAX_DATA);
req.addr = addr;
addr += FW_PACKET_MAX_DATA;
@@ -673,7 +672,6 @@ static int af9015_download_firmware(struct usb_device *udev,
goto error;
}
}
- #undef FW_PACKET_MAX_DATA
/* firmware loaded, request boot */
req.cmd = BOOT;
@@ -744,7 +742,7 @@ static int af9015_read_config(struct usb_device *udev)
}
} else {
switch (udev->descriptor.idVendor) {
- case cpu_to_le16(USB_VID_LEADTEK):
+ case USB_VID_LEADTEK:
af9015_properties[i].rc_key_map =
af9015_rc_keys_leadtek;
af9015_properties[i].rc_key_map_size =
@@ -754,9 +752,9 @@ static int af9015_read_config(struct usb_device *udev)
af9015_config.ir_table_size =
ARRAY_SIZE(af9015_ir_table_leadtek);
break;
- case cpu_to_le16(USB_VID_VISIONPLUS):
+ case USB_VID_VISIONPLUS:
if (udev->descriptor.idProduct ==
- cpu_to_le16(USB_PID_AZUREWAVE_AD_TU700)) {
+ USB_PID_AZUREWAVE_AD_TU700) {
af9015_properties[i].rc_key_map =
af9015_rc_keys_twinhan;
af9015_properties[i].rc_key_map_size =
@@ -767,7 +765,7 @@ static int af9015_read_config(struct usb_device *udev)
ARRAY_SIZE(af9015_ir_table_twinhan);
}
break;
- case cpu_to_le16(USB_VID_KWORLD_2):
+ case USB_VID_KWORLD_2:
/* TODO: use correct rc keys */
af9015_properties[i].rc_key_map =
af9015_rc_keys_twinhan;
@@ -780,7 +778,7 @@ static int af9015_read_config(struct usb_device *udev)
/* Check USB manufacturer and product strings and try
to determine correct remote in case of chip vendor
reference IDs are used. */
- case cpu_to_le16(USB_VID_AFATECH):
+ case USB_VID_AFATECH:
memset(manufacturer, 0, sizeof(manufacturer));
usb_string(udev, udev->descriptor.iManufacturer,
manufacturer, sizeof(manufacturer));
@@ -1089,7 +1087,7 @@ static struct mxl5005s_config af9015_mxl5003_config = {
.xtal_freq = CRYSTAL_FREQ_16000000HZ,
.agc_mode = MXL_SINGLE_AGC,
.tracking_filter = MXL_TF_DEFAULT,
- .rssi_enable = MXL_RSSI_DISABLE,
+ .rssi_enable = MXL_RSSI_ENABLE,
.cap_select = MXL_CAP_SEL_ENABLE,
.div_out = MXL_DIV_OUT_4,
.clock_out = MXL_CLOCK_OUT_DISABLE,
@@ -1106,7 +1104,7 @@ static struct mxl5005s_config af9015_mxl5005_config = {
.xtal_freq = CRYSTAL_FREQ_16000000HZ,
.agc_mode = MXL_SINGLE_AGC,
.tracking_filter = MXL_TF_OFF,
- .rssi_enable = MXL_RSSI_DISABLE,
+ .rssi_enable = MXL_RSSI_ENABLE,
.cap_select = MXL_CAP_SEL_ENABLE,
.div_out = MXL_DIV_OUT_4,
.clock_out = MXL_CLOCK_OUT_DISABLE,
@@ -1198,6 +1196,7 @@ static struct usb_device_id af9015_usb_table[] = {
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_X_2)},
{USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)},
{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},
+/* 15 */{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)},
{0},
};
MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1348,7 +1347,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.i2c_algo = &af9015_i2c_algo,
- .num_device_descs = 5,
+ .num_device_descs = 6,
.devices = {
{
.name = "Xtensions XD-380",
@@ -1375,10 +1374,14 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.cold_ids = {&af9015_usb_table[14], NULL},
.warm_ids = {NULL},
},
+ {
+ .name = "MSI Digi VOX mini III",
+ .cold_ids = {&af9015_usb_table[15], NULL},
+ .warm_ids = {NULL},
+ },
}
}
};
-#undef AF9015_DEFAULT_PROPERTIES
static int af9015_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id)
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index dfaf1d257..7380b94b3 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -232,5 +232,6 @@
#define USB_PID_DW2102 0x2102
#define USB_PID_XTENSIONS_XD_380 0x0381
#define USB_PID_TELESTAR_STARSTICK_2 0x8000
+#define USB_PID_MSI_DIGI_VOX_MINI_III 0x8807
#endif
diff --git a/linux/drivers/media/dvb/frontends/af9013.c b/linux/drivers/media/dvb/frontends/af9013.c
index 50e1e3f30..21c1060cf 100644
--- a/linux/drivers/media/dvb/frontends/af9013.c
+++ b/linux/drivers/media/dvb/frontends/af9013.c
@@ -1490,7 +1490,7 @@ static int af9013_download_firmware(struct af9013_state *state)
if (i == packets) /* set size of the last packet */
len = remainder;
- data = (fw->data + i * FW_PACKET_MAX_DATA);
+ data = (u8 *)(fw->data + i * FW_PACKET_MAX_DATA);
ret = af9013_write_ofsm_regs(state, addr, data, len);
addr += FW_PACKET_MAX_DATA;
@@ -1500,8 +1500,6 @@ static int af9013_download_firmware(struct af9013_state *state)
}
}
- #undef FW_PACKET_MAX_DATA
-
/* request boot firmware */
ret = af9013_write_reg(state, 0xe205, 1);
if (ret)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 05:55:11 +0000