[src/trunk]: src/sys Normalize audio related definitions.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e54b538c94c0
branches:  trunk
changeset: 332849:e54b538c94c0
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Oct 10 17:21:20 2014 +0000

description:
Normalize audio related definitions.

diffstat:

 sys/conf/files      |   5 +----
 sys/dev/files.audio |  16 ++++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (60 lines):

diff -r c0ac7187d018 -r e54b538c94c0 sys/conf/files
--- a/sys/conf/files    Fri Oct 10 17:09:18 2014 +0000
+++ b/sys/conf/files    Fri Oct 10 17:21:20 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1116 2014/10/10 12:46:32 uebayasi Exp $
+#      $NetBSD: files,v 1.1117 2014/10/10 17:21:20 uebayasi Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20141010
@@ -297,9 +297,6 @@
 
 # generic attributes
 #
-define audiobus        { }
-define midibus         { }
-define midisyn
 define videobus        { }
 define ata             {[channel = -1]}
 define sata
diff -r c0ac7187d018 -r e54b538c94c0 sys/dev/files.audio
--- a/sys/dev/files.audio       Fri Oct 10 17:09:18 2014 +0000
+++ b/sys/dev/files.audio       Fri Oct 10 17:21:20 2014 +0000
@@ -1,8 +1,12 @@
-#      $NetBSD: files.audio,v 1.1 2014/10/10 12:29:28 uebayasi Exp $
+#      $NetBSD: files.audio,v 1.2 2014/10/10 17:21:20 uebayasi Exp $
+
+define audiobus        { }
+define midibus         { }
+define midisyn
 
 # audio device attributes
 #
-define mulaw
+define mulaw: auconv
 define auconv
 define aurateconv
 
@@ -10,18 +14,18 @@
 #
 device audio: audiodev
 attach audio at audiobus
-device midi
+device midi: audio
 attach midi at midibus
 
 # console bell via audio device
 #
 define audiobell
 
-file   dev/auconv.c                    auconv | mulaw
-file   dev/audio.c                     audio | midi | midibus  needs-flag
+file   dev/auconv.c                    auconv
+file   dev/audio.c                     audio                   needs-flag
 file   dev/audiobell.c                 audiobell
 file   dev/aurateconv.c                aurateconv              needs-flag
-file   dev/midi.c                      midi | midibus          needs-flag
+file   dev/midi.c                      midi                    needs-flag
 file   dev/midictl.c                   midisyn
 file   dev/midisyn.c                   midisyn
 file   dev/mulaw.c                     mulaw                   needs-flag