1 files changed, 105 insertions, 146 deletions

diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c
index a78225ed2732..a1d50bdc1357 100644
--- a/sys/i386/isa/sound/sb_midi.c
+++ b/sys/i386/isa/sound/sb_midi.c
@@ -1,10 +1,10 @@
 /*
  * sound/sb_dsp.c
- *
+ * 
  * The low level driver for the SoundBlaster DS chips.
- *
+ * 
  * Copyright by Hannu Savolainen 1993
- *
+ * 
  * 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
@@ -12,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
@@ -24,14 +24,14 @@
  * 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 "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
-#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_MIDI)
+#if (NSND > 0) && defined(CONFIG_SB) && defined(CONFIG_MIDI)
 
-#include "sb.h"
+#include <i386/isa/sound/sbcard.h>
 #undef SB_TEST_IRQ
 
 /*
@@ -46,12 +46,7 @@ extern int      sb_dsp_ok;	/* Set to 1 atfer successful initialization */
 extern int      sbc_base;
 
 extern int      sb_midi_mode;
-extern int      sb_midi_busy;	/*
-
-
-				 * *  * * 1 if the process has output to MIDI
-				 *
-				 */
+extern int      sb_midi_busy;	/* 1 if the process has output to MIDI */
 extern int      sb_dsp_busy;
 extern int      sb_dsp_highspeed;
 
@@ -61,192 +56,156 @@ extern int      sb_intr_active;
 int             input_opened = 0;
 static int      my_dev;
 
-void            (*midi_input_intr) (int dev, unsigned char data);
+extern sound_os_info *sb_osp;
+
+void            (*midi_input_intr) (int dev, u_char data);
 
 static int
-sb_midi_open (int dev, int mode,
-	      void            (*input) (int dev, unsigned char data),
-	      void            (*output) (int dev)
-)
+sb_midi_open(int dev, int mode, void (*input) (int dev, u_char data),
+	     void (*output) (int dev))
 {
-  int             ret;
+    int             ret;
 
-  if (!sb_dsp_ok)
-    {
-      printk ("SB Error: MIDI hardware not installed\n");
-      return RET_ERROR (ENXIO);
+    if (!sb_dsp_ok) {
+	printf("SB Error: MIDI hardware not installed\n");
+	return -(ENXIO);
     }
+    if (sb_midi_busy)
+	return -(EBUSY);
 
-  if (sb_midi_busy)
-    return RET_ERROR (EBUSY);
-
-  if (mode != OPEN_WRITE && !sb_duplex_midi)
-    {
-      if (num_midis == 1)
-	printk ("SoundBlaster: Midi input not currently supported\n");
-      return RET_ERROR (EPERM);
+    if (mode != OPEN_WRITE && !sb_duplex_midi) {
+	if (num_midis == 1)
+	    printf("SoundBlaster: Midi input not currently supported\n");
+	return -(EPERM);
     }
-
-  sb_midi_mode = NORMAL_MIDI;
-  if (mode != OPEN_WRITE)
-    {
-      if (sb_dsp_busy || sb_intr_active)
-	return RET_ERROR (EBUSY);
-      sb_midi_mode = UART_MIDI;
+    sb_midi_mode = NORMAL_MIDI;
+    if (mode != OPEN_WRITE) {
+	if (sb_dsp_busy || sb_intr_active)
+	    return -(EBUSY);
+	sb_midi_mode = UART_MIDI;
     }
-
-  if (sb_dsp_highspeed)
-    {
-      printk ("SB Error: Midi output not possible during stereo or high speed audio\n");
-      return RET_ERROR (EBUSY);
+    if (sb_dsp_highspeed) {
+	printf("SB Error: Midi output not possible during stereo or high speed audio\n");
+	return -(EBUSY);
     }
+    if (sb_midi_mode == UART_MIDI) {
+	sb_irq_mode = IMODE_MIDI;
 
-  if (sb_midi_mode == UART_MIDI)
-    {
-      sb_irq_mode = IMODE_MIDI;
-
-      sb_reset_dsp ();
-
-      if (!sb_dsp_command (0x35))
-	return RET_ERROR (EIO);	/*
-				 * Enter the UART mode
-				 */
-      sb_intr_active = 1;
-
-      if ((ret = sb_get_irq ()) < 0)
-	{
-	  sb_reset_dsp ();
-	  return 0;		/*
-				 * IRQ not free
-				 */
-	}
-      input_opened = 1;
-      midi_input_intr = input;
-    }
+	sb_reset_dsp();
+
+	if (!sb_dsp_command(0x35))
+	    return -(EIO);	/* Enter the UART mode */
+	sb_intr_active = 1;
 
-  sb_midi_busy = 1;
+	input_opened = 1;
+	midi_input_intr = input;
+    }
+    sb_midi_busy = 1;
 
-  return 0;
+    return 0;
 }
 
 static void
-sb_midi_close (int dev)
+sb_midi_close(int dev)
 {
-  if (sb_midi_mode == UART_MIDI)
-    {
-      sb_reset_dsp ();		/*
-				 * The only way to kill the UART mode
-				 */
-      sb_free_irq ();
+    if (sb_midi_mode == UART_MIDI) {
+	sb_reset_dsp();	/* The only way to kill the UART mode */
     }
-  sb_intr_active = 0;
-  sb_midi_busy = 0;
-  input_opened = 0;
+    sb_intr_active = 0;
+    sb_midi_busy = 0;
+    input_opened = 0;
 }
 
 static int
-sb_midi_out (int dev, unsigned char midi_byte)
+sb_midi_out(int dev, u_char midi_byte)
 {
-  unsigned long   flags;
-
-  if (sb_midi_mode == NORMAL_MIDI)
-    {
-      DISABLE_INTR (flags);
-      if (sb_dsp_command (0x38))
-	sb_dsp_command (midi_byte);
-      else
-	printk ("SB Error: Unable to send a MIDI byte\n");
-      RESTORE_INTR (flags);
-    }
-  else
-    sb_dsp_command (midi_byte);	/*
-				 * UART write
-				 */
-
-  return 1;
+    u_long   flags;
+
+    if (sb_midi_mode == NORMAL_MIDI) {
+	flags = splhigh();
+	if (sb_dsp_command(0x38))
+	    sb_dsp_command(midi_byte);
+	else
+	    printf("SB Error: Unable to send a MIDI byte\n");
+	splx(flags);
+    } else
+	sb_dsp_command(midi_byte);	/* UART write */
+
+    return 1;
 }
 
 static int
-sb_midi_start_read (int dev)
+sb_midi_start_read(int dev)
 {
-  if (sb_midi_mode != UART_MIDI)
-    {
-      printk ("SoundBlaster: MIDI input not implemented.\n");
-      return RET_ERROR (EPERM);
+    if (sb_midi_mode != UART_MIDI) {
+	printf("SoundBlaster: MIDI input not implemented.\n");
+	return -(EPERM);
     }
-  return 0;
+    return 0;
 }
 
 static int
-sb_midi_end_read (int dev)
+sb_midi_end_read(int dev)
 {
-  if (sb_midi_mode == UART_MIDI)
-    {
-      sb_reset_dsp ();
-      sb_intr_active = 0;
+    if (sb_midi_mode == UART_MIDI) {
+	sb_reset_dsp();
+	sb_intr_active = 0;
     }
-  return 0;
+    return 0;
 }
 
 static int
-sb_midi_ioctl (int dev, unsigned cmd, unsigned arg)
+sb_midi_ioctl(int dev, u_int cmd, ioctl_arg arg)
 {
-  return RET_ERROR (EPERM);
+    return -(EPERM);
 }
 
 void
-sb_midi_interrupt (int dummy)
+sb_midi_interrupt(int dummy)
 {
-  unsigned long   flags;
-  unsigned char   data;
+    u_long   flags;
+    u_char   data;
 
-  DISABLE_INTR (flags);
+    flags = splhigh();
 
-  data = INB (DSP_READ);
-  if (input_opened)
-    midi_input_intr (my_dev, data);
+    data = inb(DSP_READ);
+    if (input_opened)
+	midi_input_intr(my_dev, data);
 
-  RESTORE_INTR (flags);
+    splx(flags);
 }
 
 #define MIDI_SYNTH_NAME	"SoundBlaster Midi"
 #define MIDI_SYNTH_CAPS	0
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static struct midi_operations sb_midi_operations =
 {
-  {"SoundBlaster", 0, 0, SNDCARD_SB},
-  &std_midi_synth,
-  sb_midi_open,
-  sb_midi_close,
-  sb_midi_ioctl,
-  sb_midi_out,
-  sb_midi_start_read,
-  sb_midi_end_read,
-  NULL,				/*
-				 * Kick
-				 */
-  NULL,				/*
-				 * command
-				 */
-  NULL,				/*
-				 * buffer_status
-				 */
-  NULL
+	{"SoundBlaster", 0, 0, SNDCARD_SB},
+	&std_midi_synth,
+	{0},
+	sb_midi_open,
+	sb_midi_close,
+	sb_midi_ioctl,
+	sb_midi_out,
+	sb_midi_start_read,
+	sb_midi_end_read,
+	NULL,			/* Kick */
+	NULL,			/* command */
+	NULL,			/* buffer_status */
+	NULL
 };
 
 void
-sb_midi_init (int model)
+sb_midi_init(int model)
 {
-  if (num_midis >= MAX_MIDI_DEV)
-    {
-      printk ("Sound: Too many midi devices detected\n");
-      return;
+    if (num_midis >= MAX_MIDI_DEV) {
+	printf("Sound: Too many midi devices detected\n");
+	return;
     }
-
-  std_midi_synth.midi_dev = num_midis;
-  my_dev = num_midis;
-  midi_devs[num_midis++] = &sb_midi_operations;
+    std_midi_synth.midi_dev = num_midis;
+    my_dev = num_midis;
+    midi_devs[num_midis++] = &sb_midi_operations;
 }
 
 #endif