patch-2.1.88 linux/drivers/sound/maui.c

Next file: linux/drivers/sound/midi_synth.c
Previous file: linux/drivers/sound/lowlevel/aci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.87/linux/drivers/sound/maui.c linux/drivers/sound/maui.c
@@ -48,202 +48,178 @@
 static int maui_osLen = 0;
 #endif
 
-static struct wait_queue *maui_sleeper = NULL;
-static volatile struct snd_wait maui_sleep_flag =
-{0};
-
-static int
-maui_wait(int mask)
+static int maui_wait(int mask)
 {
-	int             i;
+	int i;
 
-/*
- * Perform a short initial wait without sleeping
- */
+	/*
+	 * Perform a short initial wait without sleeping
+	 */
 
 	for (i = 0; i < 100; i++)
-	  {
-		  if (inb(HOST_STAT_PORT) & mask)
-		    {
-			    return 1;
-		    }
-	  }
+	{
+		if (inb(HOST_STAT_PORT) & mask)
+		{
+			return 1;
+		}
+	}
 
-/*
- * Wait up to 15 seconds with sleeping
- */
+	/*
+	 * Wait up to 15 seconds with sleeping
+	 */
 
 	for (i = 0; i < 150; i++)
-	  {
-		  if (inb(HOST_STAT_PORT) & mask)
-		    {
-			    return 1;
-		    }
-		  {
-			  unsigned long   tlimit;
-
-			  if (HZ / 10)
-				  current->timeout = tlimit = jiffies + (HZ / 10);
-			  else
-				  tlimit = (unsigned long) -1;
-			  maui_sleep_flag.opts = WK_SLEEP;
-			  interruptible_sleep_on(&maui_sleeper);
-			  if (!(maui_sleep_flag.opts & WK_WAKEUP))
-			    {
-				    if (jiffies >= tlimit)
-					    maui_sleep_flag.opts |= WK_TIMEOUT;
-			    }
-			  maui_sleep_flag.opts &= ~WK_SLEEP;
-		  };
-		  if (signal_pending(current))
-		    {
-			    return 0;
-		    }
-	  }
-
+	{
+		if (inb(HOST_STAT_PORT) & mask)
+			return 1;
+		current->timeout = jiffies + HZ / 10;
+		current->state = TASK_INTERRUPTIBLE;
+		schedule();
+		current->timeout = 0;
+		if (signal_pending(current))
+			return 0;
+	}
 	return 0;
 }
 
-static int
-maui_read(void)
+static int maui_read(void)
 {
 	if (maui_wait(STAT_RX_AVAIL))
 		return inb(HOST_DATA_PORT);
-
 	return -1;
 }
 
-static int
-maui_write(unsigned char data)
+static int maui_write(unsigned char data)
 {
 	if (maui_wait(STAT_TX_AVAIL))
-	  {
-		  outb((data), HOST_DATA_PORT);
-		  return 1;
-	  }
-	printk("Maui: Write timeout\n");
-
+	{
+		outb((data), HOST_DATA_PORT);
+		return 1;
+	}
+	printk(KERN_WARNING "Maui: Write timeout\n");
 	return 0;
 }
 
-static void
-mauiintr(int irq, void *dev_id, struct pt_regs *dummy)
+static void mauiintr(int irq, void *dev_id, struct pt_regs *dummy)
 {
 	irq_ok = 1;
 }
 
