From d49c99ba9cc6282869fb8a99346c0eea5d56d0e3 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 29 Jul 1995 14:20:54 +0000
Subject: [PATCH] Fix enough of the recently introduced brokenness for LINT to
 compile. The U6850* changes in sound_config.h are probably wrong.

Recent commits lost:
- include paths.
- copyrights.
- cvs Ids.
- infamous whitespace changes.
- other cosmetic changes.
---
 sys/i386/isa/sound/gus_wave.c     |  2 +-
 sys/i386/isa/sound/ics2101.c      |  2 +-
 sys/i386/isa/sound/os.h           |  2 +-
 sys/i386/isa/sound/sb16_dsp.c     |  1 -
 sys/i386/isa/sound/sound_config.h | 12 ++++++++++++
 sys/i386/isa/sound/uart6850.c     |  2 +-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c
index 2def4909437..b131096c6bb 100644
--- a/sys/i386/isa/sound/gus_wave.c
+++ b/sys/i386/isa/sound/gus_wave.c
@@ -28,7 +28,7 @@
  */
 
 #include "sound_config.h"
-#include "ultrasound.h"
+#include <machine/ultrasound.h>
 #include "gus_hw.h"
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_GUS)
diff --git a/sys/i386/isa/sound/ics2101.c b/sys/i386/isa/sound/ics2101.c
index 9df383a27e8..3a76ea96649 100644
--- a/sys/i386/isa/sound/ics2101.c
+++ b/sys/i386/isa/sound/ics2101.c
@@ -30,7 +30,7 @@
 #include "sound_config.h"
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_GUS)
 
-#include "ultrasound.h"
+#include <machine/ultrasound.h>
 #include "gus_hw.h"
 
 #define MIX_DEVS	(SOUND_MASK_MIC|SOUND_MASK_LINE| \
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index 5b64f43c3de..68664bcbb1a 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -57,7 +57,7 @@
 #define SHORT_BANNERS
 
 /* The soundcard.h could be in a nonstandard place so inclyde it here. */
-#include "soundcard.h"
+#include <machine/soundcard.h>
 
 /*
  * Here is the first portability problem. Every OS has it's own way to
diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c
index c0b1bdfb532..ca1994cb7eb 100644
--- a/sys/i386/isa/sound/sb16_dsp.c
+++ b/sys/i386/isa/sound/sb16_dsp.c
@@ -78,7 +78,6 @@ static void     sb16_dsp_halt (int dev);
 static int      dsp_set_speed (int);
 static int      dsp_set_stereo (int);
 static void     dsp_cleanup (void);
-int             sb_reset_dsp (void);
 
 static struct audio_operations sb16_dsp_operations =
 {
diff --git a/sys/i386/isa/sound/sound_config.h b/sys/i386/isa/sound/sound_config.h
index 55ac84c1d31..17810b8f376 100644
--- a/sys/i386/isa/sound/sound_config.h
+++ b/sys/i386/isa/sound/sound_config.h
@@ -211,6 +211,18 @@ If your card has nonstandard I/O address or IRQ number, change defines
 #define TRIX_DMA	1
 #endif
 
+#ifndef U6850_BASE
+#define U6850_BASE	0x330
+#endif
+  
+#ifndef U6850_IRQ
+#define U6850_IRQ	5
+#endif
+  
+#ifndef U6850_DMA
+#define U6850_DMA	1
+#endif
+
 #ifndef MAX_REALTIME_FACTOR
 #define MAX_REALTIME_FACTOR	4
 #endif
diff --git a/sys/i386/isa/sound/uart6850.c b/sys/i386/isa/sound/uart6850.c
index ff6d6c31a87..ba5aac6b510 100644
--- a/sys/i386/isa/sound/uart6850.c
+++ b/sys/i386/isa/sound/uart6850.c
@@ -93,7 +93,7 @@ uart6850_input_loop (void)
 }
 
 void
-m6850intr (INTR_HANDLER_PARMS (irq, dummy))
+m6850intr (int unit)
 {
   if (input_avail ())
     uart6850_input_loop ();