Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the audio "bus" attribute audiobus to avoid confusion with audio

Browse Source 
device.
This commit is contained in:
augustss 2002-04-22 09:41:19 +00:00
parent d60499e75b
commit 7f7ab48604
15 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/acorn26/conf/files.acorn26
View File

@ -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 @@ device arcvideo: rasops1, rasops2, rasops4, rasops8, wsemuldisplaydev
attach arcvideo at root
file arch/acorn26/vidc/arcvideo.c arcvideo needs-flag
device arcaudio: audio
device arcaudio: audiobus
attach arcaudio at root
###

10
sys/arch/amiga/conf/files.amiga
View File

@ -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 @@ attach par at mainbus
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

6
sys/arch/amigappc/conf/files.amigappc
View File

@ -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 @@ attach par at mainbus
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

4
sys/arch/hpcmips/conf/files.hpcmips
View File

@ -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 @@ attach vrdcu at vripif
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

4
sys/arch/macppc/conf/files.macppc
View File

@ -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 @@ file arch/macppc/dev/wdc_obio.c wdc_obio
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

4
sys/arch/prep/conf/files.prep
View File

@ -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 @@ major {fd = 2}
# 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

4
sys/arch/sparc/conf/files.sparc
View File

@ -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 @@ file arch/sparc/dev/dma_obio.c dma_obio
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

4
sys/arch/x68k/conf/files.x68k
View File

@ -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 @@ device opm
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

8
sys/conf/files
View File

@ -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 @@ devclass tty
# generic attributes
#
define audio { }
define audiobus { }
define midibus { }
define midisyn
define wdc_base
@ -171,7 +171,7 @@ file dev/aurateconv.c aurateconv needs-flag
# 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 @@ file dev/ic/am7930.c am7930
# SPARC `SUNW,audiocs'
#
device audiocs: audio, auconv, ad1848
device audiocs: audiobus, auconv, ad1848
file dev/ic/cs4231.c audiocs
# AC-97 CODECs

18
sys/dev/isa/files.isa
View File

