X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fradio%2Fradio-sf16fmi.c;fp=drivers%2Fmedia%2Fradio%2Fradio-sf16fmi.c;h=0229f792a05969717a7271356a03a1a6c51da3ce;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=efee6e339d15b0b7d7110160640e2c2ca35536e1;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index efee6e339..0229f792a 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -12,7 +12,7 @@
  *  Frequency control is done digitally -- ie out(port,encodefreq(95.8));
  *  No volume control - only mute/unmute - you have to use line volume
  *  control on SB-part of SF16FMI
- *
+ *  
  */
 
 #include <linux/kernel.h>	/* __setup			*/
@@ -21,28 +21,27 @@
 #include <linux/ioport.h>	/* request_region		*/
 #include <linux/delay.h>	/* udelay			*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
-#include <media/v4l2-common.h>
 #include <linux/isapnp.h>
 #include <asm/io.h>		/* outb, outb_p			*/
 #include <asm/uaccess.h>	/* copy to/from user		*/
-#include <linux/mutex.h>
+#include <asm/semaphore.h>
 
 struct fmi_device
 {
 	int port;
-	int curvol; /* 1 or 0 */
-	unsigned long curfreq; /* freq in kHz */
-	__u32 flags;
+        int curvol; /* 1 or 0 */
+        unsigned long curfreq; /* freq in kHz */
+        __u32 flags;
 };
 
-static int io = -1;
+static int io = -1; 
 static int radio_nr = -1;
 static struct pnp_dev *dev = NULL;
-static struct mutex lock;
+static struct semaphore lock;
 
 /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */
 /* It is only useful to give freq in intervall of 800 (=0.05Mhz),
- * other bits will be truncated, e.g 92.7400016 -> 92.7, but
+ * other bits will be truncated, e.g 92.7400016 -> 92.7, but 
  * 92.7400017 -> 92.75
  */
 #define RSF16_ENCODE(x)	((x)/800+214)
@@ -52,7 +51,7 @@ static struct mutex lock;
 static void outbits(int bits, unsigned int data, int port)
 {
 	while(bits--) {
-		if(data & 1) {
+ 		if(data & 1) {
 			outb(5, port);
 			udelay(6);
 			outb(7, port);
@@ -69,16 +68,16 @@ static void outbits(int bits, unsigned int data, int port)
 
 static inline void fmi_mute(int port)
 {
-	mutex_lock(&lock);
+	down(&lock);
 	outb(0x00, port);
-	mutex_unlock(&lock);
+	up(&lock);
 }
 
 static inline void fmi_unmute(int port)
 {
-	mutex_lock(&lock);
+	down(&lock);
 	outb(0x08, port);
-	mutex_unlock(&lock);
+	up(&lock);
 }
 
 static inline int fmi_setfreq(struct fmi_device *dev)
@@ -86,12 +85,12 @@ static inline int fmi_setfreq(struct fmi_device *dev)
 	int myport = dev->port;
 	unsigned long freq = dev->curfreq;
 
-	mutex_lock(&lock);
+	down(&lock);
 
 	outbits(16, RSF16_ENCODE(freq), myport);
 	outbits(8, 0xC0, myport);
 	msleep(143);		/* was schedule_timeout(HZ/7) */
-	mutex_unlock(&lock);
+	up(&lock);
 	if (dev->curvol) fmi_unmute(myport);
 	return 0;
 }
@@ -102,16 +101,16 @@ static inline int fmi_getsigstr(struct fmi_device *dev)
 	int res;
 	int myport = dev->port;
 
-
-	mutex_lock(&lock);
+	
+	down(&lock);
 	val = dev->curvol ? 0x08 : 0x00;	/* unmute/mute */
 	outb(val, myport);
 	outb(val | 0x10, myport);
 	msleep(143); 		/* was schedule_timeout(HZ/7) */
 	res = (int)inb(myport+1);
 	outb(val, myport);
-
-	mutex_unlock(&lock);
+	
+	up(&lock);
 	return (res & 2) ? 0 : 0xFFFF;
 }
 
@@ -120,7 +119,7 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,
 {
 	struct video_device *dev = video_devdata(file);
 	struct fmi_device *fmi=dev->priv;
-
+	
 	switch(cmd)
 	{
 		case VIDIOCGCAP:
@@ -175,18 +174,18 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,
 				return -EINVAL;
 			/*rounding in steps of 800 to match th freq
 			  that will be used */
-			fmi->curfreq = (*freq/800)*800;
+			fmi->curfreq = (*freq/800)*800; 
 			fmi_setfreq(fmi);
 			return 0;
 		}
 		case VIDIOCGAUDIO:
-		{
+		{	
 			struct video_audio *v = arg;
 			memset(v,0,sizeof(*v));
 			v->flags=( (!fmi->curvol)*VIDEO_AUDIO_MUTE | VIDEO_AUDIO_MUTABLE);
 			strcpy(v->name, "Radio");
 			v->mode=VIDEO_SOUND_STEREO;
-			return 0;
+			return 0;			
 		}
 		case VIDIOCSAUDIO:
 		{
@@ -194,19 +193,19 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,
 			if(v->audio)
 				return -EINVAL;
 			fmi->curvol= v->flags&VIDEO_AUDIO_MUTE ? 0 : 1;
-			fmi->curvol ?
+			fmi->curvol ? 
 				fmi_unmute(fmi->port) : fmi_mute(fmi->port);
 			return 0;
 		}
-		case VIDIOCGUNIT:
+	        case VIDIOCGUNIT:
 		{
-			struct video_unit *v = arg;
+               		struct video_unit *v = arg;
 			v->video=VIDEO_NO_UNIT;
 			v->vbi=VIDEO_NO_UNIT;
 			v->radio=dev->minor;
 			v->audio=0; /* How do we find out this??? */
 			v->teletext=VIDEO_NO_UNIT;
-			return 0;
+			return 0;			
 		}
 		default:
 			return -ENOIOCTLCMD;
@@ -296,14 +295,14 @@ static int __init fmi_init(void)
 	fmi_unit.curfreq = 0;
 	fmi_unit.flags = VIDEO_TUNER_LOW;
 	fmi_radio.priv = &fmi_unit;
-
-	mutex_init(&lock);
-
+	
+	init_MUTEX(&lock);
+	
 	if (video_register_device(&fmi_radio, VFL_TYPE_RADIO, radio_nr) == -1) {
 		release_region(io, 2);
 		return -EINVAL;
 	}
-
+		
 	printk(KERN_INFO "SF16FMx radio card driver at 0x%x\n", io);
 	/* mute card - prevents noisy bootups */
 	fmi_mute(io);