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

@@ -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)

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| \

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

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 =
 {

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

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 ();