-static int
-download_code(void)
+static int download_code(void)
 {
-	int             i, lines = 0;
-	int             eol_seen = 0, done = 0;
-	int             skip = 1;
+	int i, lines = 0;
+	int eol_seen = 0, done = 0;
+	int skip = 1;
 
-	printk("Code download (%d bytes): ", maui_osLen);
+	printk(KERN_INFO "Code download (%d bytes): ", maui_osLen);
 
 	for (i = 0; i < maui_osLen; i++)
-	  {
-		  if (maui_os[i] != '\r')
-			  if (!skip || (maui_os[i] == 'S' && (i == 0 || maui_os[i - 1] == '\n')))
-			    {
-				    skip = 0;
-
-				    if (maui_os[i] == '\n')
-					    eol_seen = skip = 1;
-				    else if (maui_os[i] == 'S')
-				      {
-					      if (maui_os[i + 1] == '8')
-						      done = 1;
-					      if (!maui_write(0xF1))
-						      goto failure;
-					      if (!maui_write('S'))
-						      goto failure;
-				    } else
-				      {
-					      if (!maui_write(maui_os[i]))
-						      goto failure;
-				      }
-
-				    if (eol_seen)
-				      {
-					      int             c = 0;
-
-					      int             n;
-
-					      eol_seen = 0;
-
-					      for (n = 0; n < 2; n++)
-						      if (maui_wait(STAT_RX_AVAIL))
-							{
-								c = inb(HOST_DATA_PORT);
-								break;
-							}
-					      if (c != 0x80)
-						{
-							printk("Download not acknowledged\n");
-							return 0;
-					      } else if (!(lines++ % 10))
-						      printk(".");
-
-					      if (done)
+	{
+		if (maui_os[i] != '\r')
+		{
+			if (!skip || (maui_os[i] == 'S' && (i == 0 || maui_os[i - 1] == '\n')))
+			{
+				skip = 0;
+
+				if (maui_os[i] == '\n')
+					eol_seen = skip = 1;
+				else if (maui_os[i] == 'S')
+				{
+					if (maui_os[i + 1] == '8')
+						done = 1;
+					if (!maui_write(0xF1))
+						goto failure;
+					if (!maui_write('S'))
+						goto failure;
+				}
+				else
+				{
+					if (!maui_write(maui_os[i]))
+						goto failure;
+				}
+
+				if (eol_seen)
+				{
+					int c = 0;
+					int n;
+
+					eol_seen = 0;
+
+					for (n = 0; n < 2; n++)
+					{
+						if (maui_wait(STAT_RX_AVAIL))
 						{
-							printk("\nDownload complete\n");
-							return 1;
+							c = inb(HOST_DATA_PORT);
+							break;
 						}
-				      }
-			    }
-	  }
-
-      failure:
-
-	printk("\nDownload failed!!!\n");
+					}
+					if (c != 0x80)
+					{
+						printk("Download not acknowledged\n");
+						return 0;
+					}
+					else if (!(lines++ % 10))
+						printk(".");
+
+					if (done)
+					{
+						printk("\n");
+						printk(KERN_INFO "Download complete\n");
+						return 1;
+					}
+				}
+			}
+		}
+	}
+
+failure:
+	printk("\n");
+	printk(KERN_ERR "Download failed!!!\n");
 	return 0;
 }
 
-static int
-maui_init(int irq)
+static int maui_init(int irq)
 {
-	int             i;
-	unsigned char   bits;
+#ifdef __SMP__
+	int i;
+#endif	
+	unsigned char bits;
 
 	switch (irq)
-	  {
-	  case 9:
-		  bits = 0x00;
-		  break;
-	  case 5:
-		  bits = 0x08;
-		  break;
-	  case 12:
-		  bits = 0x10;
-		  break;
-	  case 15:
-		  bits = 0x18;
-		  break;
-
-	  default:
-		  printk("Maui: Invalid IRQ %d\n", irq);
-		  return 0;
-	  }
+	{
+		case 9:
+			bits = 0x00;
+			break;
+		case 5:
+			bits = 0x08;
+			break;
+		case 12:
+			bits = 0x10;
+			break;
+		case 15:
+			bits = 0x18;
+			break;
 
+		default:
+			printk(KERN_ERR "Maui: Invalid IRQ %d\n", irq);
+			return 0;
+	}
 	outb((0x00), HOST_CTRL_PORT);	/* Reset */
-
 	outb((bits), HOST_DATA_PORT);	/* Set the IRQ bits */
 	outb((bits | 0x80), HOST_DATA_PORT);	/* Set the IRQ bits again? */
-
 	outb((0x80), HOST_CTRL_PORT);	/* Leave reset */
 	outb((0x80), HOST_CTRL_PORT);	/* Leave reset */
-
 	outb((0xD0), HOST_CTRL_PORT);	/* Cause interrupt */
 
+#ifndef __SMP__
 	for (i = 0; i < 1000000 && !irq_ok; i++);
 
 	if (!irq_ok)
 		return 0;
-
+#endif
 	outb((0x80), HOST_CTRL_PORT);	/* Leave reset */
 
-	printk("Turtle Beach Maui initialization\n");
+	printk(KERN_INFO "Turtle Beach Maui initialization\n");
 
 	if (!download_code())
 		return 0;
@@ -255,54 +231,51 @@
 	maui_write(0xf0);
 	maui_write(1);
 	if (maui_read() != 0x80)
-	  {
-		  maui_write(0xf0);
-		  maui_write(1);
-		  if (maui_read() != 0x80)
-			  printk("Maui didn't acknowledge set HW mode command\n");
-	  }
-	printk("Maui initialized OK\n");
+	{
+		maui_write(0xf0);
+		maui_write(1);
+		if (maui_read() != 0x80)
+			printk(KERN_ERR "Maui didn't acknowledge set HW mode command\n");
+	}
+	printk(KERN_INFO "Maui initialized OK\n");
 	return 1;
 }
 
