Module Name: src
Committed By: isaki
Date: Fri May 3 05:43:47 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi [isaki-audio2]: sunxi_codec.h
src/sys/arch/i386/pnpbios [isaki-audio2]: ess_pnpbios.c sb_pnpbios.c
ym_pnpbios.c
src/sys/dev [isaki-audio2]: files.audio
src/sys/dev/hdaudio [isaki-audio2]: hdaudiovar.h
src/sys/dev/isa [isaki-audio2]: ad1848_isa.c sb_isa.c
src/sys/dev/isapnp [isaki-audio2]: ess_isapnp.c gus_isapnp.c
mpu_isapnp.c sb_isapnp.c
src/sys/dev/ofisa [isaki-audio2]: ess_ofisa.c sb_ofisa.c
src/sys/dev/pci [isaki-audio2]: cs428x.c
src/sys/dev/usb [isaki-audio2]: umidi.c umidi_quirks.c
Removed Files:
src/sys/dev [isaki-audio2]: auconv.c auconv.h mulaw.h
Log Message:
Remove dev/auconv.[ch].
Now it is handled in dev/audio/audio.c and dev/audio/linear.c.
Remove dev/mulaw.h.
It already have been just a link to dev/audio/mulaw.h in this
branch.
To generate a diff of this commit:
cvs rdiff -u -r1.4.8.1 -r1.4.8.2 src/sys/arch/arm/sunxi/sunxi_codec.h
cvs rdiff -u -r1.22 -r1.22.56.1 src/sys/arch/i386/pnpbios/ess_pnpbios.c
cvs rdiff -u -r1.17 -r1.17.20.1 src/sys/arch/i386/pnpbios/sb_pnpbios.c
cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/arch/i386/pnpbios/ym_pnpbios.c
cvs rdiff -u -r1.37.2.1 -r0 src/sys/dev/auconv.c
cvs rdiff -u -r1.21.8.1 -r0 src/sys/dev/auconv.h
cvs rdiff -u -r1.11.16.1 -r1.11.16.2 src/sys/dev/files.audio
cvs rdiff -u -r1.25.8.1 -r0 src/sys/dev/mulaw.h
cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/dev/hdaudio/hdaudiovar.h
cvs rdiff -u -r1.38 -r1.38.54.1 src/sys/dev/isa/ad1848_isa.c \
src/sys/dev/isa/sb_isa.c
cvs rdiff -u -r1.22 -r1.22.64.1 src/sys/dev/isapnp/ess_isapnp.c
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.20 -r1.20.52.1 src/sys/dev/isapnp/mpu_isapnp.c
cvs rdiff -u -r1.52 -r1.52.96.1 src/sys/dev/isapnp/sb_isapnp.c
cvs rdiff -u -r1.27 -r1.27.20.1 src/sys/dev/ofisa/ess_ofisa.c
cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/dev/ofisa/sb_ofisa.c
cvs rdiff -u -r1.18.14.1 -r1.18.14.2 src/sys/dev/pci/cs428x.c
cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.21 -r1.21.20.1 src/sys/dev/usb/umidi_quirks.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/arm/sunxi/sunxi_codec.h
diff -u src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.1 src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.2
--- src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.1 Sat Apr 27 05:30:37 2019
+++ src/sys/arch/arm/sunxi/sunxi_codec.h Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_codec.h,v 1.4.8.1 2019/04/27 05:30:37 isaki Exp $ */
+/* $NetBSD: sunxi_codec.h,v 1.4.8.2 2019/05/03 05:43:46 isaki Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -31,7 +31,6 @@
#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <dev/auconv.h>
#include <dev/fdt/fdtvar.h>
Index: src/sys/arch/i386/pnpbios/ess_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22.56.1
--- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22 Fri Jul 1 18:14:15 2011
+++ src/sys/arch/i386/pnpbios/ess_pnpbios.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_pnpbios.c,v 1.22 2011/07/01 18:14:15 dyoung Exp $ */
+/* $NetBSD: ess_pnpbios.c,v 1.22.56.1 2019/05/03 05:43:46 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 2011/07/01 18:14:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.c,v 1.22.56.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.
#include <sys/audioio.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/i386/pnpbios/sb_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17 src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17.20.1
--- src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17 Mon Jul 11 11:31:49 2016
+++ src/sys/arch/i386/pnpbios/sb_pnpbios.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_pnpbios.c,v 1.17 2016/07/11 11:31:49 msaitoh Exp $ */
+/* $NetBSD: sb_pnpbios.c,v 1.17.20.1 2019/05/03 05:43:46 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 2016/07/11 11:31:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c,v 1.17.20.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c
#include <sys/audioio.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.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 src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18.20.1
--- src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18 Thu Jul 14 10:19:05 2016
+++ src/sys/arch/i386/pnpbios/ym_pnpbios.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_pnpbios.c,v 1.18 2016/07/14 10:19:05 msaitoh Exp $ */
+/* $NetBSD: ym_pnpbios.c,v 1.18.20.1 2019/05/03 05:43:46 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 2016/07/14 10:19:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c,v 1.18.20.1 2019/05/03 05:43:46 isaki Exp $");
#include "mpu_ym.h"
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c
#include <sys/audioio.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/dev/files.audio
diff -u src/sys/dev/files.audio:1.11.16.1 src/sys/dev/files.audio:1.11.16.2
--- src/sys/dev/files.audio:1.11.16.1 Sun Apr 21 04:28:59 2019
+++ src/sys/dev/files.audio Fri May 3 05:43:46 2019
@@ -1,16 +1,12 @@
-# $NetBSD: files.audio,v 1.11.16.1 2019/04/21 04:28:59 isaki Exp $
+# $NetBSD: files.audio,v 1.11.16.2 2019/05/03 05:43:46 isaki Exp $
define audiobus { }
define midibus { }
define midisyn
-# audio device attributes
-#
-define auconv
-
# audio and midi devices, attaches to audio hardware driver
#
-device audio {}: audiodev, auconv
+device audio {}: audiodev
attach audio at audiobus
device midi: audio
attach midi at midibus
@@ -22,7 +18,6 @@ define audiobell
file dev/audio/alaw.c audio
file dev/audio/linear.c audio
-file dev/auconv.c auconv
file dev/audio/audio.c audio needs-flag
file dev/audiobell.c spkr_audio needs-flag
file dev/audio/mulaw.c audio
Index: src/sys/dev/hdaudio/hdaudiovar.h
diff -u src/sys/dev/hdaudio/hdaudiovar.h:1.6 src/sys/dev/hdaudio/hdaudiovar.h:1.6.6.1
--- src/sys/dev/hdaudio/hdaudiovar.h:1.6 Thu Apr 19 21:50:08 2018
+++ src/sys/dev/hdaudio/hdaudiovar.h Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudiovar.h,v 1.6 2018/04/19 21:50:08 christos Exp $ */
+/* $NetBSD: hdaudiovar.h,v 1.6.6.1 2019/05/03 05:43:46 isaki Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <[email protected]>
@@ -32,7 +32,7 @@
#ifndef _HDAUDIOVAR_H
#define _HDAUDIOVAR_H
-#include <dev/auconv.h>
+#include <dev/audio_if.h>
#ifdef _KERNEL_OPT
#include "opt_hdaudio.h"
Index: src/sys/dev/isa/ad1848_isa.c
diff -u src/sys/dev/isa/ad1848_isa.c:1.38 src/sys/dev/isa/ad1848_isa.c:1.38.54.1
--- src/sys/dev/isa/ad1848_isa.c:1.38 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/ad1848_isa.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848_isa.c,v 1.38 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: ad1848_isa.c,v 1.38.54.1 2019/05/03 05:43:46 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 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.38.54.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,6 @@ __KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c
#include <sys/malloc.h>
#include <dev/audio_if.h>
-#include <dev/auconv.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/dev/isa/sb_isa.c
diff -u src/sys/dev/isa/sb_isa.c:1.38 src/sys/dev/isa/sb_isa.c:1.38.54.1
--- src/sys/dev/isa/sb_isa.c:1.38 Thu Nov 24 03:35:58 2011
+++ src/sys/dev/isa/sb_isa.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isa.c,v 1.38 2011/11/24 03:35:58 mrg Exp $ */
+/* $NetBSD: sb_isa.c,v 1.38.54.1 2019/05/03 05:43:46 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 2011/11/24 03:35:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.38.54.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1
#include <sys/audioio.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.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 src/sys/dev/isapnp/ess_isapnp.c:1.22.64.1
--- src/sys/dev/isapnp/ess_isapnp.c:1.22 Sat May 22 16:35:00 2010
+++ src/sys/dev/isapnp/ess_isapnp.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isapnp.c,v 1.22 2010/05/22 16:35:00 tsutsui Exp $ */
+/* $NetBSD: ess_isapnp.c,v 1.22.64.1 2019/05/03 05:43:46 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 2010/05/22 16:35:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.22.64.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c
#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <dev/mulaw.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.1 src/sys/dev/isapnp/gus_isapnp.c:1.39.2.2
--- src/sys/dev/isapnp/gus_isapnp.c:1.39.2.1 Sun Apr 21 06:00:00 2019
+++ src/sys/dev/isapnp/gus_isapnp.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.39.2.1 2019/04/21 06:00:00 isaki Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.39.2.2 2019/05/03 05:43:46 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.1 2019/04/21 06:00:00 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.39.2.2 2019/05/03 05:43:46 isaki Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c
#include <dev/audio_if.h>
#include <dev/audiovar.h>
-#include <dev/mulaw.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 src/sys/dev/isapnp/mpu_isapnp.c:1.20.52.1
--- src/sys/dev/isapnp/mpu_isapnp.c:1.20 Wed Dec 7 17:35:01 2011
+++ src/sys/dev/isapnp/mpu_isapnp.c Fri May 3 05:43:46 2019
@@ -1,7 +1,7 @@
-/* $NetBSD: mpu_isapnp.c,v 1.20 2011/12/07 17:35:01 jakllsch Exp $ */
+/* $NetBSD: mpu_isapnp.c,v 1.20.52.1 2019/05/03 05:43:46 isaki Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.20 2011/12/07 17:35:01 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.20.52.1 2019/05/03 05:43:46 isaki Exp $");
#include "midi.h"
@@ -17,7 +17,6 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/dev/isapnp/sb_isapnp.c
diff -u src/sys/dev/isapnp/sb_isapnp.c:1.52 src/sys/dev/isapnp/sb_isapnp.c:1.52.96.1
--- src/sys/dev/isapnp/sb_isapnp.c:1.52 Sat Mar 15 21:09:02 2008
+++ src/sys/dev/isapnp/sb_isapnp.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isapnp.c,v 1.52 2008/03/15 21:09:02 cube Exp $ */
+/* $NetBSD: sb_isapnp.c,v 1.52.96.1 2019/05/03 05:43:46 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 2008/03/15 21:09:02 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.52.96.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,
#include <sys/audioio.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.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 src/sys/dev/ofisa/ess_ofisa.c:1.27.20.1
--- src/sys/dev/ofisa/ess_ofisa.c:1.27 Fri Dec 9 17:18:35 2016
+++ src/sys/dev/ofisa/ess_ofisa.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_ofisa.c,v 1.27 2016/12/09 17:18:35 christos Exp $ */
+/* $NetBSD: ess_ofisa.c,v 1.27.20.1 2019/05/03 05:43:46 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 2016/12/09 17:18:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.27.20.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,
#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <dev/mulaw.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 src/sys/dev/ofisa/sb_ofisa.c:1.18.20.1
--- src/sys/dev/ofisa/sb_ofisa.c:1.18 Fri Dec 9 17:18:35 2016
+++ src/sys/dev/ofisa/sb_ofisa.c Fri May 3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_ofisa.c,v 1.18 2016/12/09 17:18:35 christos Exp $ */
+/* $NetBSD: sb_ofisa.c,v 1.18.20.1 2019/05/03 05:43:46 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 2016/12/09 17:18:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.18.20.1 2019/05/03 05:43:46 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v
#include <sys/audioio.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
Index: src/sys/dev/pci/cs428x.c
diff -u src/sys/dev/pci/cs428x.c:1.18.14.1 src/sys/dev/pci/cs428x.c:1.18.14.2
--- src/sys/dev/pci/cs428x.c:1.18.14.1 Sun Apr 21 07:49:16 2019
+++ src/sys/dev/pci/cs428x.c Fri May 3 05:43:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cs428x.c,v 1.18.14.1 2019/04/21 07:49:16 isaki Exp $ */
+/* $NetBSD: cs428x.c,v 1.18.14.2 2019/05/03 05:43:47 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.1 2019/04/21 07:49:16 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.18.14.2 2019/05/03 05:43:47 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,8 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1
#include <dev/audio_if.h>
#include <dev/midi_if.h>
-#include <dev/mulaw.h>
-#include <dev/auconv.h>
#include <dev/ic/ac97reg.h>
#include <dev/ic/ac97var.h>
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.76 src/sys/dev/usb/umidi.c:1.76.2.1
--- src/sys/dev/usb/umidi.c:1.76 Thu Feb 7 13:20:41 2019
+++ src/sys/dev/usb/umidi.c Fri May 3 05:43:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.76 2019/02/07 13:20:41 skrll Exp $ */
+/* $NetBSD: umidi.c,v 1.76.2.1 2019/05/03 05:43:47 isaki Exp $ */
/*
* Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.76 2019/02/07 13:20:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.76.2.1 2019/05/03 05:43:47 isaki Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/auconv.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/umidi_quirks.h>
#include <dev/midi_if.h>
Index: src/sys/dev/usb/umidi_quirks.c
diff -u src/sys/dev/usb/umidi_quirks.c:1.21 src/sys/dev/usb/umidi_quirks.c:1.21.20.1
--- src/sys/dev/usb/umidi_quirks.c:1.21 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/umidi_quirks.c Fri May 3 05:43:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.21 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.21.20.1 2019/05/03 05:43:47 isaki Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.21 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.21.20.1 2019/05/03 05:43:47 isaki Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: umidi_quirks
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
+#include <sys/audioio.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
@@ -52,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: umidi_quirks
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
-#include <dev/auconv.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/uaudioreg.h>
#include <dev/usb/umidi_quirks.h>
