aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-maestro.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/radio/radio-maestro.c')
-rw-r--r--drivers/media/radio/radio-maestro.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 39c1d9118636..fcfa6c9fe225 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -2,7 +2,7 @@
2 * (c) 2000 A. Tlalka, atlka@pg.gda.pl 2 * (c) 2000 A. Tlalka, atlka@pg.gda.pl
3 * Notes on the hardware 3 * Notes on the hardware
4 * 4 *
5 * + Frequency control is done digitally 5 * + Frequency control is done digitally
6 * + No volume control - only mute/unmute - you have to use Aux line volume 6 * + No volume control - only mute/unmute - you have to use Aux line volume
7 * control on Maestro card to set the volume 7 * control on Maestro card to set the volume
8 * + Radio status (tuned/not_tuned and stereo/mono) is valid some time after 8 * + Radio status (tuned/not_tuned and stereo/mono) is valid some time after
@@ -26,7 +26,7 @@
26#include <linux/mutex.h> 26#include <linux/mutex.h>
27#include <linux/pci.h> 27#include <linux/pci.h>
28#include <linux/videodev.h> 28#include <linux/videodev.h>
29 29#include <media/v4l2-common.h>
30 30
31#define DRIVER_VERSION "0.05" 31#define DRIVER_VERSION "0.05"
32 32
@@ -103,7 +103,7 @@ static struct video_device maestro_radio = {
103struct radio_device { 103struct radio_device {
104 u16 io, /* base of Maestro card radio io (GPIO_DATA)*/ 104 u16 io, /* base of Maestro card radio io (GPIO_DATA)*/
105 muted, /* VIDEO_AUDIO_MUTE */ 105 muted, /* VIDEO_AUDIO_MUTE */
106 stereo, /* VIDEO_TUNER_STEREO_ON */ 106 stereo, /* VIDEO_TUNER_STEREO_ON */
107 tuned; /* signal strength (0 or 0xffff) */ 107 tuned; /* signal strength (0 or 0xffff) */
108 struct mutex lock; 108 struct mutex lock;
109}; 109};
@@ -122,14 +122,14 @@ static u32 radio_bits_get(struct radio_device *dev)
122 for (l=24;l--;) { 122 for (l=24;l--;) {
123 outw(STR_CLK, io); /* HI state */ 123 outw(STR_CLK, io); /* HI state */
124 udelay(2); 124 udelay(2);
125 if(!l) 125 if(!l)
126 dev->tuned = inw(io) & STR_MOST ? 0 : 0xffff; 126 dev->tuned = inw(io) & STR_MOST ? 0 : 0xffff;
127 outw(0, io); /* LO state */ 127 outw(0, io); /* LO state */
128 udelay(2); 128 udelay(2);
129 data <<= 1; /* shift data */ 129 data <<= 1; /* shift data */
130 rdata = inw(io); 130 rdata = inw(io);
131 if(!l) 131 if(!l)
132 dev->stereo = rdata & STR_MOST ? 132 dev->stereo = rdata & STR_MOST ?
133 0 : VIDEO_TUNER_STEREO_ON; 133 0 : VIDEO_TUNER_STEREO_ON;
134 else 134 else
135 if(rdata & STR_DATA) 135 if(rdata & STR_DATA)