openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] ngene: Firmware 18 support 

Small modifications for firmware 18.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Oliver Endriss 2011-01-10 06:36:11 -03:00 committed by Mauro Carvalho Chehab
parent f790bdd00d
commit 09961aae7b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/dvb/ngene/ngene-core.c
View File

@ -1257,6 +1257,10 @@ static int ngene_load_firm(struct ngene *dev)
fw_name = "ngene_17.fw";
dev->cmd_timeout_workaround = true;
break;
case 18:
size = 0;
fw_name = "ngene_18.fw";
break;
}
if (request_firmware(&fw, fw_name, &dev->pci_dev->dev) < 0) {
@ -1266,6 +1270,8 @@ static int ngene_load_firm(struct ngene *dev)
": Copy %s to your hotplug directory!\n", fw_name);
return -1;
}
if (size == 0)
size = fw->size;
if (size != fw->size) {
printk(KERN_ERR DEVICE_NAME
": Firmware %s has invalid size!", fw_name);
@ -1365,7 +1371,7 @@ static int ngene_start(struct ngene *dev)
if (stat < 0)
goto fail;
if (dev->card_info->fw_version == 17) {
if (dev->card_info->fw_version >= 17) {
u8 tsin4_config[6] = {
3072 / 64, 3072 / 64, 0, 3072 / 64, 3072 / 64, 0};
u8 default_config[6] = {
@ -1374,7 +1380,7 @@ static int ngene_start(struct ngene *dev)
if (dev->card_info->io_type[3] == NGENE_IO_TSIN)
bconf = tsin4_config;
dprintk(KERN_DEBUG DEVICE_NAME ": FW 17 buffer config\n");
dprintk(KERN_DEBUG DEVICE_NAME ": FW 17+ buffer config\n");
stat = ngene_command_config_free_buf(dev, bconf);
} else {
int bconf = BUFFER_CONFIG_4422;