@ -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 @@ define sbdsp { }
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 @@ attach mpu at sbdsp with mpu_sb
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 @@ device pss {[port = -1], [size = 0],
[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 @@ attach opl at wss with opl_wss
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 @@ attach opl at isa with opl_isa
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 @@ file dev/isa/mpu_ym.c mpu_ym needs-flag
# 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

4
sys/dev/isapnp/files.isapnp
View File

@ -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 @@ attach sb at isapnp with sb_isapnp
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

32
sys/dev/pci/files.pci
View File

@ -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 $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@ -256,12 +256,12 @@ file dev/pci/bktr/bktr_os.c bktr needs-flag
file dev/pci/bktr/bktr_tuner.c bktr
# Cirrus Logic CrystalClear PCI Audio CS4280
device clcs: audio, auconv, mulaw, ac97, midibus
device clcs: audiobus, auconv, mulaw, ac97, midibus
attach clcs at pci
file dev/pci/cs4280.c clcs
# Cirrus Logic CrystalClear PCI Audio CS4281
device clct: audio, auconv, mulaw, ac97
device clct: audiobus, auconv, mulaw, ac97
attach clct at pci
file dev/pci/cs4281.c clct
@ -269,7 +269,7 @@ file dev/pci/cs4281.c clct
file dev/pci/cs428x.c clcs | clct
# Forte Media FM801
device fms { }: audio, auconv, mulaw, ac97, midibus
device fms { }: audiobus, auconv, mulaw, ac97, midibus
attach fms at pci
file dev/pci/fms.c fms
@ -280,32 +280,32 @@ attach mpu at fms with mpu_fms
file dev/pci/mpu_fms.c mpu_fms
# Ensoniq AudioPCI S5016
device eap: audio, auconv, mulaw, ac97, midibus
device eap: audiobus, auconv, mulaw, ac97, midibus
attach eap at pci
file dev/pci/eap.c eap
# Intel ICH AC'97 audio
device auich: audio, auconv, mulaw, ac97, aurateconv
device auich: audiobus, auconv, mulaw, ac97, aurateconv
attach auich at pci
file dev/pci/auich.c auich
# VIA VT82C686A AC'97 Audio
device auvia: audio, auconv, mulaw, ac97
device auvia: audiobus, auconv, mulaw, ac97
attach auvia at pci
file dev/pci/auvia.c auvia
# NeoMagic 256 AC'97 Audio
device neo: audio, auconv, mulaw, ac97
device neo: audiobus, auconv, mulaw, ac97
attach neo at pci
file dev/pci/neo.c neo
# ESS Allegro-1 / Maestro3
device esa: audio, auconv, mulaw, ac97
device esa: audiobus, auconv, mulaw, ac97
attach esa at pci
file dev/pci/esa.c esa
# ESS Solo-1 PCI AudioDrive
device eso { }: audio, auconv, mulaw, midibus
device eso { }: audiobus, auconv, mulaw, midibus
attach eso at pci
file dev/pci/eso.c eso
@ -316,12 +316,12 @@ attach mpu at eso with mpu_eso
file dev/pci/mpu_eso.c mpu_eso
# ESS Maestro-1/2/2e PCI AC97 Audio Accelerator
device esm: audio, auconv, mulaw, ac97
device esm: audiobus, auconv, mulaw, ac97
attach esm at pci
file dev/pci/esm.c esm
# S3 SonicVibes (S3 617)
device sv { }: audio, auconv, mulaw, midibus
device sv { }: audiobus, auconv, mulaw, midibus
attach sv at pci
file dev/pci/sv.c sv
@ -329,7 +329,7 @@ attach opl at sv with opl_sv
file dev/pci/opl_sv.c opl_sv
# C-Media CMI8x38 Audio Chip
device cmpci { }: audio, auconv, mulaw
device cmpci { }: audiobus, auconv, mulaw
attach cmpci at pci
file dev/pci/cmpci.c cmpci
@ -340,7 +340,7 @@ attach mpu at cmpci with mpu_cmpci
file dev/pci/mpu_cmpci.c mpu_cmpci
# Yamaha YMF724/740/744/754 PCI audio controller
device yds { }: audio, auconv, mulaw, ac97
device yds { }: audiobus, auconv, mulaw, ac97
attach yds at pci
file dev/pci/yds.c yds
@ -351,12 +351,12 @@ attach mpu at yds with mpu_yds
file dev/pci/mpu_yds.c mpu_yds
# Creative Labs EMU10k1 (SBLive! series and PCI512)
device emuxki: audio, auconv, mulaw, ac97
device emuxki: audiobus, auconv, mulaw, ac97
attach emuxki at pci
file dev/pci/emuxki.c emuxki
# Trident 4DWAVE AC'97 audio (including SiS 7018,ALi M5451)
device autri: audio, auconv, mulaw, ac97, midibus
device autri: audiobus, auconv, mulaw, ac97, midibus
attach autri at pci
file dev/pci/autri.c autri

4
sys/dev/pcmcia/files.pcmcia
View File

@ -1,4 +1,4 @@
# $NetBSD: files.pcmcia,v 1.43 2001/11/28 10:21:24 lukem Exp $
# $NetBSD: files.pcmcia,v 1.44 2002/04/22 09:41:22 augustss Exp $
#
# Config.new file and device description for machine-independent PCMCIA code.
# Included by ports that need it.
@ -124,7 +124,7 @@ file dev/pcmcia/isic_pcmcia_sbspeedstar2.c isic_pcmcia
# Audio devices
# Eiger Labs with ESS 1688
device esl { }: audio, midibus, auconv, mulaw
device esl { }: audiobus, midibus, auconv, mulaw
attach esl at pcmcia with esl_pcmcia
file dev/pcmcia/esl_pcmcia.c esl_pcmcia
file dev/pcmcia/esl.c esl

4
sys/dev/tc/files.tc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.tc,v 1.26 2001/11/28 10:21:24 lukem Exp $
# $NetBSD: files.tc,v 1.27 2002/04/22 09:41:23 augustss Exp $
#
# Config file and device description for machine-independent
# TURBOchannel code. Included by ports that need it.
@ -25,7 +25,7 @@ attach le at tc with le_tc: le24, le_dec_subr
file dev/tc/if_le_tc.c le_tc
# baseboard audio
device bba: audio,am7930
device bba: audiobus,am7930
attach bba at ioasic
file dev/tc/bba.c bba

4
sys/dev/usb/files.usb
View File

@ -1,4 +1,4 @@
# $NetBSD: files.usb,v 1.43 2002/03/28 21:09:10 ichiro Exp $
# $NetBSD: files.usb,v 1.44 2002/04/22 09:41:23 augustss Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@ -31,7 +31,7 @@ define ezload
file dev/usb/ezload.c ezload
# Audio devices
device uaudio: audio, auconv, mulaw, aurateconv
device uaudio: audiobus, auconv, mulaw, aurateconv
attach uaudio at uhub
file dev/usb/uaudio.c uaudio