-static int
-maui_short_wait(int mask)
+static int maui_short_wait(int mask)
 {
-	int             i;
+	int i;
 
 	for (i = 0; i < 1000; i++)
-	  {
-		  if (inb(HOST_STAT_PORT) & mask)
-		    {
-			    return 1;
-		    }
-	  }
-
+	{
+		if (inb(HOST_STAT_PORT) & mask)
+		{
+			return 1;
+		}
+	}
 	return 0;
 }
 
-static int
-maui_load_patch(int dev, int format, const char *addr,
+static int maui_load_patch(int dev, int format, const char *addr,
 		int offs, int count, int pmgr_flag)
 {
 
 	struct sysex_info header;
-	unsigned long   left, src_offs;
-	int             hdr_size = (unsigned long) &header.data[0] - (unsigned long) &header;
-	int             i;
+	unsigned long left, src_offs;
+	int hdr_size = (unsigned long) &header.data[0] - (unsigned long) &header;
+	int i;
 
 	if (format == SYSEX_PATCH)	/* Handled by midi_synth.c */
 		return orig_load_patch(dev, format, addr, offs, count, pmgr_flag);
 
 	if (format != MAUI_PATCH)
-	  {
-		  printk("Maui: Unknown patch format\n");
-	  }
+	{
+		  printk(KERN_WARNING "Maui: Unknown patch format\n");
+	}
 	if (count < hdr_size)
-	  {
-		  printk("Maui error: Patch header too short\n");
+	{
+/*		  printk("Maui error: Patch header too short\n");*/
 		  return -EINVAL;
-	  }
+	}
 	count -= hdr_size;
 
 	/*
@@ -310,43 +283,43 @@
 	 * been transferred already.
 	 */
 
-	copy_from_user(&((char *) &header)[offs], &(addr)[offs], hdr_size - offs);
+	if(copy_from_user(&((char *) &header)[offs], &(addr)[offs], hdr_size - offs))
+		return -EFAULT;
 
 	if (count < header.len)
-	  {
-		  printk("Maui warning: Host command record too short (%d<%d)\n", count, (int) header.len);
+	{
+		  printk(KERN_ERR "Maui warning: Host command record too short (%d<%d)\n", count, (int) header.len);
 		  header.len = count;
-	  }
+	}
 	left = header.len;
 	src_offs = 0;
 
 	for (i = 0; i < left; i++)
-	  {
-		  unsigned char   data;
+	{
+		unsigned char   data;
 
-		  get_user(*(unsigned char *) &data, (unsigned char *) &((addr)[hdr_size + i]));
-		  if (i == 0 && !(data & 0x80))
-			  return -EINVAL;
-
-		  if (maui_write(data) == -1)
-			  return -EIO;
-	  }
+		if(get_user(*(unsigned char *) &data, (unsigned char *) &((addr)[hdr_size + i])))
+			return -EFAULT;
+		if (i == 0 && !(data & 0x80))
+			return -EINVAL;
+
+		if (maui_write(data) == -1)
+			return -EIO;
+	}
 
 	if ((i = maui_read()) != 0x80)
-	  {
-		  if (i != -1)
-			  printk("Maui: Error status %02x\n", i);
-
-		  return -EIO;
-	  }
+	{
+		if (i != -1)
+			printk("Maui: Error status %02x\n", i);
+		return -EIO;
+	}
 	return 0;
 }
 
-int
-probe_maui(struct address_info *hw_config)
+int probe_maui(struct address_info *hw_config)
 {
-	int             i;
-	int             tmp1, tmp2, ret;
+	int i;
+	int tmp1, tmp2, ret;
 
 	if (check_region(hw_config->io_base, 8))
 		return 0;
@@ -357,42 +330,41 @@
 	if (snd_set_irq_handler(hw_config->irq, mauiintr, "Maui", maui_osp) < 0)
 		return 0;
 
-	maui_sleep_flag.opts = WK_NONE;
-/*
- * Initialize the processor if necessary
- */
+	/*
+	 * Initialize the processor if necessary
+	 */
 
 	if (maui_osLen > 0)
-	  {
-		  if (!(inb(HOST_STAT_PORT) & STAT_TX_AVAIL) ||
-		      !maui_write(0x9F) ||	/* Report firmware version */
-		      !maui_short_wait(STAT_RX_AVAIL) ||
-		      maui_read() == -1 || maui_read() == -1)
-			  if (!maui_init(hw_config->irq))
-			    {
-				    snd_release_irq(hw_config->irq);
-				    return 0;
-			    }
-	  }
+	{
+		if (!(inb(HOST_STAT_PORT) & STAT_TX_AVAIL) ||
+			!maui_write(0x9F) ||	/* Report firmware version */
+			!maui_short_wait(STAT_RX_AVAIL) ||
+			maui_read() == -1 || maui_read() == -1)
+			if (!maui_init(hw_config->irq))
+			{
+				snd_release_irq(hw_config->irq);
+				return 0;
+			}
+	}
 	if (!maui_write(0xCF))	/* Report hardware version */
-	  {
-		  printk("No WaveFront firmware detected (card uninitialized?)\n");
-		  snd_release_irq(hw_config->irq);
-		  return 0;
-	  }
+	{
+		printk(KERN_ERR "No WaveFront firmware detected (card uninitialized?)\n");
+		snd_release_irq(hw_config->irq);
+		return 0;
+	}
 	if ((tmp1 = maui_read()) == -1 || (tmp2 = maui_read()) == -1)
-	  {
-		  printk("No WaveFront firmware detected (card uninitialized?)\n");
-		  snd_release_irq(hw_config->irq);
-		  return 0;
-	  }
+	{
+		printk(KERN_ERR "No WaveFront firmware detected (card uninitialized?)\n");
+		snd_release_irq(hw_config->irq);
+		return 0;
+	}
 	if (tmp1 == 0xff || tmp2 == 0xff)
-	  {
+	{
 		  snd_release_irq(hw_config->irq);
 		  return 0;
-	  }
+	}
 	if (trace_init)
-		printk("WaveFront hardware version %d.%d\n", tmp1, tmp2);
+		printk(KERN_DEBUG "WaveFront hardware version %d.%d\n", tmp1, tmp2);
 
 	if (!maui_write(0x9F))	/* Report firmware version */
 		return 0;
@@ -400,17 +372,17 @@
 		return 0;
 
 	if (trace_init)
-		printk("WaveFront firmware version %d.%d\n", tmp1, tmp2);
+		printk(KERN_DEBUG "WaveFront firmware version %d.%d\n", tmp1, tmp2);
 
 	if (!maui_write(0x85))	/* Report free DRAM */
 		return 0;
 	tmp1 = 0;
 	for (i = 0; i < 4; i++)
-	  {
-		  tmp1 |= maui_read() << (7 * i);
-	  }
+	{
+		tmp1 |= maui_read() << (7 * i);
+	}
 	if (trace_init)
-		printk("Available DRAM %dk\n", tmp1 / 1024);
+		printk(KERN_DEBUG "Available DRAM %dk\n", tmp1 / 1024);
 
 	for (i = 0; i < 1000; i++)
 		if (probe_mpu401(hw_config))
@@ -424,10 +396,9 @@
 	return ret;
 }
 
-void
-attach_maui(struct address_info *hw_config)
+void attach_maui(struct address_info *hw_config)
 {
-	int             this_dev;
+	int this_dev;
 
 	conf_printf("Maui", hw_config);
 
@@ -436,75 +407,71 @@
 	attach_mpu401(hw_config);
 
 	if (hw_config->slots[1] != -1)	/* The MPU401 driver installed itself */
-	  {
-		  struct synth_operations *synth;
+	{
+		struct synth_operations *synth;
 
-		  this_dev = hw_config->slots[1];
+		this_dev = hw_config->slots[1];
 
-		  /*
-		   * Intercept patch loading calls so that they can be handled
-		   * by the Maui driver.
-		   */
+		/*
+		 * Intercept patch loading calls so that they can be handled
+		 * by the Maui driver.
+		 */
 
-		  synth = midi_devs[this_dev]->converter;
-		  synth->id = "MAUI";
+		synth = midi_devs[this_dev]->converter;
+		synth->id = "MAUI";
 
-		  if (synth != NULL)
-		    {
-			    orig_load_patch = synth->load_patch;
-			    synth->load_patch = &maui_load_patch;
-		  } else
-			  printk(KERN_ERR "Maui: Can't install patch loader\n");
-	  }
+		if (synth != NULL)
+		{
+			orig_load_patch = synth->load_patch;
+			synth->load_patch = &maui_load_patch;
+		}
+		else
+			printk(KERN_ERR "Maui: Can't install patch loader\n");
+	}
 }
 
-void
-unload_maui(struct address_info *hw_config)
+void unload_maui(struct address_info *hw_config)
 {
-	int             irq = hw_config->irq;
-
+	int irq = hw_config->irq;
 	release_region(hw_config->io_base + 2, 6);
-
 	unload_mpu401(hw_config);
 
 	if (irq < 0)
 		irq = -irq;
-
 	if (irq > 0)
 		snd_release_irq(irq);
 }
 
 #ifdef MODULE
 
-int             io = -1;
-int             irq = -1;
+int io = -1;
+int irq = -1;
 
-static int      fw_load = 0;
+static int fw_load = 0;
 
 struct address_info cfg;
 
 /*
- *    Install a CS4232 based card. Need to have ad1848 and mpu401
- *      loaded ready.
+ *	Install a CS4232 based card. Need to have ad1848 and mpu401
+ *	loaded ready.
  */
 
-int
-init_module(void)
+int init_module(void)
 {
-	printk("Turtle beach Maui and Tropez driver, Copyright (C) by Hannu Savolainen 1993-1996\n");
+	printk(KERN_INFO "Turtle beach Maui and Tropez driver, Copyright (C) by Hannu Savolainen 1993-1996\n");
 	if (io == -1 || irq == -1)
-	  {
-		  printk("maui: irq and io must be set.\n");
-		  return -EINVAL;
-	  }
+	{
+		printk(KERN_INFO "maui: irq and io must be set.\n");
+		return -EINVAL;
+	}
 	cfg.io_base = io;
 	cfg.irq = irq;
 
 	if (maui_os == NULL)
-	  {
-		  fw_load = 1;
-		  maui_osLen = mod_firmware_load("/etc/sound/oswf.mot", (char **) &maui_os);
-	  }
+	{
+		fw_load = 1;
+		maui_osLen = mod_firmware_load("/etc/sound/oswf.mot", (char **) &maui_os);
+	}
 	if (probe_maui(&cfg) == 0)
 		return -ENODEV;
 	attach_maui(&cfg);
@@ -512,8 +479,7 @@
 	return 0;
 }
 
-void
-cleanup_module(void)
+void cleanup_module(void)
 {
 	if (fw_load && maui_os)
 		kfree(maui_os);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov