From e8ba741b167348969545b89c775b5df3d571770f Mon Sep 17 00:00:00 2001
From: itohy <itohy@NetBSD.org>
Date: Sun, 4 Nov 2001 07:39:40 +0000
Subject: [PATCH] Add mpu at cmpci and opl at cmpci attachment. I always test
 it on alpha, and add cmpci entries to alpha config files.

---
 sys/arch/alpha/conf/ALPHA         | 8 ++++++--
 sys/arch/alpha/conf/GENERIC       | 8 ++++++--
 sys/arch/i386/conf/ARMADA         | 6 ++++--
 sys/arch/i386/conf/CARDBUS        | 6 ++++--
 sys/arch/i386/conf/DR-EVIL        | 4 +++-
 sys/arch/i386/conf/GENERIC        | 6 ++++--
 sys/arch/i386/conf/GENERIC_LAPTOP | 6 ++++--
 sys/arch/macppc/conf/GENERIC      | 6 ++++--
 8 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index 288d90299338..81fad8de53d5 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,10 +1,10 @@
-# $NetBSD: ALPHA,v 1.154 2001/10/01 10:23:37 simonb Exp $
+# $NetBSD: ALPHA,v 1.155 2001/11/04 07:39:41 itohy Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
 include	"arch/alpha/conf/std.alpha"
 
-ident		"ALPHA-$Revision: 1.154 $"
+ident		"ALPHA-$Revision: 1.155 $"
 
 maxusers 32
 
@@ -240,6 +240,7 @@ adw*	at	pci? dev ? function ?		# AdvanSys Wide SCSI
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
+cmpci*	at	pci? dev ? function ?		# C-Media CMI8338/8738 Audio
 cy*	at	pci? dev ? function ?		# Cyclades Cyclom-Y (untested)
 cz*	at	pci? dev ? function ?		# Cyclades-Z (untested)
 de*	at	pci? dev ? function ?		# 21x4x-based Ethernet
@@ -283,15 +284,18 @@ vga*	at	pci? dev ? function ?		# PCI VGA Graphics
 vr*	at	pci? dev ? function ?		# VIA Rhine Fast Ethernet
 yds*	at	pci? dev ? function ?		# Yamaha DS-1 PCI Audio
 
+audio*	at	cmpci?
 audio*	at	eap?
 audio*	at	eso?
 audio*	at	sv?
 audio*	at	yds?
 
+opl*	at	cmpci? flags 1
 opl*	at	eso?
 #opl*	at	sv?
 opl*	at	yds?
 
+mpu*	at	cmpci?
 mpu*	at	eso?
 mpu*	at	yds?
 
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index e433430a8b5f..c925ac64d8f4 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.194 2001/10/01 10:23:37 simonb Exp $
+# $NetBSD: GENERIC,v 1.195 2001/11/04 07:39:41 itohy Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 #
@@ -6,7 +6,7 @@
 
 include	"arch/alpha/conf/std.alpha"
 
-#ident 		"GENERIC-$Revision: 1.194 $"
+#ident 		"GENERIC-$Revision: 1.195 $"
 
 maxusers 32
 
@@ -224,6 +224,7 @@ adw*	at	pci? dev ? function ?		# AdvanSys Wide SCSI
 ahc*	at	pci? dev ? function ?		# Adaptec [23]94x, aic78x0 SCSI
 bha*	at	pci? dev ? function ?		# BusLogic 9xx SCSI (untested)
 cac*	at	pci? dev ? function ?		# Compaq array controller (untested)
+cmpci*	at	pci? dev ? function ?		# C-Media CMI8338/8738 Audio
 cy*	at	pci? dev ? function ?		# Cyclades Cyclom-Y (untested)
 cz*	at	pci? dev ? function ?		# Cyclades-Z (untested)
 de*	at	pci? dev ? function ?		# 21x4x-based Ethernet
@@ -266,15 +267,18 @@ vga*	at	pci? dev ? function ?		# PCI VGA Graphics
 vr*	at	pci? dev ? function ?		# VIA Rhine Fast Ethernet
 yds*	at	pci? dev ? function ?		# Yamaha DS-1 PCI Audio
 
+audio*	at	cmpci?
 audio*	at	eap?
 audio*	at	eso?
 audio*	at	sv?
 audio*	at	yds?
 
+opl*	at	cmpci? flags 1
 opl*	at	eso?
 #opl*	at	sv?
 opl*	at	yds?
 
+mpu*	at	cmpci?
 mpu*	at	eso?
 mpu*	at	yds?
 
diff --git a/sys/arch/i386/conf/ARMADA b/sys/arch/i386/conf/ARMADA
index 9f5ed44fbf97..83da4b704ea4 100644
--- a/sys/arch/i386/conf/ARMADA
+++ b/sys/arch/i386/conf/ARMADA
@@ -1,4 +1,4 @@
-#	$NetBSD: ARMADA,v 1.5 2001/08/28 09:25:52 ad Exp $
+#	$NetBSD: ARMADA,v 1.6 2001/11/04 07:39:40 itohy Exp $
 #
 #	CARDBUS: GENERIC + CardBus support.  Additionally, some
 #	things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident		"CARDBUS-$Revision: 1.5 $"
+#ident		"CARDBUS-$Revision: 1.6 $"
 
 maxusers	32		# estimated number of users
 
@@ -777,6 +777,7 @@ wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
 
 # OPL[23] FM synthesizers
 #opl0	at isa? port 0x388	# use only if not attached to sound card
+opl*	at cmpci? flags 1
 opl*	at eso?
 #opl*	at ess?
 opl*	at fms?
