forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] tm6000: add radio capabilities

Browse source 
add radio capabilities

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Stefan Ringel 2011-05-09 16:53:49 -03:00 • committed by Mauro Carvalho Chehab
parent cecc2471ea
commit 1416910743
3 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/tm6000/tm6000-cards.c
View file

@ -254,6 +254,7 @@ struct tm6000_board tm6000_boards[] = {
.has_zl10353 = 1, .has_zl10353 = 1,
.has_eeprom = 1, .has_eeprom = 1,
.has_remote = 1, .has_remote = 1,
.has_radio = 1.
.has_input_comp = 1, .has_input_comp = 1,
.has_input_svid = 1, .has_input_svid = 1,
}, },
@ -276,6 +277,7 @@ struct tm6000_board tm6000_boards[] = {
.has_zl10353 = 0, .has_zl10353 = 0,
.has_eeprom = 1, .has_eeprom = 1,
.has_remote = 1, .has_remote = 1,
.has_radio = 1,
.has_input_comp = 1, .has_input_comp = 1,
.has_input_svid = 1, .has_input_svid = 1,
}, },
@ -350,6 +352,7 @@ struct tm6000_board tm6000_boards[] = {
.has_zl10353 = 1, .has_zl10353 = 1,
.has_eeprom = 1, .has_eeprom = 1,
.has_remote = 0, .has_remote = 0,
.has_radio = 1,
.has_input_comp = 0, .has_input_comp = 0,
.has_input_svid = 0, .has_input_svid = 0,
}, },
@ -372,6 +375,7 @@ struct tm6000_board tm6000_boards[] = {
.has_zl10353 = 0, .has_zl10353 = 0,
.has_eeprom = 1, .has_eeprom = 1,
.has_remote = 0, .has_remote = 0,
.has_radio = 1,
.has_input_comp = 0, .has_input_comp = 0,
.has_input_svid = 0, .has_input_svid = 0,
}, },

34
drivers/staging/tm6000/tm6000-video.c
View file

@ -1730,24 +1730,26 @@ int tm6000_v4l2_register(struct tm6000_core *dev)
printk(KERN_INFO "%s: registered device %s\n", printk(KERN_INFO "%s: registered device %s\n",
dev->name, video_device_node_name(dev->vfd)); dev->name, video_device_node_name(dev->vfd));
dev->radio_dev = vdev_init(dev, &tm6000_radio_template, if (dev->caps.has_radio) {
"radio"); dev->radio_dev = vdev_init(dev, &tm6000_radio_template,
if (!dev->radio_dev) { "radio");
printk(KERN_INFO "%s: can't register radio device\n", if (!dev->radio_dev) {
dev->name); printk(KERN_INFO "%s: can't register radio device\n",
return ret; /* FIXME release resource */ dev->name);
} return ret; /* FIXME release resource */
}
ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO, ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
radio_nr); radio_nr);
if (ret < 0) { if (ret < 0) {
printk(KERN_INFO "%s: can't register radio device\n", printk(KERN_INFO "%s: can't register radio device\n",
dev->name); dev->name);
return ret; /* FIXME release resource */ return ret; /* FIXME release resource */
} }
printk(KERN_INFO "%s: registered device %s\n", printk(KERN_INFO "%s: registered device %s\n",
dev->name, video_device_node_name(dev->radio_dev)); dev->name, video_device_node_name(dev->radio_dev));
}
printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret); printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret);
return ret; return ret;

1
drivers/staging/tm6000/tm6000.h
View file

@ -129,6 +129,7 @@ struct tm6000_capabilities {
unsigned int has_zl10353:1; unsigned int has_zl10353:1;
unsigned int has_eeprom:1; unsigned int has_eeprom:1;
unsigned int has_remote:1; unsigned int has_remote:1;
unsigned int has_radio:1;
unsigned int has_input_comp:1; unsigned int has_input_comp:1;
unsigned int has_input_svid:1; unsigned int has_input_svid:1;
}; };