remove unused isa/cs4231var.h

diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index bf4637a..265914f 100644 (file)
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ad1848.c,v 1.49 2024/04/13 23:44:11 jsg Exp $ */
+/*     $OpenBSD: ad1848.c,v 1.50 2024/05/28 09:27:08 jsg Exp $ */
 /*     $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $     */
 
 /*
@@ -89,7 +89,6 @@
 #include <dev/ic/ad1848reg.h>
 #include <dev/ic/cs4231reg.h>
 #include <dev/isa/ad1848var.h>
-#include <dev/isa/cs4231var.h>
 
 #ifdef AUDIO_DEBUG
 #define DPRINTF(x)     do { if (ad1848debug) printf x; } while (0);

diff --git a/sys/dev/isa/cs4231var.h b/sys/dev/isa/cs4231var.h
deleted file mode 100644 (file)
index 7c552ea..0000000
--- a/sys/dev/isa/cs4231var.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $OpenBSD: cs4231var.h,v 1.4 2008/06/26 05:42:16 ray Exp $ */
-/* $NetBSD: cs4231var.h,v 1.2 1996/02/05 02:21:51 jtc Exp $ */
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Ken Hornstein and John Kohl.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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 NETBSD FOUNDATION, INC. 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 DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT 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.
- */
-
-/*
- * Software gunk for CS4231, as used in Gravis UltraSound MAX.
- */
-
-struct cs4231_softc {
-    int in_port;                       /* which MUX input port? */
-#define CS4231_MUX_MIXED_IN    0
-#define CS4231_MUX_MIC_IN      1
-#define CS4231_MUX_AUX1_IN     2
-#define CS4231_MUX_LINE_IN     3
-};
-
-int    cs4231_set_linein_gain(struct ad1848_softc *, struct ad1848_volume *);
-int    cs4231_get_linein_gain(struct ad1848_softc *, struct ad1848_volume *);
-int    cs4231_set_mono_gain(struct ad1848_softc *, struct ad1848_volume *);
-int    cs4231_get_mono_gain(struct ad1848_softc *, struct ad1848_volume *);
-void   cs4231_mute_mono(struct ad1848_softc *, int /* onoff */);
-void   cs4231_mute_line(struct ad1848_softc *, int /* onoff */);
-void   cs4231_mute_monitor(struct ad1848_softc *, int /* onoff */);

diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 487bff5..d933de6 100644 (file)
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: gus.c,v 1.55 2022/11/02 10:41:34 kn Exp $     */
+/*     $OpenBSD: gus.c,v 1.56 2024/05/28 09:27:08 jsg Exp $    */
 /*     $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
 
 /*-
@@ -115,7 +115,6 @@
 #include <dev/ic/ad1848reg.h>
 #include <dev/isa/ics2101var.h>
 #include <dev/isa/ad1848var.h>
-#include <dev/isa/cs4231var.h>
 #include "gusreg.h"
 #include "gusvar.h"
 

diff --git a/sys/dev/isa/gus_isa.c b/sys/dev/isa/gus_isa.c
index 28886f7..54e7c1e 100644 (file)
--- a/sys/dev/isa/gus_isa.c
+++ b/sys/dev/isa/gus_isa.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: gus_isa.c,v 1.9 2022/04/06 18:59:28 naddy Exp $       */
+/*     $OpenBSD: gus_isa.c,v 1.10 2024/05/28 09:27:08 jsg Exp $        */
 /*     $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
 
 /*-
@@ -115,7 +115,6 @@
 #include <dev/ic/ad1848reg.h>
 #include <dev/isa/ics2101var.h>
 #include <dev/isa/ad1848var.h>
-#include <dev/isa/cs4231var.h>
 #include "gusreg.h"
 #include "gusvar.h"
 

diff --git a/sys/dev/isa/gus_isapnp.c b/sys/dev/isa/gus_isapnp.c
index 56277cc..62fa3c1 100644 (file)
--- a/sys/dev/isa/gus_isapnp.c
+++ b/sys/dev/isa/gus_isapnp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: gus_isapnp.c,v 1.10 2022/04/06 18:59:28 naddy Exp $   */
+/*     $OpenBSD: gus_isapnp.c,v 1.11 2024/05/28 09:27:08 jsg Exp $     */
 /*     $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
 
 /*-
@@ -115,7 +115,6 @@
 #include <dev/ic/ad1848reg.h>
 #include <dev/isa/ics2101var.h>
 #include <dev/isa/ad1848var.h>
-#include <dev/isa/cs4231var.h>
 #include "gusreg.h"
 #include "gusvar.h"