summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-11-07 18:57:38 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-11-07 18:57:38 +0000
commit56e3432fcc824d08e3d07067c9332df75f959c56 (patch)
treed52435538ce4c3bce4946568ca7002ac332faefe /sys
parentfdb0a025f1da65e2f076e99c304c7fd4796b343a (diff)
Add a bunch of PCI audio devices, only compile tested; from Brad.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP2716
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP3016
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP3218
3 files changed, 43 insertions, 7 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index 4c2ddcbedee..3f7f9b65746 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP27,v 1.19 2009/11/07 18:56:55 miod Exp $
+# $OpenBSD: GENERIC-IP27,v 1.20 2009/11/07 18:57:37 miod Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
#
@@ -197,9 +197,21 @@ ukphy* at mii? # "unknown" PHYs
wi* at pci?
#### Audio
-emu* at pci?
+cmpci* at pci? # C-Media CMI8338/8738
+eap* at pci? # Ensoniq AudioPCI S5016
+emu* at pci? # SB Live!
+
+audio* at cmpci?
+audio* at eap?
audio* at emu?
+# OPL[23] FM synthesizers
+opl* at cmpci?
+
+# MIDI support
+midi* at opl?
+midi* at eap?
+
#### SCSI Bus devices
sd* at scsibus?
st* at scsibus?
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index d3b4d6874d1..5cfee442f2d 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP30,v 1.15 2009/11/01 19:17:56 miod Exp $
+# $OpenBSD: GENERIC-IP30,v 1.16 2009/11/07 18:57:37 miod Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
#
@@ -190,9 +190,21 @@ ukphy* at mii? # "unknown" PHYs
wi* at pci?
#### Audio
-emu* at pci?
+cmpci* at pci? # C-Media CMI8338/8738
+eap* at pci? # Ensoniq AudioPCI S5016
+emu* at pci? # SB Live!
+
+audio* at cmpci?
+audio* at eap?
audio* at emu?
+# OPL[23] FM synthesizers
+opl* at cmpci?
+
+# MIDI support
+midi* at opl?
+midi* at eap?
+
#### SCSI Bus devices
sd* at scsibus?
st* at scsibus?
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index a7c821e1d83..c4bfd04193a 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP32,v 1.10 2009/10/26 18:00:04 miod Exp $
+# $OpenBSD: GENERIC-IP32,v 1.11 2009/11/07 18:57:37 miod Exp $
#
# THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
#
@@ -185,9 +185,21 @@ ukphy* at mii? # "unknown" PHYs
wi* at pci?
#### Audio
-audio* at mavb?
-emu* at pci?
+cmpci* at pci? # C-Media CMI8338/8738
+eap* at pci? # Ensoniq AudioPCI S5016
+emu* at pci? # SB Live!
+
+audio* at cmpci?
+audio* at eap?
audio* at emu?
+audio* at mavb?
+
+# OPL[23] FM synthesizers
+opl* at cmpci?
+
+# MIDI support
+midi* at opl?
+midi* at eap?
#### WS Console
wsdisplay* at gbe?