Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 13:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (13608): radio-sf16fmi: fix mute, add SF16-FMP to texts

Browse Source 
Fix completely broken mute handling radio-sf16fmi.
The sound was muted immediately after tuning in KRadio.
Also fix typos and add SF16-FMP to the texts.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Ondrej Zary 2009-12-10 17:06:44 -03:00 committed by Mauro Carvalho Chehab
parent 0b0a860fec
commit 4b83037474
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/radio/Kconfig
View File

@ -215,7 +215,7 @@ config RADIO_MIROPCM20
module will be called radio-miropcm20. module will be called radio-miropcm20.
config RADIO_SF16FMI config RADIO_SF16FMI
tristate "SF16FMI Radio" tristate "SF16-FMI/SF16-FMP 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. If you Choose Y here if you have one of these FM radio cards. If you

18
drivers/media/radio/radio-sf16fmi.c
View File

@ -1,4 +1,4 @@
/* SF16FMI radio driver for Linux radio support /* SF16-FMI and SF16-FMP 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 SF16FMI * control on SB-part of SF16-FMI/SF16-FMP
* *
* Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org> * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
*/ */
@ -30,14 +30,14 @@
#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 SF16MI radio."); MODULE_DESCRIPTION("A driver for the SF16-FMI and SF16-FMP radio.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int io = -1; 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 SF16MI card (0x284 or 0x384)"); MODULE_PARM_DESC(io, "I/O address of the SF16-FMI or SF16-FMP card (0x284 or 0x384)");
module_param(radio_nr, int, 0); module_param(radio_nr, int, 0);
#define RADIO_VERSION KERNEL_VERSION(0, 0, 2) #define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
@ -47,7 +47,7 @@ struct fmi
struct v4l2_device v4l2_dev; struct v4l2_device v4l2_dev;
struct video_device vdev; struct video_device vdev;
int io; int io;
int curvol; /* 1 or 0 */ bool mute;
unsigned long curfreq; /* freq in kHz */ unsigned long curfreq; /* freq in kHz */
struct mutex lock; struct mutex lock;
}; };
@ -105,7 +105,7 @@ static inline int fmi_setfreq(struct fmi *fmi, unsigned long freq)
outbits(8, 0xC0, fmi->io); outbits(8, 0xC0, fmi->io);
msleep(143); /* was schedule_timeout(HZ/7) */ msleep(143); /* was schedule_timeout(HZ/7) */
mutex_unlock(&fmi->lock); mutex_unlock(&fmi->lock);
if (fmi->curvol) if (!fmi->mute)
fmi_unmute(fmi); fmi_unmute(fmi);
return 0; return 0;
} }
@ -116,7 +116,7 @@ static inline int fmi_getsigstr(struct fmi *fmi)
int res; int res;
mutex_lock(&fmi->lock); mutex_lock(&fmi->lock);
val = fmi->curvol ? 0x08 : 0x00; /* unmute/mute */ val = fmi->mute ? 0x00 : 0x08; /* mute/unmute */
outb(val, fmi->io); outb(val, fmi->io);
outb(val | 0x10, fmi->io); outb(val | 0x10, fmi->io);
msleep(143); /* was schedule_timeout(HZ/7) */ msleep(143); /* was schedule_timeout(HZ/7) */
@ -208,7 +208,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE: case V4L2_CID_AUDIO_MUTE:
ctrl->value = fmi->curvol; ctrl->value = fmi->mute;
return 0; return 0;
} }
return -EINVAL; return -EINVAL;
@ -225,7 +225,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
fmi_mute(fmi); fmi_mute(fmi);
else else
fmi_unmute(fmi); fmi_unmute(fmi);
fmi->curvol = ctrl->value; fmi->mute = ctrl->value;
return 0; return 0;
} }
return -EINVAL; return -EINVAL;