patch-2.3.19 linux/drivers/char/radio-sf16fmi.c

• Lines: 77
• Date: Wed Sep 29 14:02:59 1999
• Orig file: v2.3.18/linux/drivers/char/radio-sf16fmi.c
• Orig date: Mon Jul 5 20:07:02 1999

diff -u --recursive --new-file v2.3.18/linux/drivers/char/radio-sf16fmi.c linux/drivers/char/radio-sf16fmi.c
@@ -22,6 +22,7 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <linux/config.h>	/* CONFIG_RADIO_SF16MI_PORT 	*/
+#include <asm/semaphore.h>
 
 struct fmi_device
 {
@@ -37,6 +38,7 @@
 
 static int io = CONFIG_RADIO_SF16FMI_PORT; 
 static int users = 0;
+static struct semaphore lock;
 
 /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */
 /* It is only usefull to give freq in intervall of 800 (=0.05Mhz),
@@ -67,12 +69,16 @@
 
 static inline void fmi_mute(int port)
 {
+	down(&lock);
 	outb(0x00, port);
+	up(&lock);
 }
 
 static inline void fmi_unmute(int port)
 {
+	down(&lock);
 	outb(0x08, port);
+	up(&lock);
 }
 
 static inline int fmi_setfreq(struct fmi_device *dev)
@@ -81,6 +87,8 @@
 	unsigned long freq = dev->curfreq;
 	int i;
 	
+	down(&lock);
+	
 	outbits(16, RSF16_ENCODE(freq), myport);
 	outbits(8, 0xC0, myport);
 	for(i=0; i< 100; i++)
@@ -93,6 +101,8 @@
 	current->state = TASK_UNINTERRUPTIBLE;
 	schedule_timeout(HZ/7);
 */	
+
+	up(&lock);
 	if (dev->curvol) fmi_unmute(myport);
 	return 0;
 }
@@ -104,6 +114,7 @@
 	int myport = dev->port;
 	int i;
 	
+	down(&lock);
 	val = dev->curvol ? 0x08 : 0x00;	/* unmute/mute */
 	outb(val, myport);
 	outb(val | 0x10, myport);
@@ -119,6 +130,8 @@
 */	
 	res = (int)inb(myport+1);
 	outb(val, myport);
+	
+	up(&lock);
 	return (res & 2) ? 0 : 0xFFFF;
 }
 
@@ -289,6 +302,8 @@
 	fmi_unit.curfreq = 0;
 	fmi_unit.flags = VIDEO_TUNER_LOW;
 	fmi_radio.priv = &fmi_unit;
+	
+	init_MUTEX(&lock);
 	
 	if(video_register_device(&fmi_radio, VFL_TYPE_RADIO)==-1)
 		return -EINVAL;