evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] radio-sf16fmi: add support for SF16-FMD

Browse source 
Add support for SF16-FMD card to radio-sf16fmi driver.
Only new PnP ID is added and texts changed.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Ondrej Zary 2012-05-19 13:18:26 -03:00 • committed by Mauro Carvalho Chehab
parent e243c3c4f7
commit abed623ca5
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/radio/Kconfig
View file

@ -320,7 +320,7 @@ config RADIO_MIROPCM20
module will be called radio-miropcm20. module will be called radio-miropcm20.
config RADIO_SF16FMI config RADIO_SF16FMI
tristate "SF16-FMI/SF16-FMP Radio" tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio"
depends on ISA && VIDEO_V4L2 depends on ISA && VIDEO_V4L2
---help--- ---help---
Choose Y here if you have one of these FM radio cards. Choose Y here if you have one of these FM radio cards.

14
drivers/media/radio/radio-sf16fmi.c
View file

@ -1,4 +1,4 @@
/* SF16-FMI and SF16-FMP radio driver for Linux radio support /* SF16-FMI, SF16-FMP and SF16-FMD radio driver for Linux radio support
* heavily based on rtrack driver... * heavily based on rtrack driver...
* (c) 1997 M. Kirkwood * (c) 1997 M. Kirkwood
* (c) 1998 Petr Vandrovec, vandrove@vc.cvut.cz * (c) 1998 Petr Vandrovec, vandrove@vc.cvut.cz
@ -11,7 +11,7 @@
* *
* Frequency control is done digitally -- ie out(port,encodefreq(95.8)); * Frequency control is done digitally -- ie out(port,encodefreq(95.8));
* No volume control - only mute/unmute - you have to use line volume * No volume control - only mute/unmute - you have to use line volume
* control on SB-part of SF16-FMI/SF16-FMP * control on SB-part of SF16-FMI/SF16-FMP/SF16-FMD
* *
* Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org> * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
*/ */
@ -29,7 +29,7 @@
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood"); MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
MODULE_DESCRIPTION("A driver for the SF16-FMI and SF16-FMP radio."); MODULE_DESCRIPTION("A driver for the SF16-FMI, SF16-FMP and SF16-FMD radio.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION("0.0.3"); MODULE_VERSION("0.0.3");
@ -37,7 +37,7 @@ static int io = -1;
static int radio_nr = -1; static int radio_nr = -1;
module_param(io, int, 0); module_param(io, int, 0);
MODULE_PARM_DESC(io, "I/O address of the SF16-FMI or SF16-FMP card (0x284 or 0x384)"); MODULE_PARM_DESC(io, "I/O address of the SF16-FMI/SF16-FMP/SF16-FMD card (0x284 or 0x384)");
module_param(radio_nr, int, 0); module_param(radio_nr, int, 0);
struct fmi struct fmi
@ -130,7 +130,7 @@ static int vidioc_querycap(struct file *file, void *priv,
struct v4l2_capability *v) struct v4l2_capability *v)
{ {
strlcpy(v->driver, "radio-sf16fmi", sizeof(v->driver)); strlcpy(v->driver, "radio-sf16fmi", sizeof(v->driver));
strlcpy(v->card, "SF16-FMx radio", sizeof(v->card)); strlcpy(v->card, "SF16-FMI/FMP/FMD radio", sizeof(v->card));
strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
return 0; return 0;
@ -277,8 +277,12 @@ static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
/* ladis: this is my card. does any other types exist? */ /* ladis: this is my card. does any other types exist? */
static struct isapnp_device_id id_table[] __devinitdata = { static struct isapnp_device_id id_table[] __devinitdata = {
/* SF16-FMI */
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID, { ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('M','F','R'), ISAPNP_FUNCTION(0xad10), 0}, ISAPNP_VENDOR('M','F','R'), ISAPNP_FUNCTION(0xad10), 0},
/* SF16-FMD */
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('M','F','R'), ISAPNP_FUNCTION(0xad12), 0},
{ ISAPNP_CARD_END, }, { ISAPNP_CARD_END, },
}; };