Module Name: src Committed By: isaki Date: Sun May 5 02:31:42 UTC 2019
Modified Files: src/sys/arch/amiga/conf [isaki-audio2]: files.amiga src/sys/arch/amigappc/conf [isaki-audio2]: files.amigappc src/sys/arch/arm/broadcom [isaki-audio2]: files.bcm2835 src/sys/arch/arm/iomd [isaki-audio2]: files.iomd src/sys/arch/arm/sunxi [isaki-audio2]: files.sunxi src/sys/arch/arm/xscale [isaki-audio2]: files.pxa2x0 src/sys/arch/dreamcast/conf [isaki-audio2]: files.dreamcast src/sys/arch/evbarm/conf [isaki-audio2]: files.mini2440 src/sys/arch/hppa/conf [isaki-audio2]: files.hppa src/sys/arch/ibmnws/conf [isaki-audio2]: files.ibmnws src/sys/arch/macppc/conf [isaki-audio2]: files.macppc src/sys/arch/mips/conf [isaki-audio2]: files.alchemy src/sys/arch/prep/conf [isaki-audio2]: files.prep src/sys/arch/sgimips/hpc [isaki-audio2]: files.hpc src/sys/arch/sgimips/mace [isaki-audio2]: files.mace src/sys/arch/usermode/conf [isaki-audio2]: files.usermode src/sys/arch/x68k/conf [isaki-audio2]: files.x68k src/sys/arch/zaurus/conf [isaki-audio2]: files.zaurus src/sys/dev [isaki-audio2]: DEVNAMES src/sys/dev/bluetooth [isaki-audio2]: files.bluetooth src/sys/dev/hdaudio [isaki-audio2]: files.hdaudio src/sys/dev/isa [isaki-audio2]: files.isa src/sys/dev/pad [isaki-audio2]: files.pad src/sys/dev/pci [isaki-audio2]: files.pci src/sys/dev/pci/igma [isaki-audio2]: files.igma src/sys/dev/pci/voyager [isaki-audio2]: files.voyager src/sys/dev/sbus [isaki-audio2]: files.sbus src/sys/dev/tc [isaki-audio2]: files.tc src/sys/dev/usb [isaki-audio2]: files.usb Log Message: Remove obsoleted au{,rate,vol}conv and mulaw attributes. audio provides the equivalent of them inseparably. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.181.2.1 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/arch/amigappc/conf/files.amigappc cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/arch/arm/broadcom/files.bcm2835 cvs rdiff -u -r1.19 -r1.19.94.1 src/sys/arch/arm/iomd/files.iomd cvs rdiff -u -r1.61 -r1.61.2.1 src/sys/arch/arm/sunxi/files.sunxi cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/arm/xscale/files.pxa2x0 cvs rdiff -u -r1.31 -r1.31.18.1 src/sys/arch/dreamcast/conf/files.dreamcast cvs rdiff -u -r1.1 -r1.1.54.1 src/sys/arch/evbarm/conf/files.mini2440 cvs rdiff -u -r1.20 -r1.20.2.1 src/sys/arch/hppa/conf/files.hppa cvs rdiff -u -r1.13 -r1.13.56.1 src/sys/arch/ibmnws/conf/files.ibmnws cvs rdiff -u -r1.110 -r1.110.4.1 src/sys/arch/macppc/conf/files.macppc cvs rdiff -u -r1.13 -r1.13.146.1 src/sys/arch/mips/conf/files.alchemy cvs rdiff -u -r1.62 -r1.62.40.1 src/sys/arch/prep/conf/files.prep cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/arch/sgimips/hpc/files.hpc cvs rdiff -u -r1.10 -r1.10.110.1 src/sys/arch/sgimips/mace/files.mace cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/arch/usermode/conf/files.usermode cvs rdiff -u -r1.82 -r1.82.2.1 src/sys/arch/x68k/conf/files.x68k cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/arch/zaurus/conf/files.zaurus cvs rdiff -u -r1.320 -r1.320.2.1 src/sys/dev/DEVNAMES cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/dev/bluetooth/files.bluetooth cvs rdiff -u -r1.3 -r1.3.24.1 src/sys/dev/hdaudio/files.hdaudio cvs rdiff -u -r1.172 -r1.172.2.1 src/sys/dev/isa/files.isa cvs rdiff -u -r1.5 -r1.5.24.1 src/sys/dev/pad/files.pad cvs rdiff -u -r1.412 -r1.412.2.1 src/sys/dev/pci/files.pci cvs rdiff -u -r1.1 -r1.1.40.1 src/sys/dev/pci/igma/files.igma cvs rdiff -u -r1.6 -r1.6.42.1 src/sys/dev/pci/voyager/files.voyager cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/sys/dev/sbus/files.sbus cvs rdiff -u -r1.34 -r1.34.20.1 src/sys/dev/tc/files.tc cvs rdiff -u -r1.154 -r1.154.2.1 src/sys/dev/usb/files.usb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amiga/conf/files.amiga diff -u src/sys/arch/amiga/conf/files.amiga:1.181 src/sys/arch/amiga/conf/files.amiga:1.181.2.1 --- src/sys/arch/amiga/conf/files.amiga:1.181 Wed Dec 19 13:57:45 2018 +++ src/sys/arch/amiga/conf/files.amiga Sun May 5 02:31:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.amiga,v 1.181 2018/12/19 13:57:45 maxv Exp $ +# $NetBSD: files.amiga,v 1.181.2.1 2019/05/05 02:31:39 isaki Exp $ # maxpartitions must be first item in files.${ARCH}.newconf maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL! @@ -118,11 +118,11 @@ device melody: audiobus, tms320av110 attach melody at zbus file arch/amiga/dev/melody.c melody -device repulse: audiobus, ac97, mulaw +device repulse: audiobus, ac97 attach repulse at zbus file arch/amiga/dev/repulse.c repulse -device toccata: audiobus, ad1848, auconv +device toccata: audiobus, ad1848 attach toccata at zbus file arch/amiga/dev/toccata.c toccata Index: src/sys/arch/amigappc/conf/files.amigappc diff -u src/sys/arch/amigappc/conf/files.amigappc:1.30 src/sys/arch/amigappc/conf/files.amigappc:1.30.2.1 --- src/sys/arch/amigappc/conf/files.amigappc:1.30 Sat Sep 22 16:22:23 2018 +++ src/sys/arch/amigappc/conf/files.amigappc Sun May 5 02:31:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.amigappc,v 1.30 2018/09/22 16:22:23 maxv Exp $ +# $NetBSD: files.amigappc,v 1.30.2.1 2019/05/05 02:31:39 isaki Exp $ # maxpartitions must be first item in files.${ARCH}.newconf maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL! @@ -117,11 +117,11 @@ device melody: audiobus, tms320av110 attach melody at zbus file arch/amiga/dev/melody.c melody -device repulse: audiobus, ac97, mulaw +device repulse: audiobus, ac97 attach repulse at zbus file arch/amiga/dev/repulse.c repulse -device toccata: audiobus, ad1848, auconv +device toccata: audiobus, ad1848 attach toccata at zbus file arch/amiga/dev/toccata.c toccata Index: src/sys/arch/arm/broadcom/files.bcm2835 diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.32 src/sys/arch/arm/broadcom/files.bcm2835:1.32.2.1 --- src/sys/arch/arm/broadcom/files.bcm2835:1.32 Thu Oct 18 09:01:52 2018 +++ src/sys/arch/arm/broadcom/files.bcm2835 Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.bcm2835,v 1.32 2018/10/18 09:01:52 skrll Exp $ +# $NetBSD: files.bcm2835,v 1.32.2.1 2019/05/05 02:31:40 isaki Exp $ # # Configuration info for Broadcom BCM2835 ARM Peripherals # @@ -79,7 +79,7 @@ file arch/arm/broadcom/bcm2835_genfb.c b include "external/bsd/vchiq/conf/files.vchiq" # VC audio -device vcaudio: audiobus, auconv, mulaw, aurateconv, auvolconv +device vcaudio: audiobus attach vcaudio at vchiqbus file arch/arm/broadcom/bcm2835_vcaudio.c vcaudio Index: src/sys/arch/arm/iomd/files.iomd diff -u src/sys/arch/arm/iomd/files.iomd:1.19 src/sys/arch/arm/iomd/files.iomd:1.19.94.1 --- src/sys/arch/arm/iomd/files.iomd:1.19 Fri Feb 29 00:37:26 2008 +++ src/sys/arch/arm/iomd/files.iomd Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.iomd,v 1.19 2008/02/29 00:37:26 chris Exp $ +# $NetBSD: files.iomd,v 1.19.94.1 2019/05/05 02:31:40 isaki Exp $ # # IOMD-specific configuration data # @@ -52,6 +52,6 @@ file arch/arm/iomd/vidc20config.c vidcv file arch/arm/iomd/vidcvideo.c vidcvideo needs-flag # Audio device -device vidcaudio: audiobus, auconv, mulaw, aurateconv, audiobell +device vidcaudio: audiobus, audiobell attach vidcaudio at vidc file arch/arm/iomd/vidcaudio.c vidcaudio Index: src/sys/arch/arm/sunxi/files.sunxi diff -u src/sys/arch/arm/sunxi/files.sunxi:1.61 src/sys/arch/arm/sunxi/files.sunxi:1.61.2.1 --- src/sys/arch/arm/sunxi/files.sunxi:1.61 Wed Jan 30 01:24:00 2019 +++ src/sys/arch/arm/sunxi/files.sunxi Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.sunxi,v 1.61 2019/01/30 01:24:00 jmcneill Exp $ +# $NetBSD: files.sunxi,v 1.61.2.1 2019/05/05 02:31:40 isaki Exp $ # # Configuration info for Allwinner sunxi family SoCs # @@ -201,7 +201,7 @@ attach sun6idma at fdt with sun6i_dma file arch/arm/sunxi/sun6i_dma.c sun6i_dma # Audio codec -device sunxicodec: audiobus, auconv, mulaw, aurateconv +device sunxicodec: audiobus attach sunxicodec at fdt with sunxi_codec file arch/arm/sunxi/sunxi_codec.c sunxi_codec file arch/arm/sunxi/sun4i_a10_codec.c sunxi_codec @@ -223,7 +223,7 @@ attach a64acodec at fdt with a64_acodec file arch/arm/sunxi/sun50i_a64_acodec.c a64_acodec # I2S/PCM controller -device sunxii2s: auconv, mulaw, aurateconv +device sunxii2s attach sunxii2s at fdt with sunxi_i2s file arch/arm/sunxi/sunxi_i2s.c sunxi_i2s Index: src/sys/arch/arm/xscale/files.pxa2x0 diff -u src/sys/arch/arm/xscale/files.pxa2x0:1.20 src/sys/arch/arm/xscale/files.pxa2x0:1.20.4.1 --- src/sys/arch/arm/xscale/files.pxa2x0:1.20 Fri Mar 9 17:14:57 2018 +++ src/sys/arch/arm/xscale/files.pxa2x0 Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.pxa2x0,v 1.20 2018/03/09 17:14:57 christos Exp $ +# $NetBSD: files.pxa2x0,v 1.20.4.1 2019/05/05 02:31:40 isaki Exp $ # # Configuration info for Intel PXA2[751]0 CPU support # @@ -55,7 +55,7 @@ defparam opt_pxa2x0_dmac.h PXA2X0_DMAC_F defparam opt_pxa2x0_dmac.h PXA2X0_DMAC_DMOVER_CONCURRENCY # AC97 Controller -device pxaacu: audiobus, auconv, mulaw, ac97, aurateconv +device pxaacu: audiobus, ac97 attach pxaacu at pxaip file arch/arm/xscale/pxa2x0_ac97.c pxaacu Index: src/sys/arch/dreamcast/conf/files.dreamcast diff -u src/sys/arch/dreamcast/conf/files.dreamcast:1.31 src/sys/arch/dreamcast/conf/files.dreamcast:1.31.18.1 --- src/sys/arch/dreamcast/conf/files.dreamcast:1.31 Thu Dec 29 11:49:05 2016 +++ src/sys/arch/dreamcast/conf/files.dreamcast Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.dreamcast,v 1.31 2016/12/29 11:49:05 tsutsui Exp $ +# $NetBSD: files.dreamcast,v 1.31.18.1 2019/05/05 02:31:40 isaki Exp $ # maxpartitions must be first item in files.${MACHINE} maxpartitions 16 @@ -110,7 +110,7 @@ file arch/dreamcast/dev/g2/gapspci_pci.c attach mbe at g2bus with mbe_g2bus file arch/dreamcast/dev/g2/if_mbe_g2.c mbe_g2bus -device aica: audiobus, auconv, mulaw +device aica: audiobus attach aica at g2bus file arch/dreamcast/dev/g2/aica.c aica needs-flag Index: src/sys/arch/evbarm/conf/files.mini2440 diff -u src/sys/arch/evbarm/conf/files.mini2440:1.1 src/sys/arch/evbarm/conf/files.mini2440:1.1.54.1 --- src/sys/arch/evbarm/conf/files.mini2440:1.1 Mon Jan 30 03:28:33 2012 +++ src/sys/arch/evbarm/conf/files.mini2440 Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.mini2440,v 1.1 2012/01/30 03:28:33 nisimura Exp $ +# $NetBSD: files.mini2440,v 1.1.54.1 2019/05/05 02:31:40 isaki Exp $ # # FriendlyARM MINI2440 board configuration info # @@ -22,7 +22,7 @@ defparam opt_mini2440.h MINI2440_ETHER_A attach lcd at ssio with lcd_ssio file arch/evbarm/mini2440/mini2440_lcd.c lcd_ssio -device udassio: uda1341, audiobus, auconv, mulaw, aurateconv +device udassio: uda1341, audiobus attach udassio at ssiis file arch/evbarm/mini2440/audio_mini2440.c udassio Index: src/sys/arch/hppa/conf/files.hppa diff -u src/sys/arch/hppa/conf/files.hppa:1.20 src/sys/arch/hppa/conf/files.hppa:1.20.2.1 --- src/sys/arch/hppa/conf/files.hppa:1.20 Tue Apr 16 06:44:17 2019 +++ src/sys/arch/hppa/conf/files.hppa Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.hppa,v 1.20 2019/04/16 06:44:17 skrll Exp $ +# $NetBSD: files.hppa,v 1.20.2.1 2019/05/05 02:31:40 isaki Exp $ # # $OpenBSD: files.hppa,v 1.31 2001/06/26 02:41:25 mickey Exp $ # @@ -240,13 +240,13 @@ attach gsckbc at gsc file arch/hppa/gsc/gsckbc.c gsckbc # PSB 2160-N based 8bit mono audio (705, 710, 745i/*, 747i/*) -device aone: audiobus, mulaw, auconv +device aone: audiobus attach aone at gsc file arch/hppa/gsc/aone.c aone # CS4215/AD1849 based 16bit mono/stereo audio iface (most of others not w/ aone) # a.k.a. Audio Type 2 (optional beeper) -device harmony {} : audiobus, mulaw, auconv +device harmony {} : audiobus attach harmony at gsc file arch/hppa/gsc/harmony.c harmony Index: src/sys/arch/ibmnws/conf/files.ibmnws diff -u src/sys/arch/ibmnws/conf/files.ibmnws:1.13 src/sys/arch/ibmnws/conf/files.ibmnws:1.13.56.1 --- src/sys/arch/ibmnws/conf/files.ibmnws:1.13 Wed Jun 22 18:06:33 2011 +++ src/sys/arch/ibmnws/conf/files.ibmnws Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.ibmnws,v 1.13 2011/06/22 18:06:33 matt Exp $ +# $NetBSD: files.ibmnws,v 1.13.56.1 2019/05/05 02:31:40 isaki Exp $ # # ibmnws-specific configuration info # @@ -91,7 +91,7 @@ file arch/powerpc/isa/isadma_machdep.c i file arch/powerpc/isa/isapnp_machdep.c isapnp # Audio controller -device paud { }: audiobus, isadma, ad1848, auconv +device paud { }: audiobus, isadma, ad1848 attach paud at isa with paud_isa file arch/prep/isa/paud_isa.c paud_isa Index: src/sys/arch/macppc/conf/files.macppc diff -u src/sys/arch/macppc/conf/files.macppc:1.110 src/sys/arch/macppc/conf/files.macppc:1.110.4.1 --- src/sys/arch/macppc/conf/files.macppc:1.110 Wed May 2 22:07:37 2018 +++ src/sys/arch/macppc/conf/files.macppc Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.macppc,v 1.110 2018/05/02 22:07:37 macallan Exp $ +# $NetBSD: files.macppc,v 1.110.4.1 2019/05/05 02:31:40 isaki Exp $ # # macppc-specific configuration info @@ -254,7 +254,7 @@ file arch/macppc/dev/wdc_obio.c wdc_ob attach wi at obio with wi_obio file arch/macppc/dev/if_wi_obio.c wi_obio -device awacs: audiobus, auconv, mulaw, aurateconv +device awacs: audiobus attach awacs at obio file arch/macppc/dev/awacs.c awacs needs-flag defflag opt_awacs.h AWACS_DEBUG @@ -289,7 +289,7 @@ attach ki2c at obio, uni_n file arch/macppc/dev/ki2c.c ki2c # snapper audio -device snapper: audiobus, auconv, mulaw, aurateconv +device snapper: audiobus attach snapper at obio file arch/macppc/dev/snapper.c snapper Index: src/sys/arch/mips/conf/files.alchemy diff -u src/sys/arch/mips/conf/files.alchemy:1.13 src/sys/arch/mips/conf/files.alchemy:1.13.146.1 --- src/sys/arch/mips/conf/files.alchemy:1.13 Mon Oct 2 08:00:07 2006 +++ src/sys/arch/mips/conf/files.alchemy Sun May 5 02:31:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.alchemy,v 1.13 2006/10/02 08:00:07 gdamore Exp $ +# $NetBSD: files.alchemy,v 1.13.146.1 2019/05/05 02:31:40 isaki Exp $ defflag opt_alchemy.h ALCHEMY_AU1000 ALCHEMY_AU1100 @@ -42,7 +42,7 @@ attach ohci at aubus with ohci_aubus file arch/mips/alchemy/dev/ohci_aubus.c ohci # On-chip AC'97 audio controller -device auaudio: audiobus, auconv, mulaw, ac97, aurateconv +device auaudio: audiobus, ac97 attach auaudio at aubus file arch/mips/alchemy/dev/auaudio.c auaudio Index: src/sys/arch/prep/conf/files.prep diff -u src/sys/arch/prep/conf/files.prep:1.62 src/sys/arch/prep/conf/files.prep:1.62.40.1 --- src/sys/arch/prep/conf/files.prep:1.62 Sat Dec 8 11:03:36 2012 +++ src/sys/arch/prep/conf/files.prep Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.prep,v 1.62 2012/12/08 11:03:36 kiyohara Exp $ +# $NetBSD: files.prep,v 1.62.40.1 2019/05/05 02:31:41 isaki Exp $ # # prep-specific configuration info # @@ -126,7 +126,7 @@ file dev/isa/fdc_isa.c fdc_isa device fd: disk attach fd at fdc -device paud { }: audiobus, isadma, ad1848, auconv +device paud { }: audiobus, isadma, ad1848 attach paud at isa with paud_isa file arch/prep/isa/paud_isa.c paud_isa Index: src/sys/arch/sgimips/hpc/files.hpc diff -u src/sys/arch/sgimips/hpc/files.hpc:1.16 src/sys/arch/sgimips/hpc/files.hpc:1.16.4.1 --- src/sys/arch/sgimips/hpc/files.hpc:1.16 Mon Apr 9 20:07:22 2018 +++ src/sys/arch/sgimips/hpc/files.hpc Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.hpc,v 1.16 2018/04/09 20:07:22 christos Exp $ +# $NetBSD: files.hpc,v 1.16.4.1 2019/05/05 02:31:41 isaki Exp $ device sq: arp, ether, ifnet attach sq at hpc @@ -11,7 +11,7 @@ device wdsc: wd33c93, scsi, hpcdma attach wdsc at hpc file arch/sgimips/hpc/wdsc.c wdsc -device haltwo: audiobus, auconv, mulaw +device haltwo: audiobus attach haltwo at hpc file arch/sgimips/hpc/haltwo.c haltwo Index: src/sys/arch/sgimips/mace/files.mace diff -u src/sys/arch/sgimips/mace/files.mace:1.10 src/sys/arch/sgimips/mace/files.mace:1.10.110.1 --- src/sys/arch/sgimips/mace/files.mace:1.10 Wed Oct 17 19:57:05 2007 +++ src/sys/arch/sgimips/mace/files.mace Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.mace,v 1.10 2007/10/17 19:57:05 garbled Exp $ +# $NetBSD: files.mace,v 1.10.110.1 2019/05/05 02:31:41 isaki Exp $ device mace {[offset = -1], [intr = -1], [intrmask = 0] } attach mace at mainbus @@ -22,7 +22,7 @@ device mec: arp, ether, ifnet, mii attach mec at mace file arch/sgimips/mace/if_mec.c mec -device mavb: audiobus, auconv, mulaw, aurateconv +device mavb: audiobus attach mavb at mace file arch/sgimips/mace/mavb.c mavb Index: src/sys/arch/usermode/conf/files.usermode diff -u src/sys/arch/usermode/conf/files.usermode:1.18 src/sys/arch/usermode/conf/files.usermode:1.18.2.1 --- src/sys/arch/usermode/conf/files.usermode:1.18 Wed Aug 1 09:50:57 2018 +++ src/sys/arch/usermode/conf/files.usermode Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.usermode,v 1.18 2018/08/01 09:50:57 reinoud Exp $ +# $NetBSD: files.usermode,v 1.18.2.1 2019/05/05 02:31:41 isaki Exp $ maxpartitions 8 maxusers 8 16 64 @@ -30,7 +30,7 @@ device veth { } : arp, ether, ifnet attach veth at thunkbus file arch/usermode/dev/if_veth.c veth -device vaudio { } : audiobus, auconv, aurateconv, mulaw +device vaudio { } : audiobus attach vaudio at thunkbus file arch/usermode/dev/vaudio.c vaudio Index: src/sys/arch/x68k/conf/files.x68k diff -u src/sys/arch/x68k/conf/files.x68k:1.82 src/sys/arch/x68k/conf/files.x68k:1.82.2.1 --- src/sys/arch/x68k/conf/files.x68k:1.82 Mon Feb 18 01:12:24 2019 +++ src/sys/arch/x68k/conf/files.x68k Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.x68k,v 1.82 2019/02/18 01:12:24 thorpej Exp $ +# $NetBSD: files.x68k,v 1.82.2.1 2019/05/05 02:31:41 isaki Exp $ # # new style config file for x68k architecture # @@ -131,7 +131,7 @@ device opm attach opm at intio file arch/x68k/dev/opm.c opm -device vs: audiobus, auconv, mulaw, msm6258 +device vs: audiobus, msm6258 attach vs at intio file arch/x68k/dev/vs.c vs needs-flag Index: src/sys/arch/zaurus/conf/files.zaurus diff -u src/sys/arch/zaurus/conf/files.zaurus:1.15 src/sys/arch/zaurus/conf/files.zaurus:1.15.4.1 --- src/sys/arch/zaurus/conf/files.zaurus:1.15 Fri Mar 9 17:15:14 2018 +++ src/sys/arch/zaurus/conf/files.zaurus Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.zaurus,v 1.15 2018/03/09 17:15:14 christos Exp $ +# $NetBSD: files.zaurus,v 1.15.4.1 2019/05/05 02:31:41 isaki Exp $ # # Sharp Zaurus specific configuration info # @@ -92,7 +92,7 @@ attach ztp at zssp file arch/zaurus/dev/ztp.c ztp # WM8750 audio -device zaudio: audiobus, auconv, mulaw, aurateconv, pxaiis +device zaudio: audiobus, pxaiis attach zaudio at iic file arch/zaurus/dev/zaudio.c zaudio file arch/zaurus/dev/wm8731_zaudio.c zaudio & cpu_xscale_pxa250 Index: src/sys/dev/DEVNAMES diff -u src/sys/dev/DEVNAMES:1.320 src/sys/dev/DEVNAMES:1.320.2.1 --- src/sys/dev/DEVNAMES:1.320 Sun Jan 27 08:53:30 2019 +++ src/sys/dev/DEVNAMES Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: DEVNAMES,v 1.320 2019/01/27 08:53:30 maxv Exp $ +# $NetBSD: DEVNAMES,v 1.320.2.1 2019/05/05 02:31:41 isaki Exp $ # # This file contains all used device names and defined attributes in # alphabetical order. New devices added to the system somewhere should first @@ -127,7 +127,6 @@ auacer MI aubus evbmips aucc amiga aucc amigappc -auconv MI Attribute audio MI audio MI Attribute audioamd MI @@ -140,7 +139,6 @@ auixp MI aumac evbmips aupci evbmips aupcmcia evbmips -aurateconv MI Attribute aurtc evbmips auspi evbmips autri MI @@ -916,7 +914,6 @@ mtc MI mtd MI mtty MI mu vax -mulaw MI Attribute mvgbe MI mvpex MI mvsata MI Index: src/sys/dev/bluetooth/files.bluetooth diff -u src/sys/dev/bluetooth/files.bluetooth:1.15 src/sys/dev/bluetooth/files.bluetooth:1.15.8.1 --- src/sys/dev/bluetooth/files.bluetooth:1.15 Thu Aug 10 13:22:19 2017 +++ src/sys/dev/bluetooth/files.bluetooth Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.bluetooth,v 1.15 2017/08/10 13:22:19 nat Exp $ +# $NetBSD: files.bluetooth,v 1.15.8.1 2019/05/05 02:31:41 isaki Exp $ # # Config file for machine independent Bluetooth devices @@ -33,7 +33,7 @@ attach btmagic at bthub file dev/bluetooth/btmagic.c btmagic # SCO Audio -device btsco: bluetooth, audiobus, auconv, mulaw, aurateconv +device btsco: bluetooth, audiobus attach btsco at bthub file dev/bluetooth/btsco.c btsco Index: src/sys/dev/hdaudio/files.hdaudio diff -u src/sys/dev/hdaudio/files.hdaudio:1.3 src/sys/dev/hdaudio/files.hdaudio:1.3.24.1 --- src/sys/dev/hdaudio/files.hdaudio:1.3 Sat May 30 13:47:03 2015 +++ src/sys/dev/hdaudio/files.hdaudio Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.hdaudio,v 1.3 2015/05/30 13:47:03 jmcneill Exp $ +# $NetBSD: files.hdaudio,v 1.3.24.1 2019/05/05 02:31:41 isaki Exp $ # # Intel High Definition Audio (Revision 1.0) @@ -16,7 +16,7 @@ device hdaudio: hdaudiobus file dev/hdaudio/hdaudio.c hdaudio file dev/hdaudio/hdaudio_verbose.c hdaudio & hdaudioverbose -device hdafg: audiobus, auconv, aurateconv, mulaw +device hdafg: audiobus attach hdafg at hdaudiobus file dev/hdaudio/hdafg.c hdafg file dev/hdaudio/hdafg_dd.c hdafg Index: src/sys/dev/isa/files.isa diff -u src/sys/dev/isa/files.isa:1.172 src/sys/dev/isa/files.isa:1.172.2.1 --- src/sys/dev/isa/files.isa:1.172 Sun Jan 27 08:53:30 2019 +++ src/sys/dev/isa/files.isa Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.isa,v 1.172 2019/01/27 08:53:30 maxv Exp $ +# $NetBSD: files.isa,v 1.172.2.1 2019/05/05 02:31:41 isaki Exp $ # # Config file and device description for machine-independent ISA code. # Included by ports that need it. Requires that the SCSI files be @@ -290,7 +290,7 @@ define sbdsp { } file dev/isa/sbdsp.c sbdsp # SoundBlaster family -device sb: audiobus, isadma, sbdsp, mulaw, auconv, midibus +device sb: audiobus, isadma, sbdsp, midibus file dev/isa/sb.c sb needs-flag attach sb at isa with sb_isa @@ -303,7 +303,7 @@ attach mpu at sbdsp with mpu_sb file dev/isa/mpu_sb.c mpu_sb # ProAudio Spectrum -device pas: audiobus, isadma, sbdsp, mulaw, auconv +device pas: audiobus, isadma, sbdsp attach pas at isa file dev/isa/pas.c pas needs-flag @@ -315,7 +315,7 @@ define ics2101 file dev/isa/ics2101.c ics2101 # Microsoft Windows Sound System -device wss { } : audiobus, isadma, ad1848, auconv +device wss { } : audiobus, isadma, ad1848 file dev/isa/wss.c wss needs-flag attach wss at isa with wss_isa @@ -325,7 +325,7 @@ attach opl at wss with opl_wss file dev/isa/opl_wss.c opl_wss # ESS Technology ES1887/ES888/ES1888 -device ess { } : audiobus, isadma, mulaw, auconv, midibus +device ess { } : audiobus, isadma, midibus file dev/isa/ess.c ess needs-flag attach ess at isa with ess_isa @@ -342,7 +342,7 @@ attach opl at isa with opl_isa file dev/isa/opl_isa.c opl_isa # Yamaha OPL3-SA3 -device ym { }: audiobus, isadma, ad1848, auconv +device ym { }: audiobus, isadma, ad1848 file dev/isa/ym.c ym defparam opt_ym.h YM_POWER_MODE YM_POWER_OFF_SEC @@ -355,13 +355,13 @@ file dev/isa/mpu_ym.c mpu_ym needs-fl # Gravis UltraSound & UltraSound MAX. # Use the "drq2" keyword in a config file to specify an extra DMA # channel for full-duplex operation. -device gus: audiobus, isadma, ics2101, ad1848, mulaw, auconv +device gus: audiobus, isadma, ics2101, ad1848 attach gus at isa file dev/isa/gus.c gus needs-flag # Sierra's Aria chipset. # (e.g. Prometheus Aria 16) -device aria: audiobus, mulaw, auconv +device aria: audiobus attach aria at isa file dev/isa/aria.c aria Index: src/sys/dev/pad/files.pad diff -u src/sys/dev/pad/files.pad:1.5 src/sys/dev/pad/files.pad:1.5.24.1 --- src/sys/dev/pad/files.pad:1.5 Tue Nov 18 01:53:17 2014 +++ src/sys/dev/pad/files.pad Sun May 5 02:31:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.pad,v 1.5 2014/11/18 01:53:17 jmcneill Exp $ +# $NetBSD: files.pad,v 1.5.24.1 2019/05/05 02:31:41 isaki Exp $ -defpseudodev pad: audiobus, auconv, aurateconv, auvolconv, mulaw +defpseudodev pad: audiobus file dev/pad/pad.c pad Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.412 src/sys/dev/pci/files.pci:1.412.2.1 --- src/sys/dev/pci/files.pci:1.412 Wed Dec 12 07:04:05 2018 +++ src/sys/dev/pci/files.pci Sun May 5 02:31:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.412 2018/12/12 07:04:05 maxv Exp $ +# $NetBSD: files.pci,v 1.412.2.1 2019/05/05 02:31:42 isaki Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -464,12 +464,12 @@ file dev/pci/bktr/bktr_os.c bktr need file dev/pci/bktr/bktr_tuner.c bktr # Cirrus Logic CrystalClear PCI Audio CS4280 -device clcs: audiobus, auconv, mulaw, ac97, midibus +device clcs: audiobus, ac97, midibus attach clcs at pci file dev/pci/cs4280.c clcs # Cirrus Logic CrystalClear PCI Audio CS4281 -device clct: audiobus, auconv, mulaw, ac97 +device clct: audiobus, ac97 attach clct at pci file dev/pci/cs4281.c clct @@ -477,7 +477,7 @@ file dev/pci/cs4281.c clct file dev/pci/cs428x.c clcs | clct # Forte Media FM801 -device fms { }: audiobus, auconv, mulaw, ac97, midibus +device fms { }: audiobus, ac97, midibus attach fms at pci file dev/pci/fms.c fms @@ -488,7 +488,7 @@ attach mpu at fms with mpu_fms file dev/pci/mpu_fms.c mpu_fms # Ensoniq AudioPCI S5016 -device eap { }: audiobus, auconv, mulaw, ac97, midibus +device eap { }: audiobus, ac97, midibus attach eap at pci file dev/pci/eap.c eap @@ -496,48 +496,48 @@ attach joy at eap with joy_eap file dev/pci/joy_eap.c joy_eap needs-flag # Acer Labs M5455 -device auacer: audiobus, auconv, mulaw, ac97, aurateconv +device auacer: audiobus, ac97, aurateconv attach auacer at pci file dev/pci/auacer.c auacer # Intel ICH AC'97 audio -device auich: audiobus, auconv, mulaw, ac97, aurateconv +device auich: audiobus, ac97, aurateconv attach auich at pci file dev/pci/auich.c auich # VIA VT82C686A/VT8233/VT8235 AC'97 Audio -device auvia: audiobus, auconv, mulaw, ac97, aurateconv +device auvia: audiobus, ac97, aurateconv attach auvia at pci file dev/pci/auvia.c auvia # ATI IXP 200/300/400 series AC'97 Audio -device auixp: audiobus, auconv, mulaw, ac97, aurateconv +device auixp: audiobus, ac97, aurateconv attach auixp at pci file dev/pci/auixp.c auixp # High Definition Audio -device azalia: audiobus, auconv, mulaw, ac97, aurateconv +device azalia: audiobus, ac97, aurateconv attach azalia at pci file dev/pci/azalia.c azalia file dev/pci/azalia_codec.c azalia # AMD Geode CS5536 Companion Audio -device gcscaudio: audiobus, auconv, mulaw, ac97, aurateconv +device gcscaudio: audiobus, ac97, aurateconv attach gcscaudio at pci file dev/pci/gcscaudio.c gcscaudio # NeoMagic 256 AC'97 Audio -device neo: audiobus, auconv, mulaw, ac97 +device neo: audiobus, ac97 attach neo at pci file dev/pci/neo.c neo # ESS Allegro-1 / Maestro3 -device esa: audiobus, auconv, mulaw, ac97 +device esa: audiobus, ac97 attach esa at pci file dev/pci/esa.c esa # ESS Solo-1 PCI AudioDrive -device eso { }: audiobus, auconv, mulaw, midibus +device eso { }: audiobus, midibus attach eso at pci file dev/pci/eso.c eso @@ -551,12 +551,12 @@ attach joy at eso with joy_eso file dev/pci/joy_eso.c joy_eso # ESS Maestro-1/2/2e PCI AC97 Audio Accelerator -device esm: audiobus, auconv, mulaw, ac97 +device esm: audiobus, ac97 attach esm at pci file dev/pci/esm.c esm # S3 SonicVibes (S3 617) -device sv { }: audiobus, auconv, mulaw, midibus +device sv { }: audiobus, midibus attach sv at pci file dev/pci/sv.c sv @@ -564,7 +564,7 @@ attach opl at sv with opl_sv file dev/pci/opl_sv.c opl_sv # C-Media CMI8x38 Audio Chip -device cmpci { }: audiobus, auconv, mulaw +device cmpci { }: audiobus attach cmpci at pci file dev/pci/cmpci.c cmpci @@ -575,7 +575,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 { }: audiobus, auconv, mulaw, ac97 +device yds { }: audiobus, ac97 attach yds at pci file dev/pci/yds.c yds @@ -586,12 +586,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: audiobus, auconv, mulaw, ac97 +device emuxki: audiobus, ac97 attach emuxki at pci file dev/pci/emuxki.c emuxki # Trident 4DWAVE AC'97 audio (including SiS 7018,ALi M5451) -device autri: audiobus, auconv, mulaw, ac97, midibus +device autri: audiobus, ac97, midibus attach autri at pci file dev/pci/autri.c autri Index: src/sys/dev/pci/igma/files.igma diff -u src/sys/dev/pci/igma/files.igma:1.1 src/sys/dev/pci/igma/files.igma:1.1.40.1 --- src/sys/dev/pci/igma/files.igma:1.1 Tue Jan 21 15:03:31 2014 +++ src/sys/dev/pci/igma/files.igma Sun May 5 02:31:42 2019 @@ -8,6 +8,6 @@ attach igmafb at igmabus file dev/pci/igma/igmafb.c igmafb needs-flag ## the audio part -#device vac: audiobus, auconv, mulaw +#device vac: audiobus #attach vac at igmabus #file dev/pci/igma/vac.c vac needs-flag Index: src/sys/dev/pci/voyager/files.voyager diff -u src/sys/dev/pci/voyager/files.voyager:1.6 src/sys/dev/pci/voyager/files.voyager:1.6.42.1 --- src/sys/dev/pci/voyager/files.voyager:1.6 Wed Mar 13 21:29:05 2013 +++ src/sys/dev/pci/voyager/files.voyager Sun May 5 02:31:42 2019 @@ -16,6 +16,6 @@ attach pwmclock at voyagerbus file dev/pci/voyager/pwmclock.c pwmclock needs-flag # the audio part -device vac: audiobus, auconv, mulaw +device vac: audiobus attach vac at voyagerbus file dev/pci/voyager/vac.c vac needs-flag Index: src/sys/dev/sbus/files.sbus diff -u src/sys/dev/sbus/files.sbus:1.43.2.1 src/sys/dev/sbus/files.sbus:1.43.2.2 --- src/sys/dev/sbus/files.sbus:1.43.2.1 Wed May 1 12:18:59 2019 +++ src/sys/dev/sbus/files.sbus Sun May 5 02:31:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.sbus,v 1.43.2.1 2019/05/01 12:18:59 isaki Exp $ +# $NetBSD: files.sbus,v 1.43.2.2 2019/05/05 02:31:42 isaki Exp $ # # Config file and device description for machine-independent SBUS code. # Included by ports that need it. @@ -129,7 +129,7 @@ file dev/sbus/p9100.c pnozz needs-flag # SUNW,DBRI audio defflag opt_sbus_dbri.h DBRI_DEBUG defflag opt_sbus_dbri.h DBRI_SPIN -device dbri { }: audiobus, auconv, mulaw +device dbri { }: audiobus attach dbri at sbus file dev/sbus/dbri.c dbri Index: src/sys/dev/tc/files.tc diff -u src/sys/dev/tc/files.tc:1.34 src/sys/dev/tc/files.tc:1.34.20.1 --- src/sys/dev/tc/files.tc:1.34 Thu Aug 11 09:05:42 2016 +++ src/sys/dev/tc/files.tc Sun May 5 02:31:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.tc,v 1.34 2016/08/11 09:05:42 christos Exp $ +# $NetBSD: files.tc,v 1.34.20.1 2019/05/05 02:31:42 isaki 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_de file dev/tc/if_le_tc.c le_tc # baseboard audio -device bba: audiobus,am7930,auconv +device bba: audiobus, am7930 attach bba at ioasic file dev/tc/bba.c bba Index: src/sys/dev/usb/files.usb diff -u src/sys/dev/usb/files.usb:1.154 src/sys/dev/usb/files.usb:1.154.2.1 --- src/sys/dev/usb/files.usb:1.154 Wed Feb 6 11:55:06 2019 +++ src/sys/dev/usb/files.usb Sun May 5 02:31:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.154 2019/02/06 11:55:06 rin Exp $ +# $NetBSD: files.usb,v 1.154.2.1 2019/05/05 02:31:42 isaki Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -119,7 +119,7 @@ define ezload file dev/usb/ezload.c ezload # Audio devices -device uaudio: audiobus, auconv, mulaw, aurateconv +device uaudio: audiobus attach uaudio at usbifif file dev/usb/uaudio.c uaudio