@@ -810,6 +811,7 @@ audio*	at wss?
 
 # MPU 401 UARTs
 #mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
+mpu*	at cmpci?
 mpu*	at eso?
 mpu*	at fms?
 mpu*	at sb?
diff --git a/sys/arch/i386/conf/CARDBUS b/sys/arch/i386/conf/CARDBUS
index cd56900c98c8..e544e1634f54 100644
--- a/sys/arch/i386/conf/CARDBUS
+++ b/sys/arch/i386/conf/CARDBUS
@@ -1,4 +1,4 @@
-#	$NetBSD: CARDBUS,v 1.40 2001/10/30 01:39:15 lukem Exp $
+#	$NetBSD: CARDBUS,v 1.41 2001/11/04 07:39:40 itohy Exp $
 #
 #	CARDBUS: GENERIC + CardBus support.  Additionally, some
 #	things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident		"CARDBUS-$Revision: 1.40 $"
+#ident		"CARDBUS-$Revision: 1.41 $"
 
 maxusers	32		# estimated number of users
 
@@ -807,6 +807,7 @@ esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
 
 # OPL[23] FM synthesizers
 #opl0	at isa? port 0x388	# use only if not attached to sound card
+opl*	at cmpci? flags 1
 opl*	at esl?
 opl*	at eso?
 #opl*	at ess?
@@ -845,6 +846,7 @@ audio*	at yds?
 
 # MPU 401 UARTs
 #mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
+mpu*	at cmpci?
 mpu*	at eso?
 mpu*	at fms?
 mpu*	at sb?
diff --git a/sys/arch/i386/conf/DR-EVIL b/sys/arch/i386/conf/DR-EVIL
index 0c617b128b76..b3e6ad68357d 100644
--- a/sys/arch/i386/conf/DR-EVIL
+++ b/sys/arch/i386/conf/DR-EVIL
@@ -1,4 +1,4 @@
-#	$NetBSD: DR-EVIL,v 1.30 2001/08/22 15:39:06 hubertf Exp $
+#	$NetBSD: DR-EVIL,v 1.31 2001/11/04 07:39:40 itohy Exp $
 #
 #	DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej@netbsd.org
 #
@@ -718,6 +718,7 @@ ugen*	at uhub? port ? configuration ? interface ?
 
 # OPL[23] FM synthesizers
 #opl0	at isa? port 0x388	# use only if not attached to sound card
+#opl*	at cmpci? flags 1
 #opl*	at eso?
 #opl*	at ess?
 #opl*	at fms?
@@ -747,6 +748,7 @@ audio* at uaudio?
 
 # MPUI 401 UARTs
 #mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
+#mpu*	at cmpci?
 #mpu*	at eso?
 #mpu*	at fms?
 #mpu*	at sb?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 3323c4a2d440..4e98833daf36 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.433 2001/11/03 17:08:56 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.434 2001/11/04 07:39:41 itohy Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident 		"GENERIC-$Revision: 1.433 $"
+#ident 		"GENERIC-$Revision: 1.434 $"
 
 maxusers	32		# estimated number of users
 
@@ -830,6 +830,7 @@ wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
 
 # OPL[23] FM synthesizers
 #opl0	at isa? port 0x388	# use only if not attached to sound card
+opl*	at cmpci? flags 1
 #opl*	at esl?
 opl*	at eso?
 opl*	at ess?
@@ -868,6 +869,7 @@ audio*	at ym?
 
 # MPU 401 UARTs
 #mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
+mpu*	at cmpci?
 mpu*	at eso?
 mpu*	at fms?
 mpu*	at sb?
diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP
index d495ad252c27..b19537008a8e 100644
--- a/sys/arch/i386/conf/GENERIC_LAPTOP
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_LAPTOP,v 1.26 2001/10/17 18:41:20 jdolecek Exp $
+#	$NetBSD: GENERIC_LAPTOP,v 1.27 2001/11/04 07:39:41 itohy Exp $
 #	From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #	GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -6,7 +6,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident 		"GENERIC-$Revision: 1.26 $"
+#ident 		"GENERIC-$Revision: 1.27 $"
 
 maxusers	32		# estimated number of users
 
@@ -626,6 +626,7 @@ esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
 
 # OPL[23] FM synthesizers
 #opl0	at isa? port 0x388	# use only if not attached to sound card
+opl*	at cmpci? flags 1
 opl*	at esl?
 opl*	at eso?
 opl*	at ess?
@@ -664,6 +665,7 @@ audio*	at ym?
 
 # MPU 401 UARTs
 #mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
+mpu*	at cmpci?
 mpu*	at eso?
 mpu*	at fms?
 mpu*	at sb?
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 1ecf90cc22c6..535305dd07e0 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.111 2001/11/03 17:16:17 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.112 2001/11/04 07:39:42 itohy Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include		"arch/macppc/conf/std.macppc"
 
-#ident 		"GENERIC-$Revision: 1.111 $"
+#ident 		"GENERIC-$Revision: 1.112 $"
 
 maxusers	32
 
@@ -300,6 +300,7 @@ eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
 #sv*	at pci? dev ? function ?	# S3 SonicVibes
 
 # OPL[23] FM synthesizers
+#opl*	at cmpci? flags 1
 #opl*	at eso?
 #opl*	at fms?
 
@@ -314,6 +315,7 @@ audio*	at eap?
 audio*	at uaudio?
 
 # MPU 401 UARTs
+#mpu*	at cmpci?
 #mpu*	at eso?
 #mpu*	at fms?