Bring our sound sources up to the level of Amancio's latest-and-greatest.

This corresponds to Voxware 3.5-alpha-<something> and Amancio's guspnp21.
There was a bit of a FUBAR during the commmit, so not all files are
mentioned in this commit's mail.

X-rant:	I have just started to _*HATE*_ CVS...

1 files changed, 242 insertions, 197 deletions

diff --git a/sys/i386/isa/sound/trix.c b/sys/i386/isa/sound/trix.c
index 21ca20a..818ad5f 100644
--- a/sys/i386/isa/sound/trix.c
+++ b/sys/i386/isa/sound/trix.c
@@ -1,11 +1,10 @@
 /*
  * sound/trix.c
- *
- * Low level driver for the MediaTriX AudioTriX Pro
- * (MT-0002-PC Control Chip)
- *
+ * 
+ * Low level driver for the MediaTriX AudioTriX Pro (MT-0002-PC Control Chip)
+ * 
  * Copyright by Hannu Savolainen 1995
- *
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met: 1. Redistributions of source code must retain the above copyright
@@ -13,7 +12,7 @@
  * Redistributions in binary form must reproduce the above copyright notice,
  * this list of conditions and the following disclaimer in the documentation
  * and/or other materials provided with the distribution.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,299 +24,345 @@
  * 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 <i386/isa/sound/sound_config.h>
 
-#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_TRIX)
+#if NTRIX > 0
 
 #ifdef INCLUDE_TRIX_BOOT
 #include <i386/isa/sound/trix_boot.h>
 #endif
 
+#if (NSB > 0)
+extern int      sb_no_recording;
+#endif
+
 static int      kilroy_was_here = 0;	/* Don't detect twice */
 static int      sb_initialized = 0;
-static int      mpu_initialized = 0;
 
-static unsigned char
-trix_read (int addr)
+static sound_os_info *trix_osp = NULL;
+
+static u_char
+trix_read(int addr)
 {
-  OUTB ((unsigned char) addr, 0x390);	/* MT-0002-PC ASIC address */
-  return INB (0x391);		/* MT-0002-PC ASIC data */
+    outb(0x390, (u_char) addr);	/* MT-0002-PC ASIC address */
+    return inb(0x391);	/* MT-0002-PC ASIC data */
 }
 
 static void
-trix_write (int addr, int data)
+trix_write(int addr, int data)
 {
-  OUTB ((unsigned char) addr, 0x390);	/* MT-0002-PC ASIC address */
-  OUTB ((unsigned char) data, 0x391);	/* MT-0002-PC ASIC data */
+    outb(0x390, (u_char) addr);	/* MT-0002-PC ASIC address */
+    outb(0x391, (u_char) data);	/* MT-0002-PC ASIC data */
 }
 
 static void
-download_boot (int base)
+download_boot(int base)
 {
-  int             i = 0, n = sizeof (trix_boot);
-
-  trix_write (0xf8, 0x00);	/* ??????? */
-  OUTB (0x01, base + 6);	/* Clear the internal data pointer */
-  OUTB (0x00, base + 6);	/* Restart */
-
-  /*
-     *  Write the boot code to the RAM upload/download register.
-     *  Each write increments the internal data pointer.
-   */
-  OUTB (0x01, base + 6);	/* Clear the internal data pointer */
-  OUTB (0x1A, 0x390);		/* Select RAM download/upload port */
-
-  for (i = 0; i < n; i++)
-    OUTB (trix_boot[i], 0x391);
-  for (i = n; i < 10016; i++)	/* Clear up to first 16 bytes of data RAM */
-    OUTB (0x00, 0x391);
-  OUTB (0x00, base + 6);	/* Reset */
-  OUTB (0x50, 0x390);		/* ?????? */
+#ifdef INCLUDE_TRIX_BOOT
+    int             i = 0, n = sizeof(trix_boot);
+
+    trix_write(0xf8, 0x00);	/* ??????? */
+    outb(base + 6, 0x01);	/* Clear the internal data pointer */
+    outb(base + 6, 0x00);	/* Restart */
+
+    /*
+     * Write the boot code to the RAM upload/download register. Each
+     * write increments the internal data pointer.
+     */
+    outb(base + 6, 0x01);	/* Clear the internal data pointer */
+    outb(0x390, 0x1A);	/* Select RAM download/upload port */
+
+    for (i = 0; i < n; i++)
+	outb(0x391, trix_boot[i]);
+    for (i = n; i < 10016; i++)	/* Clear up to first 16 bytes of data RAM */
+	outb(0x391, 0x00);
+    outb(base + 6, 0x00);	/* Reset */
+    outb(0x390, 0x50);	/* ?????? */
+#endif
+
 }
 
 static int
