Module Name: src Committed By: isaki Date: Sat May 4 07:20:11 UTC 2019
Modified Files: src/sys/arch/amiga/dev [isaki-audio2]: aucc.c repulse.c toccata.c src/sys/arch/arm/broadcom [isaki-audio2]: bcm2835_vcaudio.c src/sys/arch/arm/imx [isaki-audio2]: imx23_digfilt.c src/sys/arch/arm/iomd [isaki-audio2]: vidcaudio.c src/sys/arch/arm/sunxi [isaki-audio2]: sun4i_a10_codec.c sun6i_a31_codec.c sun8i_h3_codec.c sunxi_codec.c sunxi_codec.h sunxi_i2s.c src/sys/arch/arm/xscale [isaki-audio2]: pxa2x0_ac97.c src/sys/arch/dreamcast/dev/g2 [isaki-audio2]: aica.c src/sys/arch/evbarm/mini2440 [isaki-audio2]: audio_mini2440.c src/sys/arch/hp300/dev [isaki-audio2]: arcofi_dio.c src/sys/arch/hpcmips/vr [isaki-audio2]: vraiu.c src/sys/arch/hppa/gsc [isaki-audio2]: harmony.c src/sys/arch/i386/pnpbios [isaki-audio2]: ess_pnpbios.c sb_pnpbios.c wss_pnpbios.c ym_pnpbios.c src/sys/arch/macppc/dev [isaki-audio2]: awacs.c snapper.c src/sys/arch/prep/isa [isaki-audio2]: paud_isa.c src/sys/arch/sgimips/hpc [isaki-audio2]: haltwo.c src/sys/arch/sgimips/mace [isaki-audio2]: mavb.c src/sys/arch/sparc/dev [isaki-audio2]: audioamd.c src/sys/arch/usermode/dev [isaki-audio2]: vaudio.c src/sys/arch/vax/vsa [isaki-audio2]: vsaudio.c src/sys/arch/x68k/dev [isaki-audio2]: vs.c src/sys/arch/zaurus/dev [isaki-audio2]: wm8731_zaudio.c wm8750_zaudio.c zaudio.c src/sys/dev [isaki-audio2]: midi.c midisyn.c spkr_audio.c src/sys/dev/acpi [isaki-audio2]: wss_acpi.c ym_acpi.c src/sys/dev/audio [isaki-audio2]: audio.c audio_dai.h audiobell.c audiovar.h linear.h mulaw.h src/sys/dev/bluetooth [isaki-audio2]: btsco.c src/sys/dev/ebus [isaki-audio2]: cs4231_ebus.c src/sys/dev/fdt [isaki-audio2]: ausoc.c src/sys/dev/hdaudio [isaki-audio2]: hdafg.c hdaudiovar.h src/sys/dev/ic [isaki-audio2]: ac97.c ad1848.c am7930.c arcofi.c cs4231.c interwave.c msm6258.c opl.c pl041.c tms320av110.c uda1341.c src/sys/dev/isa [isaki-audio2]: ad1848_isa.c aria.c cms.c ess.c gus.c ics2101.c joy_ess.c midi_pcppi.c mpu_sb.c mpu_ym.c opl_ess.c opl_isa.c opl_sb.c opl_wss.c opl_ym.c pas.c sb.c sb_isa.c sbdsp.c wss.c wss_isa.c ym.c src/sys/dev/isapnp [isaki-audio2]: ess_isapnp.c gus_isapnp.c mpu_isapnp.c sb_isapnp.c wss_isapnp.c ym_isapnp.c src/sys/dev/ofisa [isaki-audio2]: ess_ofisa.c sb_ofisa.c src/sys/dev/pad [isaki-audio2]: pad.c src/sys/dev/pci [isaki-audio2]: auacer.c auich.c auixp.c autri.c auvia.c azalia.c cmpci.c cs4280.c cs4281.c cs428x.c eap.c emuxki.c esa.c esm.c eso.c fms.c gcscaudio.c joy_eap.c joy_eso.c mpu_cmpci.c mpu_eso.c mpu_fms.c mpu_yds.c neo.c opl_cmpci.c opl_eso.c opl_fms.c opl_sv.c opl_yds.c sv.c yds.c src/sys/dev/sbus [isaki-audio2]: cs4231_sbus.c dbri.c src/sys/dev/tc [isaki-audio2]: bba.c src/sys/dev/usb [isaki-audio2]: uaudio.c src/sys/rump/dev/lib/libaudio [isaki-audio2]: audio_component.c Added Files: src/sys/dev/audio [isaki-audio2]: audio_if.h Removed Files: src/sys/dev [isaki-audio2]: audio_if.h Log Message: Move dev/audio_if.h -> dev/audio/audio_if.h To generate a diff of this commit: cvs rdiff -u -r1.44.2.2 -r1.44.2.3 src/sys/arch/amiga/dev/aucc.c cvs rdiff -u -r1.21.2.1 -r1.21.2.2 src/sys/arch/amiga/dev/repulse.c cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/sys/arch/amiga/dev/toccata.c cvs rdiff -u -r1.13.2.1 -r1.13.2.2 \ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c cvs rdiff -u -r1.1.24.2 -r1.1.24.3 src/sys/arch/arm/imx/imx23_digfilt.c cvs rdiff -u -r1.57.2.2 -r1.57.2.3 src/sys/arch/arm/iomd/vidcaudio.c cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/arm/sunxi/sun4i_a10_codec.c cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/arm/sunxi/sun6i_a31_codec.c cvs rdiff -u -r1.3 -r1.3.6.1 src/sys/arch/arm/sunxi/sun8i_h3_codec.c cvs rdiff -u -r1.5.4.1 -r1.5.4.2 src/sys/arch/arm/sunxi/sunxi_codec.c cvs rdiff -u -r1.4.8.2 -r1.4.8.3 src/sys/arch/arm/sunxi/sunxi_codec.h cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/arm/sunxi/sunxi_i2s.c cvs rdiff -u -r1.15.2.3 -r1.15.2.4 src/sys/arch/arm/xscale/pxa2x0_ac97.c cvs rdiff -u -r1.25.2.2 -r1.25.2.3 src/sys/arch/dreamcast/dev/g2/aica.c cvs rdiff -u -r1.2.2.3 -r1.2.2.4 \ src/sys/arch/evbarm/mini2440/audio_mini2440.c cvs rdiff -u -r1.1.26.1 -r1.1.26.2 src/sys/arch/hp300/dev/arcofi_dio.c cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/arch/hpcmips/vr/vraiu.c cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/sys/arch/hppa/gsc/harmony.c cvs rdiff -u -r1.22.56.1 -r1.22.56.2 src/sys/arch/i386/pnpbios/ess_pnpbios.c cvs rdiff -u -r1.17.20.1 -r1.17.20.2 src/sys/arch/i386/pnpbios/sb_pnpbios.c cvs rdiff -u -r1.21 -r1.21.20.1 src/sys/arch/i386/pnpbios/wss_pnpbios.c cvs rdiff -u -r1.18.20.1 -r1.18.20.2 src/sys/arch/i386/pnpbios/ym_pnpbios.c cvs rdiff -u -r1.46.2.2 -r1.46.2.3 src/sys/arch/macppc/dev/awacs.c cvs rdiff -u -r1.49.2.2 -r1.49.2.3 src/sys/arch/macppc/dev/snapper.c cvs rdiff -u -r1.17.2.1 -r1.17.2.2 src/sys/arch/prep/isa/paud_isa.c cvs rdiff -u -r1.24.2.2 -r1.24.2.3 src/sys/arch/sgimips/hpc/haltwo.c cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/arch/sgimips/mace/mavb.c cvs rdiff -u -r1.28.2.1 -r1.28.2.2 src/sys/arch/sparc/dev/audioamd.c cvs rdiff -u -r1.4.32.2 -r1.4.32.3 src/sys/arch/usermode/dev/vaudio.c cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/arch/vax/vsa/vsaudio.c cvs rdiff -u -r1.50.2.1 -r1.50.2.2 src/sys/arch/x68k/dev/vs.c cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/sys/arch/zaurus/dev/wm8731_zaudio.c cvs rdiff -u -r1.2.4.3 -r1.2.4.4 src/sys/arch/zaurus/dev/wm8750_zaudio.c cvs rdiff -u -r1.21.22.1 -r1.21.22.2 src/sys/arch/zaurus/dev/zaudio.c cvs rdiff -u -r1.70.24.4 -r0 src/sys/dev/audio_if.h cvs rdiff -u -r1.88 -r1.88.8.1 src/sys/dev/midi.c cvs rdiff -u -r1.24 -r1.24.44.1 src/sys/dev/midisyn.c cvs rdiff -u -r1.6.12.2 -r1.6.12.3 src/sys/dev/spkr_audio.c cvs rdiff -u -r1.31 -r1.31.22.1 src/sys/dev/acpi/wss_acpi.c cvs rdiff -u -r1.15 -r1.15.22.1 src/sys/dev/acpi/ym_acpi.c cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/dev/audio/audio.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/dev/audio/audio_dai.h \ src/sys/dev/audio/audiobell.c src/sys/dev/audio/audiovar.h \ src/sys/dev/audio/linear.h src/sys/dev/audio/mulaw.h cvs rdiff -u -r0 -r1.1.2.1 src/sys/dev/audio/audio_if.h cvs rdiff -u -r1.38.2.3 -r1.38.2.4 src/sys/dev/bluetooth/btsco.c cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/dev/ebus/cs4231_ebus.c cvs rdiff -u -r1.3.8.3 -r1.3.8.4 src/sys/dev/fdt/ausoc.c cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/dev/hdaudio/hdafg.c cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/sys/dev/hdaudio/hdaudiovar.h cvs rdiff -u -r1.97 -r1.97.8.1 src/sys/dev/ic/ac97.c cvs rdiff -u -r1.31.54.1 -r1.31.54.2 src/sys/dev/ic/ad1848.c cvs rdiff -u -r1.57.8.1 -r1.57.8.2 src/sys/dev/ic/am7930.c cvs rdiff -u -r1.1.28.5 -r1.1.28.6 src/sys/dev/ic/arcofi.c cvs rdiff -u -r1.29 -r1.29.14.1 src/sys/dev/ic/cs4231.c cvs rdiff -u -r1.40.2.2 -r1.40.2.3 src/sys/dev/ic/interwave.c cvs rdiff -u -r1.25.2.2 -r1.25.2.3 src/sys/dev/ic/msm6258.c \ src/sys/dev/ic/tms320av110.c cvs rdiff -u -r1.42 -r1.42.22.1 src/sys/dev/ic/opl.c cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/dev/ic/pl041.c cvs rdiff -u -r1.1.56.2 -r1.1.56.3 src/sys/dev/ic/uda1341.c cvs rdiff -u -r1.38.54.2 -r1.38.54.3 src/sys/dev/isa/ad1848_isa.c cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/sys/dev/isa/aria.c cvs rdiff -u -r1.22.20.1 -r1.22.20.2 src/sys/dev/isa/cms.c cvs rdiff -u -r1.84.2.3 -r1.84.2.4 src/sys/dev/isa/ess.c cvs rdiff -u -r1.115.2.2 -r1.115.2.3 src/sys/dev/isa/gus.c cvs rdiff -u -r1.17 -r1.17.54.1 src/sys/dev/isa/ics2101.c cvs rdiff -u -r1.6 -r1.6.54.1 src/sys/dev/isa/joy_ess.c cvs rdiff -u -r1.26 -r1.26.44.1 src/sys/dev/isa/midi_pcppi.c cvs rdiff -u -r1.16 -r1.16.54.1 src/sys/dev/isa/mpu_sb.c \ src/sys/dev/isa/mpu_ym.c cvs rdiff -u -r1.18 -r1.18.44.1 src/sys/dev/isa/opl_ess.c \ src/sys/dev/isa/opl_ym.c cvs rdiff -u -r1.21 -r1.21.44.1 src/sys/dev/isa/opl_isa.c cvs rdiff -u -r1.20 -r1.20.44.1 src/sys/dev/isa/opl_sb.c cvs rdiff -u -r1.15 -r1.15.44.1 src/sys/dev/isa/opl_wss.c cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/sys/dev/isa/pas.c cvs rdiff -u -r1.90.2.1 -r1.90.2.2 src/sys/dev/isa/sb.c cvs rdiff -u -r1.38.54.1 -r1.38.54.2 src/sys/dev/isa/sb_isa.c cvs rdiff -u -r1.139.2.2 -r1.139.2.3 src/sys/dev/isa/sbdsp.c cvs rdiff -u -r1.72.2.2 -r1.72.2.3 src/sys/dev/isa/wss.c cvs rdiff -u -r1.29 -r1.29.58.1 src/sys/dev/isa/wss_isa.c cvs rdiff -u -r1.45.2.2 -r1.45.2.3 src/sys/dev/isa/ym.c cvs rdiff -u -r1.22.64.1 -r1.22.64.2 src/sys/dev/isapnp/ess_isapnp.c cvs rdiff -u -r1.39.2.4 -r1.39.2.5 src/sys/dev/isapnp/gus_isapnp.c cvs rdiff -u -r1.20.52.1 -r1.20.52.2 src/sys/dev/isapnp/mpu_isapnp.c cvs rdiff -u -r1.52.96.1 -r1.52.96.2 src/sys/dev/isapnp/sb_isapnp.c cvs rdiff -u -r1.27 -r1.27.54.1 src/sys/dev/isapnp/wss_isapnp.c cvs rdiff -u -r1.25 -r1.25.58.1 src/sys/dev/isapnp/ym_isapnp.c cvs rdiff -u -r1.27.20.1 -r1.27.20.2 src/sys/dev/ofisa/ess_ofisa.c cvs rdiff -u -r1.18.20.1 -r1.18.20.2 src/sys/dev/ofisa/sb_ofisa.c cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sys/dev/pad/pad.c cvs rdiff -u -r1.36.2.2 -r1.36.2.3 src/sys/dev/pci/auacer.c cvs rdiff -u -r1.154.2.2 -r1.154.2.3 src/sys/dev/pci/auich.c cvs rdiff -u -r1.45.2.1 -r1.45.2.2 src/sys/dev/pci/auixp.c cvs rdiff -u -r1.56.2.3 -r1.56.2.4 src/sys/dev/pci/autri.c cvs rdiff -u -r1.82.2.3 -r1.82.2.4 src/sys/dev/pci/auvia.c cvs rdiff -u -r1.86.2.1 -r1.86.2.2 src/sys/dev/pci/azalia.c cvs rdiff -u -r1.53.2.2 -r1.53.2.3 src/sys/dev/pci/cmpci.c cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/sys/dev/pci/cs4280.c cvs rdiff -u -r1.54.2.1 -r1.54.2.2 src/sys/dev/pci/cs4281.c cvs rdiff -u -r1.18.14.2 -r1.18.14.3 src/sys/dev/pci/cs428x.c cvs rdiff -u -r1.99.2.3 -r1.99.2.4 src/sys/dev/pci/eap.c cvs rdiff -u -r1.67.2.6 -r1.67.2.7 src/sys/dev/pci/emuxki.c cvs rdiff -u -r1.63.2.3 -r1.63.2.4 src/sys/dev/pci/esa.c cvs rdiff -u -r1.61.2.2 -r1.61.2.3 src/sys/dev/pci/esm.c cvs rdiff -u -r1.69.2.3 -r1.69.2.4 src/sys/dev/pci/eso.c cvs rdiff -u -r1.45.2.2 -r1.45.2.3 src/sys/dev/pci/fms.c cvs rdiff -u -r1.16.2.3 -r1.16.2.4 src/sys/dev/pci/gcscaudio.c cvs rdiff -u -r1.13 -r1.13.54.1 src/sys/dev/pci/joy_eap.c cvs rdiff -u -r1.15 -r1.15.54.1 src/sys/dev/pci/joy_eso.c cvs rdiff -u -r1.16 -r1.16.54.1 src/sys/dev/pci/mpu_cmpci.c \ src/sys/dev/pci/mpu_yds.c cvs rdiff -u -r1.17 -r1.17.54.1 src/sys/dev/pci/mpu_eso.c \ src/sys/dev/pci/mpu_fms.c cvs rdiff -u -r1.52.2.2 -r1.52.2.3 src/sys/dev/pci/neo.c cvs rdiff -u -r1.17 -r1.17.44.1 src/sys/dev/pci/opl_cmpci.c \ src/sys/dev/pci/opl_fms.c src/sys/dev/pci/opl_yds.c cvs rdiff -u -r1.18 -r1.18.44.1 src/sys/dev/pci/opl_eso.c cvs rdiff -u -r1.16 -r1.16.44.1 src/sys/dev/pci/opl_sv.c cvs rdiff -u -r1.54.2.2 -r1.54.2.3 src/sys/dev/pci/sv.c cvs rdiff -u -r1.61.2.3 -r1.61.2.4 src/sys/dev/pci/yds.c cvs rdiff -u -r1.51.2.1 -r1.51.2.2 src/sys/dev/sbus/cs4231_sbus.c cvs rdiff -u -r1.39.2.2 -r1.39.2.3 src/sys/dev/sbus/dbri.c cvs rdiff -u -r1.42.2.1 -r1.42.2.2 src/sys/dev/tc/bba.c cvs rdiff -u -r1.158.2.3 -r1.158.2.4 src/sys/dev/usb/uaudio.c cvs rdiff -u -r1.4 -r1.4.12.1 src/sys/rump/dev/lib/libaudio/audio_component.c 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/dev/aucc.c diff -u src/sys/arch/amiga/dev/aucc.c:1.44.2.2 src/sys/arch/amiga/dev/aucc.c:1.44.2.3 --- src/sys/arch/amiga/dev/aucc.c:1.44.2.2 Sat May 4 04:51:20 2019 +++ src/sys/arch/amiga/dev/aucc.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: aucc.c,v 1.44.2.2 2019/05/04 04:51:20 isaki Exp $ */ +/* $NetBSD: aucc.c,v 1.44.2.3 2019/05/04 07:20:07 isaki Exp $ */ /* * Copyright (c) 1999 Bernardo Innocenti @@ -46,7 +46,7 @@ #if NAUCC > 0 #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.44.2.2 2019/05/04 04:51:20 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.44.2.3 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.4 #include <machine/cpu.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiovar.h> /* for AUDIO_MIN_FREQUENCY */ #include <amiga/amiga/cc.h> Index: src/sys/arch/amiga/dev/repulse.c diff -u src/sys/arch/amiga/dev/repulse.c:1.21.2.1 src/sys/arch/amiga/dev/repulse.c:1.21.2.2 --- src/sys/arch/amiga/dev/repulse.c:1.21.2.1 Sun Apr 21 09:41:58 2019 +++ src/sys/arch/amiga/dev/repulse.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: repulse.c,v 1.21.2.1 2019/04/21 09:41:58 isaki Exp $ */ +/* $NetBSD: repulse.c,v 1.21.2.2 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.21.2.1 2019/04/21 09:41:58 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.21.2.2 2019/05/04 07:20:07 isaki Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: repulse.c,v #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> Index: src/sys/arch/amiga/dev/toccata.c diff -u src/sys/arch/amiga/dev/toccata.c:1.18.2.2 src/sys/arch/amiga/dev/toccata.c:1.18.2.3 --- src/sys/arch/amiga/dev/toccata.c:1.18.2.2 Sat May 4 04:13:23 2019 +++ src/sys/arch/amiga/dev/toccata.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: toccata.c,v 1.18.2.2 2019/05/04 04:13:23 isaki Exp $ */ +/* $NetBSD: toccata.c,v 1.18.2.3 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.18.2.2 2019/05/04 04:13:23 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.18.2.3 2019/05/04 07:20:07 isaki Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: toccata.c,v #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ad1848reg.h> #include <dev/ic/ad1848var.h> Index: src/sys/arch/arm/broadcom/bcm2835_vcaudio.c diff -u src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.13.2.1 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.13.2.2 --- src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.13.2.1 Sun Apr 21 08:11:27 2019 +++ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_vcaudio.c,v 1.13.2.1 2019/04/21 08:11:27 isaki Exp $ */ +/* $NetBSD: bcm2835_vcaudio.c,v 1.13.2.2 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2013 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.13.2.1 2019/04/21 08:11:27 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.13.2.2 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: bcm2835_vcau #include <sys/kmem.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <interface/compat/vchi_bsd.h> #include <interface/vchiq_arm/vchiq_netbsd.h> Index: src/sys/arch/arm/imx/imx23_digfilt.c diff -u src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.2 src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.3 --- src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.2 Sat May 4 04:13:23 2019 +++ src/sys/arch/arm/imx/imx23_digfilt.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $Id: imx23_digfilt.c,v 1.1.24.2 2019/05/04 04:13:23 isaki Exp $ */ +/* $Id: imx23_digfilt.c,v 1.1.24.3 2019/05/04 07:20:07 isaki Exp $ */ /* * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -38,8 +38,8 @@ #include <sys/bus.h> #include <sys/mutex.h> #include <sys/audioio.h> -#include <dev/audio_if.h> #include <sys/mallocvar.h> +#include <dev/audio/audio_if.h> #include <arm/imx/imx23_digfiltreg.h> #include <arm/imx/imx23_rtcvar.h> #include <arm/imx/imx23_clkctrlvar.h> Index: src/sys/arch/arm/iomd/vidcaudio.c diff -u src/sys/arch/arm/iomd/vidcaudio.c:1.57.2.2 src/sys/arch/arm/iomd/vidcaudio.c:1.57.2.3 --- src/sys/arch/arm/iomd/vidcaudio.c:1.57.2.2 Sat May 4 06:13:46 2019 +++ src/sys/arch/arm/iomd/vidcaudio.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vidcaudio.c,v 1.57.2.2 2019/05/04 06:13:46 isaki Exp $ */ +/* $NetBSD: vidcaudio.c,v 1.57.2.3 2019/05/04 07:20:07 isaki Exp $ */ /* * Copyright (c) 1995 Melvin Tang-Richardson @@ -65,7 +65,7 @@ #include <sys/param.h> /* proc.h */ -__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.57.2.2 2019/05/04 06:13:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.57.2.3 2019/05/04 07:20:07 isaki Exp $"); #include <sys/audioio.h> #include <sys/conf.h> /* autoconfig functions */ @@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: vidcaudio.c, #include <uvm/uvm_extern.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiobellvar.h> #include <dev/audio/mulaw.h> Index: src/sys/arch/arm/sunxi/sun4i_a10_codec.c diff -u src/sys/arch/arm/sunxi/sun4i_a10_codec.c:1.2 src/sys/arch/arm/sunxi/sun4i_a10_codec.c:1.2.8.1 --- src/sys/arch/arm/sunxi/sun4i_a10_codec.c:1.2 Sun Aug 27 22:22:32 2017 +++ src/sys/arch/arm/sunxi/sun4i_a10_codec.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun4i_a10_codec.c,v 1.2 2017/08/27 22:22:32 jmcneill Exp $ */ +/* $NetBSD: sun4i_a10_codec.c,v 1.2.8.1 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sun4i_a10_codec.c,v 1.2 2017/08/27 22:22:32 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sun4i_a10_codec.c,v 1.2.8.1 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: sun4i_a10_co #include <sys/bitops.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <arm/sunxi/sunxi_codec.h> Index: src/sys/arch/arm/sunxi/sun6i_a31_codec.c diff -u src/sys/arch/arm/sunxi/sun6i_a31_codec.c:1.1 src/sys/arch/arm/sunxi/sun6i_a31_codec.c:1.1.8.1 --- src/sys/arch/arm/sunxi/sun6i_a31_codec.c:1.1 Sat Oct 7 21:53:16 2017 +++ src/sys/arch/arm/sunxi/sun6i_a31_codec.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun6i_a31_codec.c,v 1.1 2017/10/07 21:53:16 jmcneill Exp $ */ +/* $NetBSD: sun6i_a31_codec.c,v 1.1.8.1 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sun6i_a31_codec.c,v 1.1 2017/10/07 21:53:16 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sun6i_a31_codec.c,v 1.1.8.1 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: sun6i_a31_co #include <sys/bitops.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <arm/sunxi/sunxi_codec.h> Index: src/sys/arch/arm/sunxi/sun8i_h3_codec.c diff -u src/sys/arch/arm/sunxi/sun8i_h3_codec.c:1.3 src/sys/arch/arm/sunxi/sun8i_h3_codec.c:1.3.6.1 --- src/sys/arch/arm/sunxi/sun8i_h3_codec.c:1.3 Thu Dec 21 11:52:00 2017 +++ src/sys/arch/arm/sunxi/sun8i_h3_codec.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i_h3_codec.c,v 1.3 2017/12/21 11:52:00 nat Exp $ */ +/* $NetBSD: sun8i_h3_codec.c,v 1.3.6.1 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sun8i_h3_codec.c,v 1.3 2017/12/21 11:52:00 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sun8i_h3_codec.c,v 1.3.6.1 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: sun8i_h3_cod #include <sys/bitops.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <arm/sunxi/sunxi_codec.h> Index: src/sys/arch/arm/sunxi/sunxi_codec.c diff -u src/sys/arch/arm/sunxi/sunxi_codec.c:1.5.4.1 src/sys/arch/arm/sunxi/sunxi_codec.c:1.5.4.2 --- src/sys/arch/arm/sunxi/sunxi_codec.c:1.5.4.1 Sat Apr 27 05:30:37 2019 +++ src/sys/arch/arm/sunxi/sunxi_codec.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_codec.c,v 1.5.4.1 2019/04/27 05:30:37 isaki Exp $ */ +/* $NetBSD: sunxi_codec.c,v 1.5.4.2 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.5.4.1 2019/04/27 05:30:37 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.5.4.2 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_codec. #include <sys/gpio.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/fdt/fdtvar.h> Index: src/sys/arch/arm/sunxi/sunxi_codec.h diff -u src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.2 src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.3 --- src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.2 Fri May 3 05:43:46 2019 +++ src/sys/arch/arm/sunxi/sunxi_codec.h Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_codec.h,v 1.4.8.2 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: sunxi_codec.h,v 1.4.8.3 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca> @@ -30,7 +30,7 @@ #define _ARM_SUNXI_CODEC_H #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/fdt/fdtvar.h> Index: src/sys/arch/arm/sunxi/sunxi_i2s.c diff -u src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3.2.2 src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3.2.3 --- src/sys/arch/arm/sunxi/sunxi_i2s.c:1.3.2.2 Sat May 4 04:13:23 2019 +++ src/sys/arch/arm/sunxi/sunxi_i2s.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_i2s.c,v 1.3.2.2 2019/05/04 04:13:23 isaki Exp $ */ +/* $NetBSD: sunxi_i2s.c,v 1.3.2.3 2019/05/04 07:20:07 isaki Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.3.2.2 2019/05/04 04:13:23 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.3.2.3 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c, #include <sys/gpio.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/linear.h> #include <dev/fdt/fdtvar.h> Index: src/sys/arch/arm/xscale/pxa2x0_ac97.c diff -u src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.15.2.3 src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.15.2.4 --- src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.15.2.3 Fri May 3 06:19:42 2019 +++ src/sys/arch/arm/xscale/pxa2x0_ac97.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_ac97.c,v 1.15.2.3 2019/05/03 06:19:42 isaki Exp $ */ +/* $NetBSD: pxa2x0_ac97.c,v 1.15.2.4 2019/05/04 07:20:07 isaki Exp $ */ /* * Copyright (c) 2003, 2005 Wasabi Systems, Inc. @@ -47,7 +47,7 @@ #include <machine/intr.h> #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> Index: src/sys/arch/dreamcast/dev/g2/aica.c diff -u src/sys/arch/dreamcast/dev/g2/aica.c:1.25.2.2 src/sys/arch/dreamcast/dev/g2/aica.c:1.25.2.3 --- src/sys/arch/dreamcast/dev/g2/aica.c:1.25.2.2 Fri May 3 04:15:23 2019 +++ src/sys/arch/dreamcast/dev/g2/aica.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: aica.c,v 1.25.2.2 2019/05/03 04:15:23 isaki Exp $ */ +/* $NetBSD: aica.c,v 1.25.2.3 2019/05/04 07:20:07 isaki Exp $ */ /* * Copyright (c) 2003 SHIMIZU Ryo <r...@misakimix.org> @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.25.2.2 2019/05/03 04:15:23 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.25.2.3 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.2 #include <sys/audioio.h> #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiovar.h> /* AUDIO_MIN_FREQUENCY */ #include <machine/sysasicvar.h> Index: src/sys/arch/evbarm/mini2440/audio_mini2440.c diff -u src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.2.2.3 src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.2.2.4 --- src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.2.2.3 Sat May 4 04:51:20 2019 +++ src/sys/arch/evbarm/mini2440/audio_mini2440.c Sat May 4 07:20:07 2019 @@ -36,7 +36,7 @@ #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/uda1341var.h> Index: src/sys/arch/hp300/dev/arcofi_dio.c diff -u src/sys/arch/hp300/dev/arcofi_dio.c:1.1.26.1 src/sys/arch/hp300/dev/arcofi_dio.c:1.1.26.2 --- src/sys/arch/hp300/dev/arcofi_dio.c:1.1.26.1 Sun Apr 21 06:55:34 2019 +++ src/sys/arch/hp300/dev/arcofi_dio.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: arcofi_dio.c,v 1.1.26.1 2019/04/21 06:55:34 isaki Exp $ */ +/* $NetBSD: arcofi_dio.c,v 1.1.26.2 2019/05/04 07:20:07 isaki Exp $ */ /* $OpenBSD: arcofi_dio.c,v 1.1 2011/12/21 23:12:03 miod Exp $ */ /* @@ -25,7 +25,7 @@ #include <sys/intr.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/arcofivar.h> #include <hp300/dev/dioreg.h> Index: src/sys/arch/hpcmips/vr/vraiu.c diff -u src/sys/arch/hpcmips/vr/vraiu.c:1.16.2.2 src/sys/arch/hpcmips/vr/vraiu.c:1.16.2.3 --- src/sys/arch/hpcmips/vr/vraiu.c:1.16.2.2 Sat May 4 04:44:03 2019 +++ src/sys/arch/hpcmips/vr/vraiu.c Sat May 4 07:20:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vraiu.c,v 1.16.2.2 2019/05/04 04:44:03 isaki Exp $ */ +/* $NetBSD: vraiu.c,v 1.16.2.3 2019/05/04 07:20:07 isaki Exp $ */ /* * Copyright (c) 2001 HAMAJIMA Katsuomi. All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.16.2.2 2019/05/04 04:44:03 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.16.2.3 2019/05/04 07:20:07 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1. #include <machine/config_hook.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <hpcmips/vr/vr.h> #include <hpcmips/vr/vripif.h> Index: src/sys/arch/hppa/gsc/harmony.c diff -u src/sys/arch/hppa/gsc/harmony.c:1.5.2.2 src/sys/arch/hppa/gsc/harmony.c:1.5.2.3 --- src/sys/arch/hppa/gsc/harmony.c:1.5.2.2 Sat May 4 04:51:20 2019 +++ src/sys/arch/hppa/gsc/harmony.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: harmony.c,v 1.5.2.2 2019/05/04 04:51:20 isaki Exp $ */ +/* $NetBSD: harmony.c,v 1.5.2.3 2019/05/04 07:20:08 isaki Exp $ */ /* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */ @@ -76,7 +76,7 @@ #include <sys/rndsource.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <machine/cpu.h> #include <machine/intr.h> Index: src/sys/arch/i386/pnpbios/ess_pnpbios.c diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22.56.1 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22.56.2 --- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22.56.1 Fri May 3 05:43:46 2019 +++ src/sys/arch/i386/pnpbios/ess_pnpbios.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ess_pnpbios.c,v 1.22.56.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: ess_pnpbios.c,v 1.22.56.2 2019/05/04 07:20:08 isaki Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.c,v 1.22.56.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.c,v 1.22.56.2 2019/05/04 07:20:08 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ess_pnpbios. #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/arch/i386/pnpbios/sb_pnpbios.c diff -u src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17.20.1 src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17.20.2 --- src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17.20.1 Fri May 3 05:43:46 2019 +++ src/sys/arch/i386/pnpbios/sb_pnpbios.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_pnpbios.c,v 1.17.20.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: sb_pnpbios.c,v 1.17.20.2 2019/05/04 07:20:08 isaki Exp $ */ /* * Copyright (c) 1999 * Matthias Drochner. All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c,v 1.17.20.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c,v 1.17.20.2 2019/05/04 07:20:08 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/arch/i386/pnpbios/wss_pnpbios.c diff -u src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.21 src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.21.20.1 --- src/sys/arch/i386/pnpbios/wss_pnpbios.c:1.21 Thu Jul 14 10:19:05 2016 +++ src/sys/arch/i386/pnpbios/wss_pnpbios.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wss_pnpbios.c,v 1.21 2016/07/14 10:19:05 msaitoh Exp $ */ +/* $NetBSD: wss_pnpbios.c,v 1.21.20.1 2019/05/04 07:20:08 isaki Exp $ */ /* * Copyright (c) 1999 * Matthias Drochner. All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.21 2016/07/14 10:19:05 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.21.20.1 2019/05/04 07:20:08 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: wss_pnpbios. #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/arch/i386/pnpbios/ym_pnpbios.c diff -u src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18.20.1 src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18.20.2 --- src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18.20.1 Fri May 3 05:43:46 2019 +++ src/sys/arch/i386/pnpbios/ym_pnpbios.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ym_pnpbios.c,v 1.18.20.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: ym_pnpbios.c,v 1.18.20.2 2019/05/04 07:20:08 isaki Exp $ */ /* * Copyright (c) 1999 * Matthias Drochner. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c,v 1.18.20.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c,v 1.18.20.2 2019/05/04 07:20:08 isaki Exp $"); #include "mpu_ym.h" @@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/arch/macppc/dev/awacs.c diff -u src/sys/arch/macppc/dev/awacs.c:1.46.2.2 src/sys/arch/macppc/dev/awacs.c:1.46.2.3 --- src/sys/arch/macppc/dev/awacs.c:1.46.2.2 Wed Apr 24 12:47:13 2019 +++ src/sys/arch/macppc/dev/awacs.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: awacs.c,v 1.46.2.2 2019/04/24 12:47:13 isaki Exp $ */ +/* $NetBSD: awacs.c,v 1.46.2.3 2019/05/04 07:20:08 isaki Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.46.2.2 2019/04/24 12:47:13 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.46.2.3 2019/05/04 07:20:08 isaki Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1. #include <sys/mutex.h> #include <sys/condvar.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <uvm/uvm_extern.h> #include <machine/autoconf.h> Index: src/sys/arch/macppc/dev/snapper.c diff -u src/sys/arch/macppc/dev/snapper.c:1.49.2.2 src/sys/arch/macppc/dev/snapper.c:1.49.2.3 --- src/sys/arch/macppc/dev/snapper.c:1.49.2.2 Mon Apr 22 12:30:26 2019 +++ src/sys/arch/macppc/dev/snapper.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: snapper.c,v 1.49.2.2 2019/04/22 12:30:26 isaki Exp $ */ +/* $NetBSD: snapper.c,v 1.49.2.3 2019/05/04 07:20:08 isaki Exp $ */ /* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */ /* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.49.2.2 2019/04/22 12:30:26 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.49.2.3 2019/05/04 07:20:08 isaki Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: snapper.c,v #include <sys/systm.h> #include <sys/malloc.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ofw/openfirm.h> #include <macppc/dev/dbdma.h> Index: src/sys/arch/prep/isa/paud_isa.c diff -u src/sys/arch/prep/isa/paud_isa.c:1.17.2.1 src/sys/arch/prep/isa/paud_isa.c:1.17.2.2 --- src/sys/arch/prep/isa/paud_isa.c:1.17.2.1 Sun Apr 21 05:59:59 2019 +++ src/sys/arch/prep/isa/paud_isa.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: paud_isa.c,v 1.17.2.1 2019/04/21 05:59:59 isaki Exp $ */ +/* $NetBSD: paud_isa.c,v 1.17.2.2 2019/05/04 07:20:08 isaki Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.17.2.1 2019/04/21 05:59:59 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.17.2.2 2019/05/04 07:20:08 isaki Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v #include <machine/intr.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/arch/sgimips/hpc/haltwo.c diff -u src/sys/arch/sgimips/hpc/haltwo.c:1.24.2.2 src/sys/arch/sgimips/hpc/haltwo.c:1.24.2.3 --- src/sys/arch/sgimips/hpc/haltwo.c:1.24.2.2 Sun Apr 28 02:07:42 2019 +++ src/sys/arch/sgimips/hpc/haltwo.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: haltwo.c,v 1.24.2.2 2019/04/28 02:07:42 isaki Exp $ */ +/* $NetBSD: haltwo.c,v 1.24.2.3 2019/05/04 07:20:08 isaki Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -30,18 +30,18 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.24.2.2 2019/04/28 02:07:42 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.24.2.3 2019/05/04 07:20:08 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> #include <sys/audioio.h> #include <sys/kmem.h> -#include <dev/audio_if.h> - #include <sys/bus.h> #include <machine/sysconf.h> +#include <dev/audio/audio_if.h> + #include <sgimips/hpc/hpcvar.h> #include <sgimips/hpc/hpcreg.h> Index: src/sys/arch/sgimips/mace/mavb.c diff -u src/sys/arch/sgimips/mace/mavb.c:1.12.2.2 src/sys/arch/sgimips/mace/mavb.c:1.12.2.3 --- src/sys/arch/sgimips/mace/mavb.c:1.12.2.2 Sun Apr 21 13:05:46 2019 +++ src/sys/arch/sgimips/mace/mavb.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mavb.c,v 1.12.2.2 2019/04/21 13:05:46 isaki Exp $ */ +/* $NetBSD: mavb.c,v 1.12.2.3 2019/05/04 07:20:08 isaki Exp $ */ /* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */ /* @@ -29,7 +29,7 @@ #include <machine/autoconf.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <arch/sgimips/mace/macevar.h> #include <arch/sgimips/mace/macereg.h> Index: src/sys/arch/sparc/dev/audioamd.c diff -u src/sys/arch/sparc/dev/audioamd.c:1.28.2.1 src/sys/arch/sparc/dev/audioamd.c:1.28.2.2 --- src/sys/arch/sparc/dev/audioamd.c:1.28.2.1 Mon Apr 22 13:29:34 2019 +++ src/sys/arch/sparc/dev/audioamd.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audioamd.c,v 1.28.2.1 2019/04/22 13:29:34 isaki Exp $ */ +/* $NetBSD: audioamd.c,v 1.28.2.2 2019/05/04 07:20:08 isaki Exp $ */ /* NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp */ /* @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audioamd.c,v 1.28.2.1 2019/04/22 13:29:34 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audioamd.c,v 1.28.2.2 2019/05/04 07:20:08 isaki Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: audioamd.c,v #include <machine/autoconf.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/am7930reg.h> #include <dev/ic/am7930var.h> Index: src/sys/arch/usermode/dev/vaudio.c diff -u src/sys/arch/usermode/dev/vaudio.c:1.4.32.2 src/sys/arch/usermode/dev/vaudio.c:1.4.32.3 --- src/sys/arch/usermode/dev/vaudio.c:1.4.32.2 Sat Apr 27 11:58:02 2019 +++ src/sys/arch/usermode/dev/vaudio.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vaudio.c,v 1.4.32.2 2019/04/27 11:58:02 isaki Exp $ */ +/* $NetBSD: vaudio.c,v 1.4.32.3 2019/05/04 07:20:08 isaki Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vaudio.c,v 1.4.32.2 2019/04/27 11:58:02 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vaudio.c,v 1.4.32.3 2019/05/04 07:20:08 isaki Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: vaudio.c,v 1 #include <machine/mainbus.h> #include <machine/thunk.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> static const struct audio_format vaudio_audio_formats[1] = { { Index: src/sys/arch/vax/vsa/vsaudio.c diff -u src/sys/arch/vax/vsa/vsaudio.c:1.4.2.1 src/sys/arch/vax/vsa/vsaudio.c:1.4.2.2 --- src/sys/arch/vax/vsa/vsaudio.c:1.4.2.1 Mon Apr 22 13:29:34 2019 +++ src/sys/arch/vax/vsa/vsaudio.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vsaudio.c,v 1.4.2.1 2019/04/22 13:29:34 isaki Exp $ */ +/* $NetBSD: vsaudio.c,v 1.4.2.2 2019/05/04 07:20:08 isaki Exp $ */ /* $OpenBSD: vsaudio.c,v 1.4 2013/05/15 21:21:11 ratchov Exp $ */ /* @@ -77,7 +77,7 @@ #include <machine/vsbus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/am7930reg.h> #include <dev/ic/am7930var.h> Index: src/sys/arch/x68k/dev/vs.c diff -u src/sys/arch/x68k/dev/vs.c:1.50.2.1 src/sys/arch/x68k/dev/vs.c:1.50.2.2 --- src/sys/arch/x68k/dev/vs.c:1.50.2.1 Sun Apr 21 14:00:19 2019 +++ src/sys/arch/x68k/dev/vs.c Sat May 4 07:20:08 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vs.c,v 1.50.2.1 2019/04/21 14:00:19 isaki Exp $ */ +/* $NetBSD: vs.c,v 1.50.2.2 2019/05/04 07:20:08 isaki Exp $ */ /* * Copyright (c) 2001 Tetsuya Isaki. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.50.2.1 2019/04/21 14:00:19 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.50.2.2 2019/05/04 07:20:08 isaki Exp $"); #include "audio.h" #include "vs.h" @@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.50. #include <sys/kmem.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <machine/bus.h> #include <machine/cpu.h> Index: src/sys/arch/zaurus/dev/wm8731_zaudio.c diff -u src/sys/arch/zaurus/dev/wm8731_zaudio.c:1.2.4.2 src/sys/arch/zaurus/dev/wm8731_zaudio.c:1.2.4.3 --- src/sys/arch/zaurus/dev/wm8731_zaudio.c:1.2.4.2 Sat May 4 04:13:23 2019 +++ src/sys/arch/zaurus/dev/wm8731_zaudio.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wm8731_zaudio.c,v 1.2.4.2 2019/05/04 04:13:23 isaki Exp $ */ +/* $NetBSD: wm8731_zaudio.c,v 1.2.4.3 2019/05/04 07:20:09 isaki Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include "opt_zaudio.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wm8731_zaudio.c,v 1.2.4.2 2019/05/04 04:13:23 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wm8731_zaudio.c,v 1.2.4.3 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: wm8731_zaudi #include <sys/intr.h> #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/i2c/i2cvar.h> Index: src/sys/arch/zaurus/dev/wm8750_zaudio.c diff -u src/sys/arch/zaurus/dev/wm8750_zaudio.c:1.2.4.3 src/sys/arch/zaurus/dev/wm8750_zaudio.c:1.2.4.4 --- src/sys/arch/zaurus/dev/wm8750_zaudio.c:1.2.4.3 Sat May 4 04:13:23 2019 +++ src/sys/arch/zaurus/dev/wm8750_zaudio.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wm8750_zaudio.c,v 1.2.4.3 2019/05/04 04:13:23 isaki Exp $ */ +/* $NetBSD: wm8750_zaudio.c,v 1.2.4.4 2019/05/04 07:20:09 isaki Exp $ */ /* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */ /* @@ -51,7 +51,7 @@ #include "opt_zaudio.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wm8750_zaudio.c,v 1.2.4.3 2019/05/04 04:13:23 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wm8750_zaudio.c,v 1.2.4.4 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: wm8750_zaudi #include <sys/intr.h> #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/i2c/i2cvar.h> Index: src/sys/arch/zaurus/dev/zaudio.c diff -u src/sys/arch/zaurus/dev/zaudio.c:1.21.22.1 src/sys/arch/zaurus/dev/zaudio.c:1.21.22.2 --- src/sys/arch/zaurus/dev/zaudio.c:1.21.22.1 Wed Apr 24 13:03:06 2019 +++ src/sys/arch/zaurus/dev/zaudio.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: zaudio.c,v 1.21.22.1 2019/04/24 13:03:06 isaki Exp $ */ +/* $NetBSD: zaudio.c,v 1.21.22.2 2019/05/04 07:20:09 isaki Exp $ */ /* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */ /* @@ -50,7 +50,7 @@ #include "opt_cputypes.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.21.22.1 2019/04/24 13:03:06 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.21.22.2 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1 #include <sys/device.h> #include <sys/mutex.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/i2c/i2cvar.h> Index: src/sys/dev/midi.c diff -u src/sys/dev/midi.c:1.88 src/sys/dev/midi.c:1.88.8.1 --- src/sys/dev/midi.c:1.88 Sat Oct 28 03:47:24 2017 +++ src/sys/dev/midi.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: midi.c,v 1.88 2017/10/28 03:47:24 riastradh Exp $ */ +/* $NetBSD: midi.c,v 1.88.8.1 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.88 2017/10/28 03:47:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.88.8.1 2019/05/04 07:20:09 isaki Exp $"); #ifdef _KERNEL_OPT #include "midi.h" @@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.8 #include <sys/intr.h> #include <sys/module.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/midivar.h> Index: src/sys/dev/midisyn.c diff -u src/sys/dev/midisyn.c:1.24 src/sys/dev/midisyn.c:1.24.44.1 --- src/sys/dev/midisyn.c:1.24 Mon Apr 9 10:18:16 2012 +++ src/sys/dev/midisyn.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: midisyn.c,v 1.24 2012/04/09 10:18:16 plunky Exp $ */ +/* $NetBSD: midisyn.c,v 1.24.44.1 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.24 2012/04/09 10:18:16 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.24.44.1 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: midisyn.c,v #include <sys/midiio.h> #include <sys/device.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/midivar.h> #include <dev/midisynvar.h> Index: src/sys/dev/spkr_audio.c diff -u src/sys/dev/spkr_audio.c:1.6.12.2 src/sys/dev/spkr_audio.c:1.6.12.3 --- src/sys/dev/spkr_audio.c:1.6.12.2 Sat May 4 06:13:46 2019 +++ src/sys/dev/spkr_audio.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: spkr_audio.c,v 1.6.12.2 2019/05/04 06:13:46 isaki Exp $ */ +/* $NetBSD: spkr_audio.c,v 1.6.12.3 2019/05/04 07:20:09 isaki Exp $ */ /*- * Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.6.12.2 2019/05/04 06:13:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.6.12.3 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_audio.c #include <sys/ioctl.h> #include <sys/conf.h> #include <sys/sysctl.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiobellvar.h> #include <dev/spkrvar.h> Index: src/sys/dev/acpi/wss_acpi.c diff -u src/sys/dev/acpi/wss_acpi.c:1.31 src/sys/dev/acpi/wss_acpi.c:1.31.22.1 --- src/sys/dev/acpi/wss_acpi.c:1.31 Thu Jul 14 04:19:26 2016 +++ src/sys/dev/acpi/wss_acpi.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wss_acpi.c,v 1.31 2016/07/14 04:19:26 msaitoh Exp $ */ +/* $NetBSD: wss_acpi.c,v 1.31.22.1 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca> @@ -26,14 +26,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.31 2016/07/14 04:19:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.31.22.1 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/audioio.h> #include <sys/device.h> #include <sys/systm.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/acpi/acpivar.h> Index: src/sys/dev/acpi/ym_acpi.c diff -u src/sys/dev/acpi/ym_acpi.c:1.15 src/sys/dev/acpi/ym_acpi.c:1.15.22.1 --- src/sys/dev/acpi/ym_acpi.c:1.15 Mon Jul 11 11:31:50 2016 +++ src/sys/dev/acpi/ym_acpi.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ym_acpi.c,v 1.15 2016/07/11 11:31:50 msaitoh Exp $ */ +/* $NetBSD: ym_acpi.c,v 1.15.22.1 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 2006 Jasper Wallace <jas...@pointless.net> @@ -29,14 +29,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.15 2016/07/11 11:31:50 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.15.22.1 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <dev/acpi/acpivar.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ad1848reg.h> #include <dev/ic/opl3sa3reg.h> Index: src/sys/dev/audio/audio.c diff -u src/sys/dev/audio/audio.c:1.1.2.6 src/sys/dev/audio/audio.c:1.1.2.7 --- src/sys/dev/audio/audio.c:1.1.2.6 Sat May 4 04:13:23 2019 +++ src/sys/dev/audio/audio.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.1.2.6 2019/05/04 04:13:23 isaki Exp $ */ +/* $NetBSD: audio.c,v 1.1.2.7 2019/05/04 07:20:09 isaki Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -149,7 +149,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.6 2019/05/04 04:13:23 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.7 2019/05/04 07:20:09 isaki Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -189,7 +189,7 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1. #include <sys/syslog.h> #include <sys/vnode.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiovar.h> #include <dev/audio/audiodef.h> #include <dev/audio/linear.h> @@ -8489,7 +8489,7 @@ audio_query_devinfo(struct audio_softc * #include <sys/systm.h> #include <sys/device.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #endif #if NAUDIO > 0 || (NMIDI > 0 || NMIDIBUS > 0) Index: src/sys/dev/audio/audio_dai.h diff -u src/sys/dev/audio/audio_dai.h:1.1.2.1 src/sys/dev/audio/audio_dai.h:1.1.2.2 --- src/sys/dev/audio/audio_dai.h:1.1.2.1 Sat May 4 06:35:16 2019 +++ src/sys/dev/audio/audio_dai.h Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audio_dai.h,v 1.1.2.1 2019/05/04 06:35:16 isaki Exp $ */ +/* $NetBSD: audio_dai.h,v 1.1.2.2 2019/05/04 07:20:09 isaki Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -30,7 +30,7 @@ #define _DEV_AUDIO_AUDIO_DAI_H #include <sys/errno.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #define AUDIO_DAI_FORMAT_MASK __BITS(3,0) #define AUDIO_DAI_FORMAT_I2S 0 Index: src/sys/dev/audio/audiobell.c diff -u src/sys/dev/audio/audiobell.c:1.1.2.1 src/sys/dev/audio/audiobell.c:1.1.2.2 --- src/sys/dev/audio/audiobell.c:1.1.2.1 Sat May 4 06:13:47 2019 +++ src/sys/dev/audio/audiobell.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audiobell.c,v 1.1.2.1 2019/05/04 06:13:47 isaki Exp $ */ +/* $NetBSD: audiobell.c,v 1.1.2.2 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 1999 Richard Earnshaw @@ -31,7 +31,7 @@ */ #include <sys/types.h> -__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.1.2.1 2019/05/04 06:13:47 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.1.2.2 2019/05/04 07:20:09 isaki Exp $"); #include <sys/audioio.h> #include <sys/conf.h> @@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: audiobell.c, #include <sys/systm.h> #include <sys/uio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiovar.h> #include <dev/audio/audiodef.h> #include <dev/audio/audiobellvar.h> Index: src/sys/dev/audio/audiovar.h diff -u src/sys/dev/audio/audiovar.h:1.1.2.1 src/sys/dev/audio/audiovar.h:1.1.2.2 --- src/sys/dev/audio/audiovar.h:1.1.2.1 Sun Apr 21 04:28:59 2019 +++ src/sys/dev/audio/audiovar.h Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audiovar.h,v 1.1.2.1 2019/04/21 04:28:59 isaki Exp $ */ +/* $NetBSD: audiovar.h,v 1.1.2.2 2019/05/04 07:20:09 isaki Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ #include <sys/proc.h> #include <sys/queue.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiofil.h> #else #include <stdint.h> Index: src/sys/dev/audio/linear.h diff -u src/sys/dev/audio/linear.h:1.1.2.1 src/sys/dev/audio/linear.h:1.1.2.2 --- src/sys/dev/audio/linear.h:1.1.2.1 Sun Apr 21 04:28:59 2019 +++ src/sys/dev/audio/linear.h Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linear.h,v 1.1.2.1 2019/04/21 04:28:59 isaki Exp $ */ +/* $NetBSD: linear.h,v 1.1.2.2 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (C) 2017 Tetsuya Isaki. All rights reserved. @@ -29,7 +29,7 @@ #ifndef _SYS_DEV_AUDIO_LINEAR_H_ #define _SYS_DEV_AUDIO_LINEAR_H_ -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> extern void audio_internal_to_linear8(audio_filter_arg_t *); extern void audio_internal_to_linear16(audio_filter_arg_t *); Index: src/sys/dev/audio/mulaw.h diff -u src/sys/dev/audio/mulaw.h:1.1.2.1 src/sys/dev/audio/mulaw.h:1.1.2.2 --- src/sys/dev/audio/mulaw.h:1.1.2.1 Sun Apr 21 04:28:59 2019 +++ src/sys/dev/audio/mulaw.h Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mulaw.h,v 1.1.2.1 2019/04/21 04:28:59 isaki Exp $ */ +/* $NetBSD: mulaw.h,v 1.1.2.2 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (C) 2017 Tetsuya Isaki. All rights reserved. @@ -29,7 +29,7 @@ #ifndef _SYS_DEV_AUDIO_MULAW_H_ #define _SYS_DEV_AUDIO_MULAW_H_ -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> extern void audio_mulaw_to_internal(audio_filter_arg_t *); extern void audio_internal_to_mulaw(audio_filter_arg_t *); Index: src/sys/dev/bluetooth/btsco.c diff -u src/sys/dev/bluetooth/btsco.c:1.38.2.3 src/sys/dev/bluetooth/btsco.c:1.38.2.4 --- src/sys/dev/bluetooth/btsco.c:1.38.2.3 Sat May 4 04:13:24 2019 +++ src/sys/dev/bluetooth/btsco.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: btsco.c,v 1.38.2.3 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: btsco.c,v 1.38.2.4 2019/05/04 07:20:09 isaki Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.38.2.3 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.38.2.4 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1. #include <netbt/rfcomm.h> #include <netbt/sco.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/bluetooth/btdev.h> #include <dev/bluetooth/btsco.h> Index: src/sys/dev/ebus/cs4231_ebus.c diff -u src/sys/dev/ebus/cs4231_ebus.c:1.38.2.1 src/sys/dev/ebus/cs4231_ebus.c:1.38.2.2 --- src/sys/dev/ebus/cs4231_ebus.c:1.38.2.1 Sun Apr 21 06:00:00 2019 +++ src/sys/dev/ebus/cs4231_ebus.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231_ebus.c,v 1.38.2.1 2019/04/21 06:00:00 isaki Exp $ */ +/* $NetBSD: cs4231_ebus.c,v 1.38.2.2 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 2002 Valeriy E. Ushakov @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.38.2.1 2019/04/21 06:00:00 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.38.2.2 2019/05/04 07:20:09 isaki Exp $"); #ifdef _KERNEL_OPT #include "opt_sparc_arch.h" @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4231_ebus. #include <dev/ebus/ebusvar.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ad1848reg.h> #include <dev/ic/cs4231reg.h> Index: src/sys/dev/fdt/ausoc.c diff -u src/sys/dev/fdt/ausoc.c:1.3.8.3 src/sys/dev/fdt/ausoc.c:1.3.8.4 --- src/sys/dev/fdt/ausoc.c:1.3.8.3 Sat May 4 06:35:16 2019 +++ src/sys/dev/fdt/ausoc.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ausoc.c,v 1.3.8.3 2019/05/04 06:35:16 isaki Exp $ */ +/* $NetBSD: ausoc.c,v 1.3.8.4 2019/05/04 07:20:09 isaki Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ausoc.c,v 1.3.8.3 2019/05/04 06:35:16 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ausoc.c,v 1.3.8.4 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: ausoc.c,v 1. #include <sys/gpio.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audio_dai.h> #include <dev/fdt/fdtvar.h> Index: src/sys/dev/hdaudio/hdafg.c diff -u src/sys/dev/hdaudio/hdafg.c:1.16.2.2 src/sys/dev/hdaudio/hdafg.c:1.16.2.3 --- src/sys/dev/hdaudio/hdafg.c:1.16.2.2 Sat Apr 27 12:28:40 2019 +++ src/sys/dev/hdaudio/hdafg.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: hdafg.c,v 1.16.2.2 2019/04/27 12:28:40 isaki Exp $ */ +/* $NetBSD: hdafg.c,v 1.16.2.3 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk> @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.16.2.2 2019/04/27 12:28:40 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.16.2.3 2019/05/04 07:20:09 isaki Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1. #include <sys/module.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #ifdef _KERNEL_OPT #include "opt_hdaudio.h" Index: src/sys/dev/hdaudio/hdaudiovar.h diff -u src/sys/dev/hdaudio/hdaudiovar.h:1.6.6.1 src/sys/dev/hdaudio/hdaudiovar.h:1.6.6.2 --- src/sys/dev/hdaudio/hdaudiovar.h:1.6.6.1 Fri May 3 05:43:46 2019 +++ src/sys/dev/hdaudio/hdaudiovar.h Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudiovar.h,v 1.6.6.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: hdaudiovar.h,v 1.6.6.2 2019/05/04 07:20:09 isaki Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk> @@ -32,7 +32,7 @@ #ifndef _HDAUDIOVAR_H #define _HDAUDIOVAR_H -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #ifdef _KERNEL_OPT #include "opt_hdaudio.h" Index: src/sys/dev/ic/ac97.c diff -u src/sys/dev/ic/ac97.c:1.97 src/sys/dev/ic/ac97.c:1.97.8.1 --- src/sys/dev/ic/ac97.c:1.97 Fri Jul 28 01:36:40 2017 +++ src/sys/dev/ic/ac97.c Sat May 4 07:20:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ac97.c,v 1.97 2017/07/28 01:36:40 nat Exp $ */ +/* $NetBSD: ac97.c,v 1.97.8.1 2019/05/04 07:20:09 isaki Exp $ */ /* $OpenBSD: ac97.c,v 1.8 2000/07/19 09:01:35 csapuntz Exp $ */ /* @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.97 2017/07/28 01:36:40 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.97.8.1 2019/05/04 07:20:09 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.9 #include <sys/sysctl.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> Index: src/sys/dev/ic/ad1848.c diff -u src/sys/dev/ic/ad1848.c:1.31.54.1 src/sys/dev/ic/ad1848.c:1.31.54.2 --- src/sys/dev/ic/ad1848.c:1.31.54.1 Sun Apr 21 06:00:00 2019 +++ src/sys/dev/ic/ad1848.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ad1848.c,v 1.31.54.1 2019/04/21 06:00:00 isaki Exp $ */ +/* $NetBSD: ad1848.c,v 1.31.54.2 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -95,7 +95,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.31.54.1 2019/04/21 06:00:00 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.31.54.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,7 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ad1848reg.h> #include <dev/ic/cs4231reg.h> Index: src/sys/dev/ic/am7930.c diff -u src/sys/dev/ic/am7930.c:1.57.8.1 src/sys/dev/ic/am7930.c:1.57.8.2 --- src/sys/dev/ic/am7930.c:1.57.8.1 Mon Apr 22 13:29:34 2019 +++ src/sys/dev/ic/am7930.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: am7930.c,v 1.57.8.1 2019/04/22 13:29:34 isaki Exp $ */ +/* $NetBSD: am7930.c,v 1.57.8.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1995 Rolf Grossmann @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.57.8.1 2019/04/22 13:29:34 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.57.8.2 2019/05/04 07:20:10 isaki Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1 #include <sys/cpu.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/mulaw.h> #include <dev/ic/am7930reg.h> Index: src/sys/dev/ic/arcofi.c diff -u src/sys/dev/ic/arcofi.c:1.1.28.5 src/sys/dev/ic/arcofi.c:1.1.28.6 --- src/sys/dev/ic/arcofi.c:1.1.28.5 Sat May 4 04:51:20 2019 +++ src/sys/dev/ic/arcofi.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: arcofi.c,v 1.1.28.5 2019/05/04 04:51:20 isaki Exp $ */ +/* $NetBSD: arcofi.c,v 1.1.28.6 2019/05/04 07:20:10 isaki Exp $ */ /* $OpenBSD: arcofi.c,v 1.6 2013/05/15 08:29:24 ratchov Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/mulaw.h> #include <dev/ic/arcofivar.h> Index: src/sys/dev/ic/cs4231.c diff -u src/sys/dev/ic/cs4231.c:1.29 src/sys/dev/ic/cs4231.c:1.29.14.1 --- src/sys/dev/ic/cs4231.c:1.29 Thu Jun 1 02:45:10 2017 +++ src/sys/dev/ic/cs4231.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231.c,v 1.29 2017/06/01 02:45:10 chs Exp $ */ +/* $NetBSD: cs4231.c,v 1.29.14.1 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.29 2017/06/01 02:45:10 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.29.14.1 2019/05/04 07:20:10 isaki Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1 #include <sys/cpu.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ad1848reg.h> #include <dev/ic/cs4231reg.h> Index: src/sys/dev/ic/interwave.c diff -u src/sys/dev/ic/interwave.c:1.40.2.2 src/sys/dev/ic/interwave.c:1.40.2.3 --- src/sys/dev/ic/interwave.c:1.40.2.2 Sat May 4 04:13:24 2019 +++ src/sys/dev/ic/interwave.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: interwave.c,v 1.40.2.2 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: interwave.c,v 1.40.2.3 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.40.2.2 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.40.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: interwave.c, #include <machine/pio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/ic/msm6258.c diff -u src/sys/dev/ic/msm6258.c:1.25.2.2 src/sys/dev/ic/msm6258.c:1.25.2.3 --- src/sys/dev/ic/msm6258.c:1.25.2.2 Fri May 3 06:19:42 2019 +++ src/sys/dev/ic/msm6258.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: msm6258.c,v 1.25.2.2 2019/05/03 06:19:42 isaki Exp $ */ +/* $NetBSD: msm6258.c,v 1.25.2.3 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2001 Tetsuya Isaki. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.25.2.2 2019/05/03 06:19:42 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.25.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/systm.h> #include <sys/device.h> @@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: msm6258.c,v #include <sys/select.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/msm6258var.h> static inline uint8_t pcm2adpcm_step(struct msm6258_codecvar *, int16_t); Index: src/sys/dev/ic/tms320av110.c diff -u src/sys/dev/ic/tms320av110.c:1.25.2.2 src/sys/dev/ic/tms320av110.c:1.25.2.3 --- src/sys/dev/ic/tms320av110.c:1.25.2.2 Thu Apr 25 13:24:11 2019 +++ src/sys/dev/ic/tms320av110.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: tms320av110.c,v 1.25.2.2 2019/04/25 13:24:11 isaki Exp $ */ +/* $NetBSD: tms320av110.c,v 1.25.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.25.2.2 2019/04/25 13:24:11 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.25.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: tms320av110. #include <sys/proc.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/tms320av110reg.h> #include <dev/ic/tms320av110var.h> Index: src/sys/dev/ic/opl.c diff -u src/sys/dev/ic/opl.c:1.42 src/sys/dev/ic/opl.c:1.42.22.1 --- src/sys/dev/ic/opl.c:1.42 Thu Jul 14 10:19:06 2016 +++ src/sys/dev/ic/opl.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl.c,v 1.42 2016/07/14 10:19:06 msaitoh Exp $ */ +/* $NetBSD: opl.c,v 1.42.22.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.42 2016/07/14 10:19:06 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.42.22.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.42 #include <sys/audioio.h> #include <sys/midiio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/midivar.h> Index: src/sys/dev/ic/pl041.c diff -u src/sys/dev/ic/pl041.c:1.5.2.1 src/sys/dev/ic/pl041.c:1.5.2.2 --- src/sys/dev/ic/pl041.c:1.5.2.1 Sat Apr 27 11:52:53 2019 +++ src/sys/dev/ic/pl041.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pl041.c,v 1.5.2.1 2019/04/27 11:52:53 isaki Exp $ */ +/* $NetBSD: pl041.c,v 1.5.2.2 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pl041.c,v 1.5.2.1 2019/04/27 11:52:53 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pl041.c,v 1.5.2.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: pl041.c,v 1. #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97var.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/ic/uda1341.c diff -u src/sys/dev/ic/uda1341.c:1.1.56.2 src/sys/dev/ic/uda1341.c:1.1.56.3 --- src/sys/dev/ic/uda1341.c:1.1.56.2 Thu Apr 25 13:49:39 2019 +++ src/sys/dev/ic/uda1341.c Sat May 4 07:20:10 2019 @@ -34,7 +34,7 @@ #include <sys/audioio.h> #include <sys/fcntl.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/uda1341var.h> #include <dev/ic/uda1341reg.h> Index: src/sys/dev/isa/ad1848_isa.c diff -u src/sys/dev/isa/ad1848_isa.c:1.38.54.2 src/sys/dev/isa/ad1848_isa.c:1.38.54.3 --- src/sys/dev/isa/ad1848_isa.c:1.38.54.2 Sat May 4 04:13:24 2019 +++ src/sys/dev/isa/ad1848_isa.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ad1848_isa.c,v 1.38.54.2 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: ad1848_isa.c,v 1.38.54.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -95,7 +95,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.38.54.2 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.38.54.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,7 +110,7 @@ __KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c #include <sys/audioio.h> #include <sys/malloc.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isa/aria.c diff -u src/sys/dev/isa/aria.c:1.39.2.1 src/sys/dev/isa/aria.c:1.39.2.2 --- src/sys/dev/isa/aria.c:1.39.2.1 Sun Apr 21 06:09:01 2019 +++ src/sys/dev/isa/aria.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: aria.c,v 1.39.2.1 2019/04/21 06:09:01 isaki Exp $ */ +/* $NetBSD: aria.c,v 1.39.2.2 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1995, 1996, 1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.39.2.1 2019/04/21 06:09:01 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.39.2.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.3 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/ariareg.h> Index: src/sys/dev/isa/cms.c diff -u src/sys/dev/isa/cms.c:1.22.20.1 src/sys/dev/isa/cms.c:1.22.20.2 --- src/sys/dev/isa/cms.c:1.22.20.1 Fri May 3 06:19:42 2019 +++ src/sys/dev/isa/cms.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cms.c,v 1.22.20.1 2019/05/03 06:19:42 isaki Exp $ */ +/* $NetBSD: cms.c,v 1.22.20.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.22.20.1 2019/05/03 06:19:42 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.22.20.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.22 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <sys/midiio.h> #include <dev/midi_if.h> Index: src/sys/dev/isa/ess.c diff -u src/sys/dev/isa/ess.c:1.84.2.3 src/sys/dev/isa/ess.c:1.84.2.4 --- src/sys/dev/isa/ess.c:1.84.2.3 Sat May 4 04:13:24 2019 +++ src/sys/dev/isa/ess.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ess.c,v 1.84.2.3 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: ess.c,v 1.84.2.4 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright 1997 @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.84.2.3 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.84.2.4 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.84 #include <sys/audioio.h> #include <sys/malloc.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isa/gus.c diff -u src/sys/dev/isa/gus.c:1.115.2.2 src/sys/dev/isa/gus.c:1.115.2.3 --- src/sys/dev/isa/gus.c:1.115.2.2 Sat May 4 04:13:24 2019 +++ src/sys/dev/isa/gus.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: gus.c,v 1.115.2.2 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: gus.c,v 1.115.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.115.2.2 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.115.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -107,7 +107,7 @@ __KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.11 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ics2101reg.h> #include <dev/ic/cs4231reg.h> Index: src/sys/dev/isa/ics2101.c diff -u src/sys/dev/isa/ics2101.c:1.17 src/sys/dev/isa/ics2101.c:1.17.54.1 --- src/sys/dev/isa/ics2101.c:1.17 Wed Nov 23 23:07:32 2011 +++ src/sys/dev/isa/ics2101.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ics2101.c,v 1.17 2011/11/23 23:07:32 jmcneill Exp $ */ +/* $NetBSD: ics2101.c,v 1.17.54.1 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.17 2011/11/23 23:07:32 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.17.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: ics2101.c,v #include <sys/cpu.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isa/joy_ess.c diff -u src/sys/dev/isa/joy_ess.c:1.6 src/sys/dev/isa/joy_ess.c:1.6.54.1 --- src/sys/dev/isa/joy_ess.c:1.6 Wed Nov 23 23:07:32 2011 +++ src/sys/dev/isa/joy_ess.c Sat May 4 07:20:10 2019 @@ -1,16 +1,16 @@ -/* $NetBSD: joy_ess.c,v 1.6 2011/11/23 23:07:32 jmcneill Exp $ */ +/* $NetBSD: joy_ess.c,v 1.6.54.1 2019/05/04 07:20:10 isaki Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_ess.c,v 1.6 2011/11/23 23:07:32 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_ess.c,v 1.6.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/device.h> #include <sys/audioio.h> -#include <dev/audio_if.h> #include <sys/bus.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/essvar.h> #include <dev/ic/joyvar.h> Index: src/sys/dev/isa/midi_pcppi.c diff -u src/sys/dev/isa/midi_pcppi.c:1.26 src/sys/dev/isa/midi_pcppi.c:1.26.44.1 --- src/sys/dev/isa/midi_pcppi.c:1.26 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/isa/midi_pcppi.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: midi_pcppi.c,v 1.26 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: midi_pcppi.c,v 1.26.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.26 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.26.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c #include <dev/isa/pcppivar.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/midivar.h> #include <dev/midisynvar.h> Index: src/sys/dev/isa/mpu_sb.c diff -u src/sys/dev/isa/mpu_sb.c:1.16 src/sys/dev/isa/mpu_sb.c:1.16.54.1 --- src/sys/dev/isa/mpu_sb.c:1.16 Wed Nov 23 23:07:32 2011 +++ src/sys/dev/isa/mpu_sb.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_sb.c,v 1.16 2011/11/23 23:07:32 jmcneill Exp $ */ +/* $NetBSD: mpu_sb.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.16 2011/11/23 23:07:32 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1 #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/dev/isa/mpu_ym.c diff -u src/sys/dev/isa/mpu_ym.c:1.16 src/sys/dev/isa/mpu_ym.c:1.16.54.1 --- src/sys/dev/isa/mpu_ym.c:1.16 Wed Nov 23 23:07:32 2011 +++ src/sys/dev/isa/mpu_ym.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_ym.c,v 1.16 2011/11/23 23:07:32 jmcneill Exp $ */ +/* $NetBSD: mpu_ym.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.16 2011/11/23 23:07:32 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $"); #define NMPU_YM 1 @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1 #include <sys/midiio.h> #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/dev/isa/opl_ess.c diff -u src/sys/dev/isa/opl_ess.c:1.18 src/sys/dev/isa/opl_ess.c:1.18.44.1 --- src/sys/dev/isa/opl_ess.c:1.18 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/isa/opl_ess.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_ess.c,v 1.18 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_ess.c,v 1.18.44.1 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.18 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.18.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/isa/opl_ym.c diff -u src/sys/dev/isa/opl_ym.c:1.18 src/sys/dev/isa/opl_ym.c:1.18.44.1 --- src/sys/dev/isa/opl_ym.c:1.18 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/isa/opl_ym.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_ym.c,v 1.18 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_ym.c,v 1.18.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.18 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.18.44.1 2019/05/04 07:20:10 isaki Exp $"); #include "mpu_ym.h" @@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1 #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/isa/opl_isa.c diff -u src/sys/dev/isa/opl_isa.c:1.21 src/sys/dev/isa/opl_isa.c:1.21.44.1 --- src/sys/dev/isa/opl_isa.c:1.21 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/isa/opl_isa.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_isa.c,v 1.21 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_isa.c,v 1.21.44.1 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.21 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.21.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> Index: src/sys/dev/isa/opl_sb.c diff -u src/sys/dev/isa/opl_sb.c:1.20 src/sys/dev/isa/opl_sb.c:1.20.44.1 --- src/sys/dev/isa/opl_sb.c:1.20 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/isa/opl_sb.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_sb.c,v 1.20 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_sb.c,v 1.20.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.20 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.20.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1 #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/isa/opl_wss.c diff -u src/sys/dev/isa/opl_wss.c:1.15 src/sys/dev/isa/opl_wss.c:1.15.44.1 --- src/sys/dev/isa/opl_wss.c:1.15 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/isa/opl_wss.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_wss.c,v 1.15 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_wss.c,v 1.15.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.15 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.15.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/isa/pas.c diff -u src/sys/dev/isa/pas.c:1.71.2.1 src/sys/dev/isa/pas.c:1.71.2.2 --- src/sys/dev/isa/pas.c:1.71.2.1 Fri May 3 03:00:33 2019 +++ src/sys/dev/isa/pas.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pas.c,v 1.71.2.1 2019/05/03 03:00:33 isaki Exp $ */ +/* $NetBSD: pas.c,v 1.71.2.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -57,7 +57,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.71.2.1 2019/05/03 03:00:33 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.71.2.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.71 #include <machine/pio.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/dev/isa/sb.c diff -u src/sys/dev/isa/sb.c:1.90.2.1 src/sys/dev/isa/sb.c:1.90.2.2 --- src/sys/dev/isa/sb.c:1.90.2.1 Fri May 3 03:00:33 2019 +++ src/sys/dev/isa/sb.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sb.c,v 1.90.2.1 2019/05/03 03:00:33 isaki Exp $ */ +/* $NetBSD: sb.c,v 1.90.2.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.90.2.1 2019/05/03 03:00:33 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.90.2.2 2019/05/04 07:20:10 isaki Exp $"); #include "midi.h" @@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.90. #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/dev/isa/sb_isa.c diff -u src/sys/dev/isa/sb_isa.c:1.38.54.1 src/sys/dev/isa/sb_isa.c:1.38.54.2 --- src/sys/dev/isa/sb_isa.c:1.38.54.1 Fri May 3 05:43:46 2019 +++ src/sys/dev/isa/sb_isa.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_isa.c,v 1.38.54.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: sb_isa.c,v 1.38.54.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.38.54.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.38.54.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/dev/isa/sbdsp.c diff -u src/sys/dev/isa/sbdsp.c:1.139.2.2 src/sys/dev/isa/sbdsp.c:1.139.2.3 --- src/sys/dev/isa/sbdsp.c:1.139.2.2 Fri May 3 03:00:33 2019 +++ src/sys/dev/isa/sbdsp.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sbdsp.c,v 1.139.2.2 2019/05/03 03:00:33 isaki Exp $ */ +/* $NetBSD: sbdsp.c,v 1.139.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.139.2.2 2019/05/03 03:00:33 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.139.2.3 2019/05/04 07:20:10 isaki Exp $"); #include "midi.h" #include "mpu.h" @@ -94,7 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1. #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/linear.h> #include <dev/midi_if.h> Index: src/sys/dev/isa/wss.c diff -u src/sys/dev/isa/wss.c:1.72.2.2 src/sys/dev/isa/wss.c:1.72.2.3 --- src/sys/dev/isa/wss.c:1.72.2.2 Sat May 4 04:13:24 2019 +++ src/sys/dev/isa/wss.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wss.c,v 1.72.2.2 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: wss.c,v 1.72.2.3 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.72.2.2 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.72.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.72 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isa/wss_isa.c diff -u src/sys/dev/isa/wss_isa.c:1.29 src/sys/dev/isa/wss_isa.c:1.29.58.1 --- src/sys/dev/isa/wss_isa.c:1.29 Thu Jun 2 14:12:25 2011 +++ src/sys/dev/isa/wss_isa.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wss_isa.c,v 1.29 2011/06/02 14:12:25 tsutsui Exp $ */ +/* $NetBSD: wss_isa.c,v 1.29.58.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.29 2011/06/02 14:12:25 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.29.58.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isa/ym.c diff -u src/sys/dev/isa/ym.c:1.45.2.2 src/sys/dev/isa/ym.c:1.45.2.3 --- src/sys/dev/isa/ym.c:1.45.2.2 Sat May 4 04:13:24 2019 +++ src/sys/dev/isa/ym.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ym.c,v 1.45.2.2 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: ym.c,v 1.45.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1999-2002, 2008 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.45.2.2 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.45.2.3 2019/05/04 07:20:10 isaki Exp $"); #include "mpu_ym.h" #include "opt_ym.h" @@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.45. #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isapnp/ess_isapnp.c diff -u src/sys/dev/isapnp/ess_isapnp.c:1.22.64.1 src/sys/dev/isapnp/ess_isapnp.c:1.22.64.2 --- src/sys/dev/isapnp/ess_isapnp.c:1.22.64.1 Fri May 3 05:43:46 2019 +++ src/sys/dev/isapnp/ess_isapnp.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ess_isapnp.c,v 1.22.64.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: ess_isapnp.c,v 1.22.64.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.22.64.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.22.64.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isapnp/gus_isapnp.c diff -u src/sys/dev/isapnp/gus_isapnp.c:1.39.2.4 src/sys/dev/isapnp/gus_isapnp.c:1.39.2.5 --- src/sys/dev/isapnp/gus_isapnp.c:1.39.2.4 Sat May 4 04:13:24 2019 +++ src/sys/dev/isapnp/gus_isapnp.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: gus_isapnp.c,v 1.39.2.4 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: gus_isapnp.c,v 1.39.2.5 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.39.2.4 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.39.2.5 2019/05/04 07:20:10 isaki Exp $"); #include "guspnp.h" #if NGUSPNP > 0 @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isapnp/mpu_isapnp.c diff -u src/sys/dev/isapnp/mpu_isapnp.c:1.20.52.1 src/sys/dev/isapnp/mpu_isapnp.c:1.20.52.2 --- src/sys/dev/isapnp/mpu_isapnp.c:1.20.52.1 Fri May 3 05:43:46 2019 +++ src/sys/dev/isapnp/mpu_isapnp.c Sat May 4 07:20:10 2019 @@ -1,7 +1,7 @@ -/* $NetBSD: mpu_isapnp.c,v 1.20.52.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: mpu_isapnp.c,v 1.20.52.2 2019/05/04 07:20:10 isaki Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.20.52.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.20.52.2 2019/05/04 07:20:10 isaki Exp $"); #include "midi.h" @@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/dev/isapnp/sb_isapnp.c diff -u src/sys/dev/isapnp/sb_isapnp.c:1.52.96.1 src/sys/dev/isapnp/sb_isapnp.c:1.52.96.2 --- src/sys/dev/isapnp/sb_isapnp.c:1.52.96.1 Fri May 3 05:43:46 2019 +++ src/sys/dev/isapnp/sb_isapnp.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_isapnp.c,v 1.52.96.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: sb_isapnp.c,v 1.52.96.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.52.96.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.52.96.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c, #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> Index: src/sys/dev/isapnp/wss_isapnp.c diff -u src/sys/dev/isapnp/wss_isapnp.c:1.27 src/sys/dev/isapnp/wss_isapnp.c:1.27.54.1 --- src/sys/dev/isapnp/wss_isapnp.c:1.27 Tue Nov 22 19:33:38 2011 +++ src/sys/dev/isapnp/wss_isapnp.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wss_isapnp.c,v 1.27 2011/11/22 19:33:38 jakllsch Exp $ */ +/* $NetBSD: wss_isapnp.c,v 1.27.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.27 2011/11/22 19:33:38 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.27.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/isapnp/ym_isapnp.c diff -u src/sys/dev/isapnp/ym_isapnp.c:1.25 src/sys/dev/isapnp/ym_isapnp.c:1.25.58.1 --- src/sys/dev/isapnp/ym_isapnp.c:1.25 Thu Jun 2 14:12:25 2011 +++ src/sys/dev/isapnp/ym_isapnp.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ym_isapnp.c,v 1.25 2011/06/02 14:12:25 tsutsui Exp $ */ +/* $NetBSD: ym_isapnp.c,v 1.25.58.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.25 2011/06/02 14:12:25 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.25.58.1 2019/05/04 07:20:10 isaki Exp $"); #include "mpu_ym.h" @@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c, #include <sys/errno.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> Index: src/sys/dev/ofisa/ess_ofisa.c diff -u src/sys/dev/ofisa/ess_ofisa.c:1.27.20.1 src/sys/dev/ofisa/ess_ofisa.c:1.27.20.2 --- src/sys/dev/ofisa/ess_ofisa.c:1.27.20.1 Fri May 3 05:43:46 2019 +++ src/sys/dev/ofisa/ess_ofisa.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ess_ofisa.c,v 1.27.20.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: ess_ofisa.c,v 1.27.20.2 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.27.20.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.27.20.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c, #include <sys/intr.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ofw/openfirm.h> #include <dev/isa/isavar.h> Index: src/sys/dev/ofisa/sb_ofisa.c diff -u src/sys/dev/ofisa/sb_ofisa.c:1.18.20.1 src/sys/dev/ofisa/sb_ofisa.c:1.18.20.2 --- src/sys/dev/ofisa/sb_ofisa.c:1.18.20.1 Fri May 3 05:43:46 2019 +++ src/sys/dev/ofisa/sb_ofisa.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_ofisa.c,v 1.18.20.1 2019/05/03 05:43:46 isaki Exp $ */ +/* $NetBSD: sb_ofisa.c,v 1.18.20.2 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.18.20.1 2019/05/03 05:43:46 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.18.20.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v #include <sys/intr.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ofw/openfirm.h> Index: src/sys/dev/pad/pad.c diff -u src/sys/dev/pad/pad.c:1.58.2.1 src/sys/dev/pad/pad.c:1.58.2.2 --- src/sys/dev/pad/pad.c:1.58.2.1 Sun Apr 21 04:28:59 2019 +++ src/sys/dev/pad/pad.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pad.c,v 1.58.2.1 2019/04/21 04:28:59 isaki Exp $ */ +/* $NetBSD: pad.c,v 1.58.2.2 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.58.2.1 2019/04/21 04:28:59 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.58.2.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.58 #include <sys/atomic.h> #include <sys/time.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/audio/audiovar.h> #include <dev/pad/padvar.h> Index: src/sys/dev/pci/auacer.c diff -u src/sys/dev/pci/auacer.c:1.36.2.2 src/sys/dev/pci/auacer.c:1.36.2.3 --- src/sys/dev/pci/auacer.c:1.36.2.2 Sat Apr 27 12:57:54 2019 +++ src/sys/dev/pci/auacer.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: auacer.c,v 1.36.2.2 2019/04/27 12:57:54 isaki Exp $ */ +/* $NetBSD: auacer.c,v 1.36.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.36.2.2 2019/04/27 12:57:54 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.36.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1 #include <dev/pci/auacerreg.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <sys/bus.h> Index: src/sys/dev/pci/auich.c diff -u src/sys/dev/pci/auich.c:1.154.2.2 src/sys/dev/pci/auich.c:1.154.2.3 --- src/sys/dev/pci/auich.c:1.154.2.2 Sat Apr 27 12:53:37 2019 +++ src/sys/dev/pci/auich.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.154.2.2 2019/04/27 12:53:37 isaki Exp $ */ +/* $NetBSD: auich.c,v 1.154.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.154.2.2 2019/04/27 12:53:37 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.154.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -129,7 +129,7 @@ __KERNEL_RCSID(0, "$NetBSD: auich.c,v 1. #include <dev/pci/pcivar.h> #include <dev/pci/auichreg.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> Index: src/sys/dev/pci/auixp.c diff -u src/sys/dev/pci/auixp.c:1.45.2.1 src/sys/dev/pci/auixp.c:1.45.2.2 --- src/sys/dev/pci/auixp.c:1.45.2.1 Sat Apr 27 13:10:03 2019 +++ src/sys/dev/pci/auixp.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: auixp.c,v 1.45.2.1 2019/04/27 13:10:03 isaki Exp $ */ +/* $NetBSD: auixp.c,v 1.45.2.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2004, 2005 Reinoud Zandijk <rein...@netbsd.org> @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.45.2.1 2019/04/27 13:10:03 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.45.2.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/types.h> #include <sys/errno.h> @@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1. #include <sys/bus.h> #include <sys/intr.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97var.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/pci/autri.c diff -u src/sys/dev/pci/autri.c:1.56.2.3 src/sys/dev/pci/autri.c:1.56.2.4 --- src/sys/dev/pci/autri.c:1.56.2.3 Sat Apr 27 13:44:32 2019 +++ src/sys/dev/pci/autri.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: autri.c,v 1.56.2.3 2019/04/27 13:44:32 isaki Exp $ */ +/* $NetBSD: autri.c,v 1.56.2.4 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.56.2.3 2019/04/27 13:44:32 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.56.2.4 2019/05/04 07:20:10 isaki Exp $"); #include "midi.h" @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: autri.c,v 1. #include <sys/bus.h> #include <sys/intr.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/pci/auvia.c diff -u src/sys/dev/pci/auvia.c:1.82.2.3 src/sys/dev/pci/auvia.c:1.82.2.4 --- src/sys/dev/pci/auvia.c:1.82.2.3 Fri May 3 06:19:42 2019 +++ src/sys/dev/pci/auvia.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: auvia.c,v 1.82.2.3 2019/05/03 06:19:42 isaki Exp $ */ +/* $NetBSD: auvia.c,v 1.82.2.4 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.82.2.3 2019/05/03 06:19:42 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.82.2.4 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1. #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> Index: src/sys/dev/pci/azalia.c diff -u src/sys/dev/pci/azalia.c:1.86.2.1 src/sys/dev/pci/azalia.c:1.86.2.2 --- src/sys/dev/pci/azalia.c:1.86.2.1 Sun Apr 28 02:15:32 2019 +++ src/sys/dev/pci/azalia.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: azalia.c,v 1.86.2.1 2019/04/28 02:15:32 isaki Exp $ */ +/* $NetBSD: azalia.c,v 1.86.2.2 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.86.2.1 2019/04/28 02:15:32 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.86.2.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1 #include <sys/systm.h> #include <sys/module.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> Index: src/sys/dev/pci/cmpci.c diff -u src/sys/dev/pci/cmpci.c:1.53.2.2 src/sys/dev/pci/cmpci.c:1.53.2.3 --- src/sys/dev/pci/cmpci.c:1.53.2.2 Sun Apr 28 02:19:35 2019 +++ src/sys/dev/pci/cmpci.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cmpci.c,v 1.53.2.2 2019/04/28 02:19:35 isaki Exp $ */ +/* $NetBSD: cmpci.c,v 1.53.2.3 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.53.2.2 2019/04/28 02:19:35 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.53.2.3 2019/05/04 07:20:10 isaki Exp $"); #if defined(AUDIO_DEBUG) || defined(DEBUG) #define DPRINTF(x) if (cmpcidebug) printf x @@ -65,7 +65,7 @@ int cmpcidebug = 0; #include <dev/pci/pcivar.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/pci/cmpcireg.h> Index: src/sys/dev/pci/cs4280.c diff -u src/sys/dev/pci/cs4280.c:1.71.2.1 src/sys/dev/pci/cs4280.c:1.71.2.2 --- src/sys/dev/pci/cs4280.c:1.71.2.1 Sun Apr 21 07:49:16 2019 +++ src/sys/dev/pci/cs4280.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cs4280.c,v 1.71.2.1 2019/04/21 07:49:16 isaki Exp $ */ +/* $NetBSD: cs4280.c,v 1.71.2.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.71.2.1 2019/04/21 07:49:16 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.71.2.2 2019/05/04 07:20:10 isaki Exp $"); #include "midi.h" @@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1 #include <sys/bus.h> #include <sys/bswap.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/pci/cs4281.c diff -u src/sys/dev/pci/cs4281.c:1.54.2.1 src/sys/dev/pci/cs4281.c:1.54.2.2 --- src/sys/dev/pci/cs4281.c:1.54.2.1 Sun Apr 21 07:49:16 2019 +++ src/sys/dev/pci/cs4281.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cs4281.c,v 1.54.2.1 2019/04/21 07:49:16 isaki Exp $ */ +/* $NetBSD: cs4281.c,v 1.54.2.2 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.54.2.1 2019/04/21 07:49:16 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.54.2.2 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1 #include <dev/pci/cs428xreg.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/pci/cs428x.c diff -u src/sys/dev/pci/cs428x.c:1.18.14.2 src/sys/dev/pci/cs428x.c:1.18.14.3 --- src/sys/dev/pci/cs428x.c:1.18.14.2 Fri May 3 05:43:47 2019 +++ src/sys/dev/pci/cs428x.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cs428x.c,v 1.18.14.2 2019/05/03 05:43:47 isaki Exp $ */ +/* $NetBSD: cs428x.c,v 1.18.14.3 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -33,7 +33,7 @@ /* Common functions for CS4280 and CS4281 */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.18.14.2 2019/05/03 05:43:47 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.18.14.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1 #include <sys/audioio.h> #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/pci/eap.c diff -u src/sys/dev/pci/eap.c:1.99.2.3 src/sys/dev/pci/eap.c:1.99.2.4 --- src/sys/dev/pci/eap.c:1.99.2.3 Tue Apr 30 06:05:02 2019 +++ src/sys/dev/pci/eap.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: eap.c,v 1.99.2.3 2019/04/30 06:05:02 isaki Exp $ */ +/* $NetBSD: eap.c,v 1.99.2.4 2019/05/04 07:20:10 isaki Exp $ */ /* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */ /* @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.99.2.3 2019/04/30 06:05:02 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.99.2.4 2019/05/04 07:20:10 isaki Exp $"); #include "midi.h" #include "joy_eap.h" @@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.99 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/pci/pcidevs.h> Index: src/sys/dev/pci/emuxki.c diff -u src/sys/dev/pci/emuxki.c:1.67.2.6 src/sys/dev/pci/emuxki.c:1.67.2.7 --- src/sys/dev/pci/emuxki.c:1.67.2.6 Fri May 3 06:19:42 2019 +++ src/sys/dev/pci/emuxki.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: emuxki.c,v 1.67.2.6 2019/05/03 06:19:42 isaki Exp $ */ +/* $NetBSD: emuxki.c,v 1.67.2.7 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.67.2.6 2019/05/03 06:19:42 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.67.2.7 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1 #include <sys/bus.h> #include <sys/intr.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> Index: src/sys/dev/pci/esa.c diff -u src/sys/dev/pci/esa.c:1.63.2.3 src/sys/dev/pci/esa.c:1.63.2.4 --- src/sys/dev/pci/esa.c:1.63.2.3 Sat May 4 04:13:24 2019 +++ src/sys/dev/pci/esa.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: esa.c,v 1.63.2.3 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: esa.c,v 1.63.2.4 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2001-2008 Jared D. McNeill <jmcne...@invisible.ca> @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.63.2.3 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.63.2.4 2019/05/04 07:20:10 isaki Exp $"); #include <sys/types.h> #include <sys/errno.h> @@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.63 #include <sys/bus.h> #include <sys/intr.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97var.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/pci/esm.c diff -u src/sys/dev/pci/esm.c:1.61.2.2 src/sys/dev/pci/esm.c:1.61.2.3 --- src/sys/dev/pci/esm.c:1.61.2.2 Sun Apr 28 03:33:26 2019 +++ src/sys/dev/pci/esm.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: esm.c,v 1.61.2.2 2019/04/28 03:33:26 isaki Exp $ */ +/* $NetBSD: esm.c,v 1.61.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2002, 2003 Matt Fredette @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.61.2.2 2019/04/28 03:33:26 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.61.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.61 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97var.h> #include <dev/ic/ac97reg.h> Index: src/sys/dev/pci/eso.c diff -u src/sys/dev/pci/eso.c:1.69.2.3 src/sys/dev/pci/eso.c:1.69.2.4 --- src/sys/dev/pci/eso.c:1.69.2.3 Sun Apr 28 05:07:00 2019 +++ src/sys/dev/pci/eso.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: eso.c,v 1.69.2.3 2019/04/28 05:07:00 isaki Exp $ */ +/* $NetBSD: eso.c,v 1.69.2.4 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.69.2.3 2019/04/28 05:07:00 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.69.2.4 2019/05/04 07:20:10 isaki Exp $"); #include "mpu.h" @@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.69 #include <dev/pci/pcivar.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/mpuvar.h> #include <dev/ic/i8237reg.h> Index: src/sys/dev/pci/fms.c diff -u src/sys/dev/pci/fms.c:1.45.2.2 src/sys/dev/pci/fms.c:1.45.2.3 --- src/sys/dev/pci/fms.c:1.45.2.2 Sun Apr 28 06:36:50 2019 +++ src/sys/dev/pci/fms.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fms.c,v 1.45.2.2 2019/04/28 06:36:50 isaki Exp $ */ +/* $NetBSD: fms.c,v 1.45.2.3 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.45.2.2 2019/04/28 06:36:50 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.45.2.3 2019/05/04 07:20:10 isaki Exp $"); #include "mpu.h" @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.45 #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97var.h> #include <dev/ic/mpuvar.h> Index: src/sys/dev/pci/gcscaudio.c diff -u src/sys/dev/pci/gcscaudio.c:1.16.2.3 src/sys/dev/pci/gcscaudio.c:1.16.2.4 --- src/sys/dev/pci/gcscaudio.c:1.16.2.3 Sat May 4 04:13:24 2019 +++ src/sys/dev/pci/gcscaudio.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: gcscaudio.c,v 1.16.2.3 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: gcscaudio.c,v 1.16.2.4 2019/05/04 07:20:10 isaki Exp $ */ /*- * Copyright (c) 2008 SHIMIZU Ryo <r...@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.16.2.3 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.16.2.4 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: gcscaudio.c, #include <dev/pci/pcivar.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> Index: src/sys/dev/pci/joy_eap.c diff -u src/sys/dev/pci/joy_eap.c:1.13 src/sys/dev/pci/joy_eap.c:1.13.54.1 --- src/sys/dev/pci/joy_eap.c:1.13 Wed Nov 23 23:07:35 2011 +++ src/sys/dev/pci/joy_eap.c Sat May 4 07:20:10 2019 @@ -1,7 +1,7 @@ -/* $NetBSD: joy_eap.c,v 1.13 2011/11/23 23:07:35 jmcneill Exp $ */ +/* $NetBSD: joy_eap.c,v 1.13.54.1 2019/05/04 07:20:10 isaki Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_eap.c,v 1.13 2011/11/23 23:07:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_eap.c,v 1.13.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -10,7 +10,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_eap.c,v #include <sys/audioio.h> #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/pci/eapreg.h> #include <dev/pci/eapvar.h> Index: src/sys/dev/pci/joy_eso.c diff -u src/sys/dev/pci/joy_eso.c:1.15 src/sys/dev/pci/joy_eso.c:1.15.54.1 --- src/sys/dev/pci/joy_eso.c:1.15 Wed Nov 23 23:07:35 2011 +++ src/sys/dev/pci/joy_eso.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: joy_eso.c,v 1.15 2011/11/23 23:07:35 jmcneill Exp $ */ +/* $NetBSD: joy_eso.c,v 1.15.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.15 2011/11/23 23:07:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.15.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> Index: src/sys/dev/pci/mpu_cmpci.c diff -u src/sys/dev/pci/mpu_cmpci.c:1.16 src/sys/dev/pci/mpu_cmpci.c:1.16.54.1 --- src/sys/dev/pci/mpu_cmpci.c:1.16 Wed Nov 23 23:07:35 2011 +++ src/sys/dev/pci/mpu_cmpci.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_cmpci.c,v 1.16 2011/11/23 23:07:35 jmcneill Exp $ */ +/* $NetBSD: mpu_cmpci.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.16 2011/11/23 23:07:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c, #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/pci/pcivar.h> Index: src/sys/dev/pci/mpu_yds.c diff -u src/sys/dev/pci/mpu_yds.c:1.16 src/sys/dev/pci/mpu_yds.c:1.16.54.1 --- src/sys/dev/pci/mpu_yds.c:1.16 Wed Nov 23 23:07:35 2011 +++ src/sys/dev/pci/mpu_yds.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_yds.c,v 1.16 2011/11/23 23:07:35 jmcneill Exp $ */ +/* $NetBSD: mpu_yds.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.16 2011/11/23 23:07:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.16.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/pci/pcireg.h> Index: src/sys/dev/pci/mpu_eso.c diff -u src/sys/dev/pci/mpu_eso.c:1.17 src/sys/dev/pci/mpu_eso.c:1.17.54.1 --- src/sys/dev/pci/mpu_eso.c:1.17 Wed Nov 23 23:07:35 2011 +++ src/sys/dev/pci/mpu_eso.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_eso.c,v 1.17 2011/11/23 23:07:35 jmcneill Exp $ */ +/* $NetBSD: mpu_eso.c,v 1.17.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.17 2011/11/23 23:07:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.17.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/pci/pcireg.h> Index: src/sys/dev/pci/mpu_fms.c diff -u src/sys/dev/pci/mpu_fms.c:1.17 src/sys/dev/pci/mpu_fms.c:1.17.54.1 --- src/sys/dev/pci/mpu_fms.c:1.17 Wed Nov 23 23:07:35 2011 +++ src/sys/dev/pci/mpu_fms.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_fms.c,v 1.17 2011/11/23 23:07:35 jmcneill Exp $ */ +/* $NetBSD: mpu_fms.c,v 1.17.54.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.17 2011/11/23 23:07:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.17.54.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/ac97var.h> Index: src/sys/dev/pci/neo.c diff -u src/sys/dev/pci/neo.c:1.52.2.2 src/sys/dev/pci/neo.c:1.52.2.3 --- src/sys/dev/pci/neo.c:1.52.2.2 Sun Apr 28 07:48:15 2019 +++ src/sys/dev/pci/neo.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: neo.c,v 1.52.2.2 2019/04/28 07:48:15 isaki Exp $ */ +/* $NetBSD: neo.c,v 1.52.2.3 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gand...@vilnya.demon.co.uk> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.52.2.2 2019/04/28 07:48:15 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.52.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.52 #include <sys/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97var.h> Index: src/sys/dev/pci/opl_cmpci.c diff -u src/sys/dev/pci/opl_cmpci.c:1.17 src/sys/dev/pci/opl_cmpci.c:1.17.44.1 --- src/sys/dev/pci/opl_cmpci.c:1.17 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/pci/opl_cmpci.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_cmpci.c,v 1.17 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_cmpci.c,v 1.17.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.17 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.17.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c, #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/pci/opl_fms.c diff -u src/sys/dev/pci/opl_fms.c:1.17 src/sys/dev/pci/opl_fms.c:1.17.44.1 --- src/sys/dev/pci/opl_fms.c:1.17 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/pci/opl_fms.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_fms.c,v 1.17 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_fms.c,v 1.17.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.17 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.17.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/pci/opl_yds.c diff -u src/sys/dev/pci/opl_yds.c:1.17 src/sys/dev/pci/opl_yds.c:1.17.44.1 --- src/sys/dev/pci/opl_yds.c:1.17 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/pci/opl_yds.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_yds.c,v 1.17 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_yds.c,v 1.17.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.17 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.17.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/pci/opl_eso.c diff -u src/sys/dev/pci/opl_eso.c:1.18 src/sys/dev/pci/opl_eso.c:1.18.44.1 --- src/sys/dev/pci/opl_eso.c:1.18 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/pci/opl_eso.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_eso.c,v 1.18 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_eso.c,v 1.18.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.18 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.18.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/pci/opl_sv.c diff -u src/sys/dev/pci/opl_sv.c:1.16 src/sys/dev/pci/opl_sv.c:1.16.44.1 --- src/sys/dev/pci/opl_sv.c:1.16 Mon Apr 9 10:18:17 2012 +++ src/sys/dev/pci/opl_sv.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: opl_sv.c,v 1.16 2012/04/09 10:18:17 plunky Exp $ */ +/* $NetBSD: opl_sv.c,v 1.16.44.1 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.16 2012/04/09 10:18:17 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.16.44.1 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1 #include <sys/bus.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/oplreg.h> #include <dev/ic/oplvar.h> Index: src/sys/dev/pci/sv.c diff -u src/sys/dev/pci/sv.c:1.54.2.2 src/sys/dev/pci/sv.c:1.54.2.3 --- src/sys/dev/pci/sv.c:1.54.2.2 Mon Apr 29 09:30:18 2019 +++ src/sys/dev/pci/sv.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sv.c,v 1.54.2.2 2019/04/29 09:30:18 isaki Exp $ */ +/* $NetBSD: sv.c,v 1.54.2.3 2019/05/04 07:20:10 isaki Exp $ */ /* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */ /* @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.54.2.2 2019/04/29 09:30:18 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.54.2.3 2019/05/04 07:20:10 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.54. #include <dev/pci/pcidevs.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/i8237reg.h> #include <dev/pci/svreg.h> Index: src/sys/dev/pci/yds.c diff -u src/sys/dev/pci/yds.c:1.61.2.3 src/sys/dev/pci/yds.c:1.61.2.4 --- src/sys/dev/pci/yds.c:1.61.2.3 Sat May 4 04:13:24 2019 +++ src/sys/dev/pci/yds.c Sat May 4 07:20:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: yds.c,v 1.61.2.3 2019/05/04 04:13:24 isaki Exp $ */ +/* $NetBSD: yds.c,v 1.61.2.4 2019/05/04 07:20:10 isaki Exp $ */ /* * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.61.2.3 2019/05/04 04:13:24 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.61.2.4 2019/05/04 07:20:10 isaki Exp $"); #include "mpu.h" @@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.61 #include <dev/pci/pcivar.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ac97reg.h> #include <dev/ic/ac97var.h> #include <dev/ic/mpuvar.h> Index: src/sys/dev/sbus/cs4231_sbus.c diff -u src/sys/dev/sbus/cs4231_sbus.c:1.51.2.1 src/sys/dev/sbus/cs4231_sbus.c:1.51.2.2 --- src/sys/dev/sbus/cs4231_sbus.c:1.51.2.1 Sun Apr 21 06:00:00 2019 +++ src/sys/dev/sbus/cs4231_sbus.c Sat May 4 07:20:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231_sbus.c,v 1.51.2.1 2019/04/21 06:00:00 isaki Exp $ */ +/* $NetBSD: cs4231_sbus.c,v 1.51.2.2 2019/05/04 07:20:11 isaki Exp $ */ /*- * Copyright (c) 1998, 1999, 2002, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.51.2.1 2019/04/21 06:00:00 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.51.2.2 2019/05/04 07:20:11 isaki Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4231_sbus. #include <dev/sbus/sbusvar.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/ad1848reg.h> #include <dev/ic/cs4231reg.h> Index: src/sys/dev/sbus/dbri.c diff -u src/sys/dev/sbus/dbri.c:1.39.2.2 src/sys/dev/sbus/dbri.c:1.39.2.3 --- src/sys/dev/sbus/dbri.c:1.39.2.2 Wed May 1 12:18:59 2019 +++ src/sys/dev/sbus/dbri.c Sat May 4 07:20:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dbri.c,v 1.39.2.2 2019/05/01 12:18:59 isaki Exp $ */ +/* $NetBSD: dbri.c,v 1.39.2.3 2019/05/04 07:20:11 isaki Exp $ */ /* * Copyright (C) 1997 Rudolf Koenig (rfkoe...@immd4.informatik.uni-erlangen.de) @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.39.2.2 2019/05/01 12:18:59 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.39.2.3 2019/05/04 07:20:11 isaki Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.3 #include <machine/autoconf.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/cs4215reg.h> #include <dev/ic/cs4215var.h> Index: src/sys/dev/tc/bba.c diff -u src/sys/dev/tc/bba.c:1.42.2.1 src/sys/dev/tc/bba.c:1.42.2.2 --- src/sys/dev/tc/bba.c:1.42.2.1 Mon Apr 22 13:29:34 2019 +++ src/sys/dev/tc/bba.c Sat May 4 07:20:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bba.c,v 1.42.2.1 2019/04/22 13:29:34 isaki Exp $ */ +/* $NetBSD: bba.c,v 1.42.2.2 2019/05/04 07:20:11 isaki Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ /* maxine/alpha baseboard audio (bba) */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.42.2.1 2019/04/22 13:29:34 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.42.2.2 2019/05/04 07:20:11 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.42 #include <sys/cpu.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/ic/am7930reg.h> #include <dev/ic/am7930var.h> Index: src/sys/dev/usb/uaudio.c diff -u src/sys/dev/usb/uaudio.c:1.158.2.3 src/sys/dev/usb/uaudio.c:1.158.2.4 --- src/sys/dev/usb/uaudio.c:1.158.2.3 Wed May 1 13:45:52 2019 +++ src/sys/dev/usb/uaudio.c Sat May 4 07:20:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: uaudio.c,v 1.158.2.3 2019/05/01 13:45:52 isaki Exp $ */ +/* $NetBSD: uaudio.c,v 1.158.2.4 2019/05/04 07:20:11 isaki Exp $ */ /* * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.158.2.3 2019/05/01 13:45:52 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.158.2.4 2019/05/04 07:20:11 isaki Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1 #include <sys/atomic.h> #include <sys/audioio.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> Index: src/sys/rump/dev/lib/libaudio/audio_component.c diff -u src/sys/rump/dev/lib/libaudio/audio_component.c:1.4 src/sys/rump/dev/lib/libaudio/audio_component.c:1.4.12.1 --- src/sys/rump/dev/lib/libaudio/audio_component.c:1.4 Thu Jun 1 09:44:30 2017 +++ src/sys/rump/dev/lib/libaudio/audio_component.c Sat May 4 07:20:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audio_component.c,v 1.4 2017/06/01 09:44:30 pgoyette Exp $ */ +/* $NetBSD: audio_component.c,v 1.4.12.1 2019/05/04 07:20:11 isaki Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio_component.c,v 1.4 2017/06/01 09:44:30 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio_component.c,v 1.4.12.1 2019/05/04 07:20:11 isaki Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: audio_compon #include <sys/mbuf.h> #include <sys/stat.h> -#include <dev/audio_if.h> +#include <dev/audio/audio_if.h> #include <rump-sys/kern.h> #include <rump-sys/vfs.h> Added files: Index: src/sys/dev/audio/audio_if.h diff -u /dev/null src/sys/dev/audio/audio_if.h:1.1.2.1 --- /dev/null Sat May 4 07:20:12 2019 +++ src/sys/dev/audio/audio_if.h Sat May 4 07:20:09 2019 @@ -0,0 +1,280 @@ +/* $NetBSD: audio_if.h,v 1.1.2.1 2019/05/04 07:20:09 isaki Exp $ */ + +/* + * Copyright (c) 1994 Havard Eidnes. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the Computer Systems + * Engineering Group at Lawrence Berkeley Laboratory. + * 4. Neither the name of the University nor of the Laboratory may be used + * to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#ifndef _SYS_DEV_AUDIO_AUDIO_IF_H_ +#define _SYS_DEV_AUDIO_AUDIO_IF_H_ + +#include <sys/types.h> +#include <sys/audioio.h> +#include <sys/mutex.h> + +/* check we have an audio(4) configured into kernel */ +#if defined(_KERNEL_OPT) +#include "audio.h" + +#if (NAUDIO == 0) && (NMIDI == 0) && (NMIDIBUS == 0) +#error "No 'audio* at audiobus?' or 'midi* at midibus?' or similar configured" +#endif + +#endif /* _KERNEL_OPT */ + +/* + * Interfaces for hardware drivers and MI audio. + */ + +struct audio_softc; + +/** + * audio stream format + */ +typedef struct audio_params { + u_int sample_rate; /* sample rate */ + u_int encoding; /* e.g. mu-law, linear, etc */ + u_int precision; /* bits/subframe */ + u_int validbits; /* valid bits in a subframe */ + u_int channels; /* mono(1), stereo(2) */ +} audio_params_t; + +#define AUFMT_INVALIDATE(fmt) (fmt)->mode |= 0x80000000 +#define AUFMT_VALIDATE(fmt) (fmt)->mode &= 0x7fffffff +#define AUFMT_IS_VALID(fmt) (((fmt)->mode & 0x80000000) == 0) + +/** + * audio stream buffer + */ +typedef struct audio_stream { + size_t bufsize; /* allocated memory */ + uint8_t *start; /* start of buffer area */ + uint8_t *end; /* end of valid buffer area */ + uint8_t *inp; /* address to be written next */ + const uint8_t *outp; /* address to be read next */ + int used; /* valid data size in this stream */ + audio_params_t param; /* represents this stream */ + bool loop; +} audio_stream_t; + +static __inline int +audio_stream_get_space(const audio_stream_t *s) +{ + if (s) + return (s->end - s->start) - s->used; + return 0; +} + +static __inline int +audio_stream_get_used(const audio_stream_t *s) +{ + return s ? s->used : 0; +} + +static __inline uint8_t * +audio_stream_add_inp(audio_stream_t *s, uint8_t *v, int diff) +{ + s->used += diff; + v += diff; + if (v >= s->end) + v -= s->end - s->start; + return v; +} + +static __inline const uint8_t * +audio_stream_add_outp(audio_stream_t *s, const uint8_t *v, int diff) +{ + s->used -= diff; + v += diff; + if (v >= s->end) + v -= s->end - s->start; + return v; +} + +/** + * an interface to fill a audio stream buffer + */ +typedef struct stream_fetcher { + int (*fetch_to)(struct audio_softc *, struct stream_fetcher *, + audio_stream_t *, int); +} stream_fetcher_t; + +/** + * audio stream filter. + * This must be an extension of stream_fetcher_t. + */ +typedef struct stream_filter { +/* public: */ + stream_fetcher_t base; + void (*dtor)(struct stream_filter *); + void (*set_fetcher)(struct stream_filter *, stream_fetcher_t *); + void (*set_inputbuffer)(struct stream_filter *, audio_stream_t *); +/* private: */ + stream_fetcher_t *prev; + audio_stream_t *src; +} stream_filter_t; + +/** + * factory method for stream_filter_t + */ +typedef stream_filter_t *stream_filter_factory_t(struct audio_softc *, + const audio_params_t *, const audio_params_t *); + +/** + * filter pipeline request + * + * filters[0] is the first filter for playing or the last filter for recording. + * The audio_params_t instance for the hardware is filters[0].param. + */ +#ifndef AUDIO_MAX_FILTERS +# define AUDIO_MAX_FILTERS 8 +#endif +typedef struct stream_filter_list { + void (*append)(struct stream_filter_list *, stream_filter_factory_t, + const audio_params_t *); + void (*prepend)(struct stream_filter_list *, stream_filter_factory_t, + const audio_params_t *); + void (*set)(struct stream_filter_list *, int, stream_filter_factory_t, + const audio_params_t *); + int req_size; + struct stream_filter_req { + stream_filter_factory_t *factory; + audio_params_t param; /* from-param for recording, + to-param for playing */ + } filters[AUDIO_MAX_FILTERS]; +} stream_filter_list_t; + +#include <dev/audio/audiofil.h> + +struct audio_hw_if { + int (*open)(void *, int); /* open hardware */ + void (*close)(void *); /* close hardware */ + + int (*query_format)(void *, audio_format_query_t *); + int (*set_format)(void *, int, + const audio_params_t *, const audio_params_t *, + audio_filter_reg_t *, audio_filter_reg_t *); + + /* Hardware may have some say in the blocksize to choose */ + int (*round_blocksize)(void *, int, int, const audio_params_t *); + + /* + * Changing settings may require taking device out of "data mode", + * which can be quite expensive. Also, audiosetinfo() may + * change several settings in quick succession. To avoid + * having to take the device in/out of "data mode", we provide + * this function which indicates completion of settings + * adjustment. + */ + int (*commit_settings)(void *); + + /* Start input/output routines. These usually control DMA. */ + int (*init_output)(void *, void *, int); + int (*init_input)(void *, void *, int); + int (*start_output)(void *, void *, int, + void (*)(void *), void *); + int (*start_input)(void *, void *, int, + void (*)(void *), void *); + int (*halt_output)(void *); + int (*halt_input)(void *); + + int (*speaker_ctl)(void *, int); +#define SPKR_ON 1 +#define SPKR_OFF 0 + + int (*getdev)(void *, struct audio_device *); + + /* Mixer (in/out ports) */ + int (*set_port)(void *, mixer_ctrl_t *); + int (*get_port)(void *, mixer_ctrl_t *); + + int (*query_devinfo)(void *, mixer_devinfo_t *); + + /* Allocate/free memory for the ring buffer. Usually malloc/free. */ + void *(*allocm)(void *, int, size_t); + void (*freem)(void *, void *, size_t); + size_t (*round_buffersize)(void *, int, size_t); + + int (*get_props)(void *); /* device properties */ + + int (*trigger_output)(void *, void *, void *, int, + void (*)(void *), void *, const audio_params_t *); + int (*trigger_input)(void *, void *, void *, int, + void (*)(void *), void *, const audio_params_t *); + int (*dev_ioctl)(void *, u_long, void *, int, struct lwp *); + void (*get_locks)(void *, kmutex_t **, kmutex_t **); + +}; + +struct audio_attach_args { + int type; + const void *hwif; /* either audio_hw_if * or midi_hw_if * */ + void *hdl; +}; +#define AUDIODEV_TYPE_AUDIO 0 +#define AUDIODEV_TYPE_MIDI 1 +#define AUDIODEV_TYPE_OPL 2 +#define AUDIODEV_TYPE_MPU 3 +#define AUDIODEV_TYPE_AUX 4 + +/* Attach the MI driver(s) to the MD driver. */ +device_t audio_attach_mi(const struct audio_hw_if *, void *, device_t); +int audioprint(void *, const char *); + +extern int audio_query_format(const struct audio_format *, int, + audio_format_query_t *); +extern int audio_indexof_format(const struct audio_format *, int, int, + const audio_params_t *); +extern const char *audio_encoding_name(int); + +/* Device identity flags */ +#define SOUND_DEVICE 0 +#define AUDIO_DEVICE 0x80 +#define AUDIOCTL_DEVICE 0xc0 +#define MIXER_DEVICE 0x10 + +#define AUDIOUNIT(x) (minor(x)&0x0f) +#define AUDIODEV(x) (minor(x)&0xf0) + +#define ISDEVSOUND(x) (AUDIODEV((x)) == SOUND_DEVICE) +#define ISDEVAUDIO(x) (AUDIODEV((x)) == AUDIO_DEVICE) +#define ISDEVAUDIOCTL(x) (AUDIODEV((x)) == AUDIOCTL_DEVICE) +#define ISDEVMIXER(x) (AUDIODEV((x)) == MIXER_DEVICE) + +/* + * USB Audio specification defines 12 channels: + * L R C LFE Ls Rs Lc Rc S Sl Sr T + */ +#define AUDIO_MAX_CHANNELS 12 + +#endif /* _SYS_DEV_AUDIO_AUDIO_IF_H_ */ +