Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Rename the audio "bus" attribute audiobus to avoid confu...
details: https://anonhg.NetBSD.org/src/rev/cd1ab39c2a8e
branches: trunk
changeset: 525947:cd1ab39c2a8e
user: augustss <augustss%NetBSD.org@localhost>
date: Mon Apr 22 09:41:19 2002 +0000
description:
Rename the audio "bus" attribute audiobus to avoid confusion with audio
device.
diffstat:
sys/arch/acorn26/conf/files.acorn26 | 4 ++--
sys/arch/amiga/conf/files.amiga | 10 +++++-----
sys/arch/amigappc/conf/files.amigappc | 6 +++---
sys/arch/hpcmips/conf/files.hpcmips | 4 ++--
sys/arch/macppc/conf/files.macppc | 4 ++--
sys/arch/prep/conf/files.prep | 4 ++--
sys/arch/sparc/conf/files.sparc | 4 ++--
sys/arch/x68k/conf/files.x68k | 4 ++--
sys/conf/files | 8 ++++----
sys/dev/isa/files.isa | 18 +++++++++---------
sys/dev/isapnp/files.isapnp | 4 ++--
sys/dev/pci/files.pci | 32 ++++++++++++++++----------------
sys/dev/pcmcia/files.pcmcia | 4 ++--
sys/dev/tc/files.tc | 4 ++--
sys/dev/usb/files.usb | 4 ++--
15 files changed, 57 insertions(+), 57 deletions(-)
diffs (truncated from 467 to 300 lines):
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/acorn26/conf/files.acorn26
--- a/sys/arch/acorn26/conf/files.acorn26 Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/acorn26/conf/files.acorn26 Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acorn26,v 1.1 2002/03/24 15:46:51 bjh21 Exp $
+# $NetBSD: files.acorn26,v 1.2 2002/04/22 09:41:19 augustss Exp $
# Copyright (c) 1997, 1998, 2000 Ben Harris
# All rights reserved.
@@ -160,7 +160,7 @@
attach arcvideo at root
file arch/acorn26/vidc/arcvideo.c arcvideo needs-flag
-device arcaudio: audio
+device arcaudio: audiobus
attach arcaudio at root
###
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/amiga/conf/files.amiga Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.120 2002/04/19 16:29:17 heinz Exp $
+# $NetBSD: files.amiga,v 1.121 2002/04/22 09:41:19 augustss Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -94,19 +94,19 @@
file arch/amiga/dev/par.c par needs-count
# audio
-device aucc: audio
+device aucc: audiobus
attach aucc at mainbus
file arch/amiga/dev/aucc.c aucc needs-flag
-device melody: audio, tms320av110
+device melody: audiobus, tms320av110
attach melody at zbus
file arch/amiga/dev/melody.c melody
-device repulse: audio, ac97, mulaw
+device repulse: audiobus, ac97, mulaw
attach repulse at zbus
file arch/amiga/dev/repulse.c repulse
-device toccata: audio, ad1848, auconv
+device toccata: audiobus, ad1848, auconv
attach toccata at zbus
file arch/amiga/dev/toccata.c toccata
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/amigappc/conf/files.amigappc
--- a/sys/arch/amigappc/conf/files.amigappc Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/amigappc/conf/files.amigappc Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amigappc,v 1.8 2001/12/04 11:51:39 is Exp $
+# $NetBSD: files.amigappc,v 1.9 2002/04/22 09:41:20 augustss Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -72,11 +72,11 @@
file arch/amiga/dev/par.c par needs-count
# audio
-device aucc: audio
+device aucc: audiobus
attach aucc at mainbus
file arch/amiga/dev/aucc.c aucc needs-flag
-device melody: audio, tms320av110
+device melody: audiobus, tms320av110
attach melody at zbus
file arch/amiga/dev/melody.c melody
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/hpcmips/conf/files.hpcmips
--- a/sys/arch/hpcmips/conf/files.hpcmips Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/hpcmips/conf/files.hpcmips Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.81 2002/04/16 20:50:20 thorpej Exp $
+# $NetBSD: files.hpcmips,v 1.82 2002/04/22 09:41:20 augustss Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -414,6 +414,6 @@
file arch/hpcmips/vr/vrdcu.c vrdcu
# Audio Interface Unit
-device vraiu: audio
+device vraiu: audiobus
attach vraiu at vripif
file arch/hpcmips/vr/vraiu.c vraiu
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/macppc/conf/files.macppc
--- a/sys/arch/macppc/conf/files.macppc Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/macppc/conf/files.macppc Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.macppc,v 1.49 2002/04/16 20:50:21 thorpej Exp $
+# $NetBSD: files.macppc,v 1.50 2002/04/22 09:41:20 augustss Exp $
#
# macppc-specific configuration info
@@ -182,7 +182,7 @@
attach wi at obio with wi_obio
file arch/macppc/dev/if_wi_obio.c wi_obio
-device awacs: audio, auconv, mulaw
+device awacs: audiobus, auconv, mulaw
attach awacs at obio
file arch/macppc/dev/awacs.c awacs
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/prep/conf/files.prep
--- a/sys/arch/prep/conf/files.prep Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/prep/conf/files.prep Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.prep,v 1.28 2002/04/16 20:50:22 thorpej Exp $
+# $NetBSD: files.prep,v 1.29 2002/04/22 09:41:20 augustss Exp $
#
# prep-specific configuration info
#
@@ -174,7 +174,7 @@
# Game adapter (joystick)
file arch/prep/isa/joy_timer.c joy
-device paud { }: audio, isadma, ad1848, auconv
+device paud { }: audiobus, isadma, ad1848, auconv
attach paud at isa with paud_isa
file arch/prep/isa/paud_isa.c paud_isa
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/sparc/conf/files.sparc
--- a/sys/arch/sparc/conf/files.sparc Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/sparc/conf/files.sparc Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc,v 1.111 2002/04/16 20:50:23 thorpej Exp $
+# $NetBSD: files.sparc,v 1.112 2002/04/22 09:41:21 augustss Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@@ -184,7 +184,7 @@
attach esp at obio with esp_obio
file arch/sparc/dev/esp_obio.c esp_obio
-device audioamd: audio, am7930
+device audioamd: audiobus, am7930
attach audioamd at mainbus with audioamd_mainbus
attach audioamd at sbus with audioamd_sbus
file arch/sparc/dev/audioamd.c audioamd
diff -r 69a2849f469f -r cd1ab39c2a8e sys/arch/x68k/conf/files.x68k
--- a/sys/arch/x68k/conf/files.x68k Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/arch/x68k/conf/files.x68k Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.x68k,v 1.45 2001/12/26 14:40:20 minoura Exp $
+# $NetBSD: files.x68k,v 1.46 2002/04/22 09:41:21 augustss Exp $
#
# new style config file for x68k architecture
#
@@ -133,7 +133,7 @@
attach opm at intio
file arch/x68k/dev/opm.c opm
-device vs: audio, auconv, mulaw, msm6258
+device vs: audiobus, auconv, mulaw, msm6258
attach vs at intio
file arch/x68k/dev/vs.c vs needs-flag
diff -r 69a2849f469f -r cd1ab39c2a8e sys/conf/files
--- a/sys/conf/files Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/conf/files Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.518 2002/04/21 22:52:05 bouyer Exp $
+# $NetBSD: files,v 1.519 2002/04/22 09:41:21 augustss Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -151,7 +151,7 @@
# generic attributes
#
-define audio { }
+define audiobus { }
define midibus { }
define midisyn
define wdc_base
@@ -171,7 +171,7 @@
# audio and midi devices, attaches to audio hardware driver
#
device audio
-attach audio at audio
+attach audio at audiobus
device midi
attach midi at midibus
@@ -604,7 +604,7 @@
# SPARC `SUNW,audiocs'
#
-device audiocs: audio, auconv, ad1848
+device audiocs: audiobus, auconv, ad1848
file dev/ic/cs4231.c audiocs
# AC-97 CODECs
diff -r 69a2849f469f -r cd1ab39c2a8e sys/dev/isa/files.isa
--- a/sys/dev/isa/files.isa Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/dev/isa/files.isa Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.123 2002/02/02 18:37:45 jdolecek Exp $
+# $NetBSD: files.isa,v 1.124 2002/04/22 09:41:22 augustss Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -294,7 +294,7 @@
file dev/isa/sbdsp.c sbdsp
# SoundBlaster family
-device sb: audio, isadma, sbdsp, mulaw, auconv, midibus
+device sb: audiobus, isadma, sbdsp, mulaw, auconv, midibus
file dev/isa/sb.c sb needs-flag
attach sb at isa with sb_isa
@@ -307,7 +307,7 @@
file dev/isa/mpu_sb.c mpu_sb
# ProAudio Spectrum
-device pas: audio, isadma, sbdsp, mulaw, auconv
+device pas: audiobus, isadma, sbdsp, mulaw, auconv
attach pas at isa
file dev/isa/pas.c pas needs-flag
@@ -324,12 +324,12 @@
[iomem = -1], [iosiz = 0],
[irq = -1], [drq = -1]}
attach pss at isa
-device sp: audio, isadma, ad1848, auconv
+device sp: audiobus, isadma, ad1848, auconv
attach sp at pss
file dev/isa/pss.c pss needs-flag
# Microsoft Windows Sound System
-device wss { } : audio, isadma, ad1848, auconv
+device wss { } : audiobus, isadma, ad1848, auconv
file dev/isa/wss.c wss needs-flag
attach wss at isa with wss_isa
@@ -339,7 +339,7 @@
file dev/isa/opl_wss.c opl_wss
# ESS Technology ES1887/ES888/ES1888
-device ess { } : audio, isadma, mulaw, auconv, midibus
+device ess { } : audiobus, isadma, mulaw, auconv, midibus
file dev/isa/ess.c ess needs-flag
attach ess at isa with ess_isa
@@ -353,7 +353,7 @@
file dev/isa/opl_isa.c opl_isa
# Yamaha OPL3-SA3
-device ym { }: audio, isadma, ad1848, auconv
+device ym { }: audiobus, isadma, ad1848, auconv
file dev/isa/ym.c ym
defparam opt_ym.h YM_POWER_MODE YM_POWER_OFF_SEC
@@ -366,13 +366,13 @@
# Gravis UltraSound & UltraSound MAX.
# Use the "drq2" keyword in a config file to specify an extra DMA
# channel for full-duplex operation.
-device gus: audio, isadma, ics2101, ad1848, mulaw, auconv
+device gus: audiobus, isadma, ics2101, ad1848, mulaw, auconv
attach gus at isa
file dev/isa/gus.c gus needs-flag
# Sierra's Aria chipset.
# (e.g. Prometheus Aria 16)
-device aria: audio, mulaw, auconv
+device aria: audiobus, mulaw, auconv
attach aria at isa
file dev/isa/aria.c aria
diff -r 69a2849f469f -r cd1ab39c2a8e sys/dev/isapnp/files.isapnp
--- a/sys/dev/isapnp/files.isapnp Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/dev/isapnp/files.isapnp Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.isapnp,v 1.31 2002/02/02 18:37:45 jdolecek Exp $
+# $NetBSD: files.isapnp,v 1.32 2002/04/22 09:41:22 augustss Exp $
#
# Config file and device description for machine-independent ISAPnP code.
# Included by ports that need it.
@@ -55,7 +55,7 @@
file dev/isapnp/sb_isapnp.c sb_isapnp
# GUS Pnp (Interwave)
-device guspnp: audio, isadma, interwave, mulaw
+device guspnp: audiobus, isadma, interwave, mulaw
attach guspnp at isapnp
file dev/isapnp/gus_isapnp.c guspnp needs-flag
diff -r 69a2849f469f -r cd1ab39c2a8e sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci Mon Apr 22 08:44:05 2002 +0000
+++ b/sys/dev/pci/files.pci Mon Apr 22 09:41:19 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.167 2002/04/17 02:19:13 mycroft Exp $
+# $NetBSD: files.pci,v 1.168 2002/04/22 09:41:22 augustss Exp $
#
Home |
Main Index |
Thread Index |
Old Index