Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Ondrej Zary and committed by
Mauro Carvalho Chehab
abed623c e243c3c4

+10 -6
+1 -1
drivers/media/radio/Kconfig
··· 320 320 module will be called radio-miropcm20. 321 321 322 322 config RADIO_SF16FMI 323 - tristate "SF16-FMI/SF16-FMP Radio" 323 + tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio" 324 324 depends on ISA && VIDEO_V4L2 325 325 ---help--- 326 326 Choose Y here if you have one of these FM radio cards.
+9 -5
drivers/media/radio/radio-sf16fmi.c
··· 1 - /* SF16-FMI and SF16-FMP radio driver for Linux radio support 1 + /* SF16-FMI, SF16-FMP and SF16-FMD radio driver for Linux radio support 2 2 * heavily based on rtrack driver... 3 3 * (c) 1997 M. Kirkwood 4 4 * (c) 1998 Petr Vandrovec, vandrove@vc.cvut.cz ··· 11 11 * 12 12 * Frequency control is done digitally -- ie out(port,encodefreq(95.8)); 13 13 * No volume control - only mute/unmute - you have to use line volume 14 - * control on SB-part of SF16-FMI/SF16-FMP 14 + * control on SB-part of SF16-FMI/SF16-FMP/SF16-FMD 15 15 * 16 16 * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org> 17 17 */ ··· 29 29 #include <media/v4l2-ioctl.h> 30 30 31 31 MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood"); 32 - MODULE_DESCRIPTION("A driver for the SF16-FMI and SF16-FMP radio."); 32 + MODULE_DESCRIPTION("A driver for the SF16-FMI, SF16-FMP and SF16-FMD radio."); 33 33 MODULE_LICENSE("GPL"); 34 34 MODULE_VERSION("0.0.3"); 35 35 ··· 37 37 static int radio_nr = -1; 38 38 39 39 module_param(io, int, 0); 40 - MODULE_PARM_DESC(io, "I/O address of the SF16-FMI or SF16-FMP card (0x284 or 0x384)"); 40 + MODULE_PARM_DESC(io, "I/O address of the SF16-FMI/SF16-FMP/SF16-FMD card (0x284 or 0x384)"); 41 41 module_param(radio_nr, int, 0); 42 42 43 43 struct fmi ··· 130 130 struct v4l2_capability *v) 131 131 { 132 132 strlcpy(v->driver, "radio-sf16fmi", sizeof(v->driver)); 133 - strlcpy(v->card, "SF16-FMx radio", sizeof(v->card)); 133 + strlcpy(v->card, "SF16-FMI/FMP/FMD radio", sizeof(v->card)); 134 134 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 135 135 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 136 136 return 0; ··· 277 277 278 278 /* ladis: this is my card. does any other types exist? */ 279 279 static struct isapnp_device_id id_table[] __devinitdata = { 280 + /* SF16-FMI */ 280 281 { ISAPNP_ANY_ID, ISAPNP_ANY_ID, 281 282 ISAPNP_VENDOR('M','F','R'), ISAPNP_FUNCTION(0xad10), 0}, 283 + /* SF16-FMD */ 284 + { ISAPNP_ANY_ID, ISAPNP_ANY_ID, 285 + ISAPNP_VENDOR('M','F','R'), ISAPNP_FUNCTION(0xad12), 0}, 282 286 { ISAPNP_CARD_END, }, 283 287 }; 284 288