patch-1.3.63 linux/drivers/sound/sscape.c

• Lines: 99
• Date: Sat Feb 10 22:05:12 1996
• Orig file: v1.3.62/linux/drivers/sound/sscape.c
• Orig date: Tue Jan 23 21:15:49 1996

diff -u --recursive --new-file v1.3.62/linux/drivers/sound/sscape.c linux/drivers/sound/sscape.c
@@ -2,8 +2,9 @@
  * sound/sscape.c
  *
  * Low level driver for Ensoniq Soundscape
- *
- * Copyright by Hannu Savolainen 1994
+ */
+/*
+ * Copyright by Hannu Savolainen 1993-1996
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -24,8 +25,9 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
  */
+#include <linux/config.h>
+
 
 #include "sound_config.h"
 
@@ -94,7 +96,7 @@
     int             dma_allocated;
     int             my_audiodev;
     int             opened;
-    sound_os_info  *osp;
+    int            *osp;
   }
 
 sscape_info;
@@ -438,6 +440,7 @@
   unsigned long   flags;
   unsigned char   temp;
   int             done, timeout_val;
+  static int      already_done = 0;
 
   if (flag & CPF_FIRST)
     {
@@ -446,6 +449,13 @@
          * before continuing.
        */
 
+      if (already_done)
+	{
+	  printk ("Can't run 'ssinit' twice\n");
+	  return 0;
+	}
+      already_done = 1;
+
       save_flags (flags);
       cli ();
       if (devc->dma_allocated == 0)
@@ -497,7 +507,7 @@
 	if (1)
 	  current_set_timeout (tl = jiffies + (1));
 	else
-	  tl = 0xffffffff;
+	  tl = (unsigned long) -1;
 	sscape_sleep_flag.mode = WK_SLEEP;
 	module_interruptible_sleep_on (&sscape_sleeper);
 	if (!(sscape_sleep_flag.mode & WK_WAKEUP))
@@ -545,7 +555,7 @@
 	    if (1)
 	      current_set_timeout (tl = jiffies + (1));
 	    else
-	      tl = 0xffffffff;
+	      tl = (unsigned long) -1;
 	    sscape_sleep_flag.mode = WK_SLEEP;
 	    module_interruptible_sleep_on (&sscape_sleeper);
 	    if (!(sscape_sleep_flag.mode & WK_WAKEUP))
@@ -578,7 +588,7 @@
 	    if (1)
 	      current_set_timeout (tl = jiffies + (1));
 	    else
-	      tl = 0xffffffff;
+	      tl = (unsigned long) -1;
 	    sscape_sleep_flag.mode = WK_SLEEP;
 	    module_interruptible_sleep_on (&sscape_sleeper);
 	    if (!(sscape_sleep_flag.mode & WK_WAKEUP))
@@ -638,7 +648,7 @@
 }
 
 static int
-sscape_coproc_ioctl (void *dev_info, unsigned int cmd, ioctl_arg arg, int local)
+sscape_coproc_ioctl (void *dev_info, unsigned int cmd, caddr_t arg, int local)
 {
 
   switch (cmd)
@@ -745,7 +755,7 @@
 }
 
 static int
-sscape_audio_ioctl (int dev, unsigned int cmd, ioctl_arg arg, int local)
+sscape_audio_ioctl (int dev, unsigned int cmd, caddr_t arg, int local)
 {
   sscape_info    *devc = (sscape_info *) audio_devs[dev]->devc;