Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Add mpu at cmpci and opl at cmpci attachment.
details: https://anonhg.NetBSD.org/src/rev/795e126b9cb7
branches: trunk
changeset: 516996:795e126b9cb7
user: itohy <itohy%NetBSD.org@localhost>
date: Sun Nov 04 07:39:40 2001 +0000
description:
Add mpu at cmpci and opl at cmpci attachment.
I always test it on alpha, and add cmpci entries to alpha config files.
diffstat:
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(-)
diffs (281 lines):
diff -r 850ae9a2398b -r 795e126b9cb7 sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/alpha/conf/ALPHA Sun Nov 04 07:39:40 2001 +0000
@@ -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 @@
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 @@
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 -r 850ae9a2398b -r 795e126b9cb7 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/alpha/conf/GENERIC Sun Nov 04 07:39:40 2001 +0000
@@ -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 @@
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 @@
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 -r 850ae9a2398b -r 795e126b9cb7 sys/arch/i386/conf/ARMADA
--- a/sys/arch/i386/conf/ARMADA Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/i386/conf/ARMADA Sun Nov 04 07:39:40 2001 +0000
@@ -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 @@
# 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 @@
# 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 -r 850ae9a2398b -r 795e126b9cb7 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS Sun Nov 04 07:39:40 2001 +0000
@@ -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 @@
# 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 @@
# 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 -r 850ae9a2398b -r 795e126b9cb7 sys/arch/i386/conf/DR-EVIL
--- a/sys/arch/i386/conf/DR-EVIL Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/i386/conf/DR-EVIL Sun Nov 04 07:39:40 2001 +0000
@@ -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@localhost
#
@@ -718,6 +718,7 @@
# 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 @@
# 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 -r 850ae9a2398b -r 795e126b9cb7 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC Sun Nov 04 07:39:40 2001 +0000
@@ -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 @@
# 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 @@
# 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 -r 850ae9a2398b -r 795e126b9cb7 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Sun Nov 04 07:39:40 2001 +0000
@@ -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 @@
# 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 @@
# 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 -r 850ae9a2398b -r 795e126b9cb7 sys/arch/macppc/conf/GENERIC
--- a/sys/arch/macppc/conf/GENERIC Sun Nov 04 07:00:39 2001 +0000
+++ b/sys/arch/macppc/conf/GENERIC Sun Nov 04 07:39:40 2001 +0000
@@ -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 @@
#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 uaudio?
# MPU 401 UARTs
+#mpu* at cmpci?
#mpu* at eso?
#mpu* at fms?
Home |
Main Index |
Thread Index |
Old Index