-trix_set_wss_port (struct address_info *hw_config)
+trix_set_wss_port(struct address_info * hw_config)
 {
-  unsigned char   addr_bits;
+    u_char   addr_bits;
 
-  if (kilroy_was_here)		/* Already initialized */
-    return 0;
+    if (0) {
+	printf("AudioTriX: Config port I/O conflict\n");
+	return 0;
+    }
+    if (kilroy_was_here)	/* Already initialized */
+	return 0;
 
-  kilroy_was_here = 1;
+    if (trix_read(0x15) != 0x71) {	/* No asic signature */
+	DDB(printf("No AudioTriX ASIC signature found\n"));
+	return 0;
+    }
 
-  if (trix_read (0x15) != 0x71)	/* No asic signature */
-    return 0;
+    kilroy_was_here = 1;
 
-  /*
-     * Disable separate wave playback and recording DMA channels since
-     * the driver doesn't support duplex mode yet.
-   */
+    /*
+     * Reset some registers.
+     */
 
-  trix_write (0x13, trix_read (0x13) & ~0x80);
-  trix_write (0x14, trix_read (0x14) & ~0x80);
+    trix_write(0x13, 0);
+    trix_write(0x14, 0);
 
-  /*
+    /*
      * Configure the ASIC to place the codec to the proper I/O location
-   */
+     */
 
-  switch (hw_config->io_base)
-    {
+    switch (hw_config->io_base) {
     case 0x530:
-      addr_bits = 0;
-      break;
+	addr_bits = 0;
+	break;
     case 0x604:
-      addr_bits = 1;
-      break;
+	addr_bits = 1;
+	break;
     case 0xE80:
-      addr_bits = 2;
-      break;
+	addr_bits = 2;
+	break;
     case 0xF40:
-      addr_bits = 3;
-      break;
+	addr_bits = 3;
+	break;
     default:
-      return 0;
+	return 0;
     }
 
-  trix_write (0x19, (trix_read (0x19) & 0x03) | addr_bits);
-  return 1;
+    trix_write(0x19, (trix_read(0x19) & 0x03) | addr_bits);
+    return 1;
 }
 
 /*
- *    Probe and attach routines for the Windows Sound System mode of
- *      AudioTriX Pro
+ * Probe and attach routines for the Windows Sound System mode of AudioTriX
+ * Pro
  */
 
 int
-probe_trix_wss (struct address_info *hw_config)
+probe_trix_wss(struct address_info * hw_config)
 {
-  /*
-     * Check if the IO port returns valid signature. The original MS Sound
-     * system returns 0x04 while some cards (AudioTriX Pro for example)
-     * return 0x00.
-   */
-  if (!trix_set_wss_port (hw_config))
-    return 0;
-
-  if ((INB (hw_config->io_base + 3) & 0x3f) != 0x00)
-    {
-      DDB (printk ("No MSS signature detected on port 0x%x\n", hw_config->io_base));
-      return 0;
+    /*
+     * Check if the IO port returns valid signature. The original MS
+     * Sound system returns 0x04 while some cards (AudioTriX Pro for
+     * example) return 0x00.
+     */
+
+    if (0) {
+	printf("AudioTriX: MSS I/O port conflict\n");
+	return 0;
     }
+    trix_osp = hw_config->osp;
 
-  if (hw_config->irq > 11)
-    {
-      printk ("AudioTriX: Bad WSS IRQ %d\n", hw_config->irq);
-      return 0;
-    }
+    if (!trix_set_wss_port(hw_config))
+	return 0;
 
-  if (hw_config->dma != 0 && hw_config->dma != 1 && hw_config->dma != 3)
-    {
-      printk ("AudioTriX: Bad WSS DMA %d\n", hw_config->dma);
-      return 0;
+    if ((inb(hw_config->io_base + 3) & 0x3f) != 0x00) {
+	DDB(printf("No MSS signature detected on port 0x%x\n",
+		hw_config->io_base));
+	return 0;
     }
-
-  /*
+    if (hw_config->irq > 11) {
+	printf("AudioTriX: Bad WSS IRQ %d\n", hw_config->irq);
+	return 0;
+    }
+    if (hw_config->dma != 0 && hw_config->dma != 1 && hw_config->dma != 3) {
+	printf("AudioTriX: Bad WSS DMA %d\n", hw_config->dma);
+	return 0;
+    }
+    if (hw_config->dma2 != -1)
+	if (hw_config->dma2 != 0 && hw_config->dma2 != 1 && hw_config->dma2 != 3) {
+	    printf("AudioTriX: Bad capture DMA %d\n", hw_config->dma2);
+	    return 0;
+	}
+    /*
      * Check that DMA0 is not in use with a 8 bit board.
-   */
+     */
 
-  if (hw_config->dma == 0 && INB (hw_config->io_base + 3) & 0x80)
-    {
-      printk ("AudioTriX: Can't use DMA0 with a 8 bit card\n");
-      return 0;
+    if (hw_config->dma == 0 && inb(hw_config->io_base + 3) & 0x80) {
+	printf("AudioTriX: Can't use DMA0 with a 8 bit card\n");
+	return 0;
     }
-
-  if (hw_config->irq > 7 && hw_config->irq != 9 && INB (hw_config->io_base + 3) & 0x80)
-    {
-      printk ("AudioTriX: Can't use IRQ%d with a 8 bit card\n", hw_config->irq);
-      return 0;
+    if (hw_config->irq > 7 && hw_config->irq != 9 && inb(hw_config->io_base + 3) & 0x80) {
+	printf("AudioTriX: Can't use IRQ%d with a 8 bit card\n", hw_config->irq);
+	return 0;
     }
-
-  return ad1848_detect (hw_config->io_base + 4);
+    return ad1848_detect(hw_config->io_base + 4, NULL, hw_config->osp);
 }
 
-long
-attach_trix_wss (long mem_start, struct address_info *hw_config)
+void
+attach_trix_wss(struct address_info * hw_config)
 {
-  static unsigned char interrupt_bits[12] =
-  {-1, -1, -1, -1, -1, -1, -1, 0x08, -1, 0x10, 0x18, 0x20};
-  char            bits;
+    static u_char interrupt_bits[12] =
+	{-1, -1, -1, -1, -1, -1, -1, 0x08, -1, 0x10, 0x18, 0x20};
+    char            bits;
 
-  static unsigned char dma_bits[4] =
-  {1, 2, 0, 3};
+    static u_char dma_bits[4] =
+	{1, 2, 0, 3};
 
-  int             config_port = hw_config->io_base + 0, version_port = hw_config->io_base + 3;
+    int	config_port = hw_config->io_base + 0,
+	version_port = hw_config->io_base + 3;
+    int dma1 = hw_config->dma, dma2 = hw_config->dma2;
 
-  if (!kilroy_was_here)
-    return mem_start;
+    trix_osp = hw_config->osp;
 
-  /*
+    if (!kilroy_was_here) {
+	DDB(printf("AudioTriX: Attach called but not probed yet???\n"));
+	return ;
+    }
+    /*
      * Set the IRQ and DMA addresses.
-   */
+     */
+
+    bits = interrupt_bits[hw_config->irq];
+    if (bits == -1) {
+	printf("AudioTriX: Bad IRQ (%d)\n", hw_config->irq);
+	return ;
+    }
+    outb(config_port, bits | 0x40);
+    if ((inb(version_port) & 0x40) == 0)
+	printf("[IRQ Conflict?]");
 
-  bits = interrupt_bits[hw_config->irq];
-  if (bits == -1)
-    return mem_start;
+    if (hw_config->dma2 == -1) {	/* Single DMA mode */
+	bits |= dma_bits[dma1];
+	dma2 = dma1;
+    } else {
+	u_char   tmp;
 
-  OUTB (bits | 0x40, config_port);
-  if ((INB (version_port) & 0x40) == 0)
-    printk ("[IRQ Conflict?]");
+	tmp = trix_read(0x13) & ~30;
+	trix_write(0x13, tmp | 0x80 | (dma1 << 4));
 
-  OUTB (bits | dma_bits[hw_config->dma], config_port);	/* Write IRQ+DMA setup */
+	tmp = trix_read(0x14) & ~30;
+	trix_write(0x14, tmp | 0x80 | (dma2 << 4));
+    }
+
+    outb(config_port, bits);/* Write IRQ+DMA setup */
 
-  ad1848_init ("AudioTriX Pro", hw_config->io_base + 4,
-	       hw_config->irq,
-	       hw_config->dma,
-	       hw_config->dma);
-  return mem_start;
+    ad1848_init("AudioTriX Pro", hw_config->io_base + 4,
+	hw_config->irq,
+	dma1,
+	dma2,
+	0,
+	hw_config->osp);
+	return ;
 }
 
 int
-probe_trix_sb (struct address_info *hw_config)
+probe_trix_sb(struct address_info * hw_config)
 {
-
-  int             tmp;
-  unsigned char   conf;
-  static char     irq_translate[] =
-  {-1, -1, -1, 0, 1, 2, -1, 3};
+    int             tmp;
+    u_char   conf;
+    static char     irq_translate[] = {-1, -1, -1, 0, 1, 2, -1, 3};
 
 #ifndef INCLUDE_TRIX_BOOT
-  return 0;			/* No boot code -> no fun */
+    return 0;		/* No boot code -> no fun */
 #endif
-  if (!kilroy_was_here)
-    return 0;			/* AudioTriX Pro has not been detected earlier */
+    if (!kilroy_was_here)
+	return 0;	/* AudioTriX Pro has not been detected earlier */
 
-  if (sb_initialized)
-    return 0;
+    if (sb_initialized)
+	return 0;
 
-  if (hw_config->io_base & 0xffffff8f != 0x200)
-    return 0;
+    if ((hw_config->io_base & 0xffffff8f) != 0x200)
+	return 0;
 
-  tmp = hw_config->irq;
-  if (tmp > 7)
-    return 0;
-  if (irq_translate[tmp] == -1)
-    return 0;
+    tmp = hw_config->irq;
+    if (tmp > 7)
+	return 0;
+    if (irq_translate[tmp] == -1)
+	return 0;
 
-  tmp = hw_config->dma;
-  if (tmp != 1 && tmp != 3)
-    return 0;
+    tmp = hw_config->dma;
+    if (tmp != 1 && tmp != 3)
+	return 0;
 
-  conf = 0x84;			/* DMA and IRQ enable */
-  conf |= hw_config->io_base & 0x70;	/* I/O address bits */
-  conf |= irq_translate[hw_config->irq];
-  if (hw_config->dma == 3)
-    conf |= 0x08;
-  trix_write (0x1b, conf);
+    conf = 0x84;		/* DMA and IRQ enable */
+    conf |= hw_config->io_base & 0x70;	/* I/O address bits */
+    conf |= irq_translate[hw_config->irq];
+    if (hw_config->dma == 3)
+	conf |= 0x08;
+    trix_write(0x1b, conf);
 
-  download_boot (hw_config->io_base);
-  sb_initialized = 1;
+    download_boot(hw_config->io_base);
+    sb_initialized = 1;
 
-  return 1;
+    return 1;
 }
 
-long
-attach_trix_sb (long mem_start, struct address_info *hw_config)
+void
+attach_trix_sb(struct address_info * hw_config)
 {
-  printk (" <AudioTriX>");
-  return mem_start;
+#if (NSB > 0)
+    sb_dsp_disable_midi();
+    sb_no_recording = 1;
+#endif
+    conf_printf("AudioTriX (SB)", hw_config);
 }
 
-long
-attach_trix_mpu (long mem_start, struct address_info *hw_config)
+void
+attach_trix_mpu(struct address_info * hw_config)
 {
-  return attach_mpu401 (mem_start, hw_config);
+#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
+    attach_mpu401(hw_config);
+#endif
 }
 
 int
-probe_trix_mpu (struct address_info *hw_config)
+probe_trix_mpu(struct address_info * hw_config)
 {
-  unsigned char   conf;
-  static char     irq_bits[] =
-  {-1, -1, -1, 1, 2, 3, -1, 4, -1, 5};
-
-  if (!kilroy_was_here)
-    return 0;			/* AudioTriX Pro has not been detected earlier */
-
-  if (!sb_initialized)
-    return 0;
-
-  if (mpu_initialized)
-    return 0;
+#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
+    u_char   conf;
+    static char     irq_bits[] = {-1, -1, -1, 1, 2, 3, -1, 4, -1, 5};
 
-  if (hw_config->irq > 9)
-    return 0;
-
-  if (irq_bits[hw_config->irq] == -1)
-    return 0;
-
-  switch (hw_config->io_base)
-    {
+    if (!kilroy_was_here) {
+	DDB(printf("Trix: WSS and SB modes must be initialized before MPU\n"));
+	return 0;	/* AudioTriX Pro has not been detected earlier */
+    }
+    if (!sb_initialized) {
+	DDB(printf("Trix: SB mode must be initialized before MPU\n"));
+	return 0;
+    }
+    if (mpu_initialized) {
+	DDB(printf("Trix: MPU mode already initialized\n"));
+	return 0;
+    }
+    if (hw_config->irq > 9) {
+	printf("AudioTriX: Bad MPU IRQ %d\n", hw_config->irq);
+	return 0;
+    }
+    if (irq_bits[hw_config->irq] == -1) {
+	printf("AudioTriX: Bad MPU IRQ %d\n", hw_config->irq);
+	return 0;
+    }
+    switch (hw_config->io_base) {
     case 0x330:
-      conf = 0x00;
-      break;
+	conf = 0x00;
+	break;
     case 0x370:
-      conf = 0x04;
-      break;
+	conf = 0x04;
+	break;
     case 0x3b0:
-      conf = 0x08;
-      break;
+	conf = 0x08;
+	break;
     case 0x3f0:
-      conf = 0x0c;
-      break;
+	conf = 0x0c;
+	break;
     default:
-      return 0;			/* Invalid port */
+	return 0;	/* Invalid port */
     }
 
-  conf |= irq_bits[hw_config->irq] << 4;
+    conf |= irq_bits[hw_config->irq] << 4;
 
-  trix_write (0x19, (trix_read (0x19) & 0x83) | conf);
+    trix_write(0x19, (trix_read(0x19) & 0x83) | conf);
 
-  mpu_initialized = 1;
+    mpu_initialized = 1;
 
-  return probe_mpu401 (hw_config);
+    return probe_mpu401(hw_config);
+#else
+    return 0;
+#endif
 }
 
 #endif