Module Name: src Committed By: uebayasi Date: Fri Oct 10 17:21:20 UTC 2014
Modified Files: src/sys/conf: files src/sys/dev: files.audio Log Message: Normalize audio related definitions. To generate a diff of this commit: cvs rdiff -u -r1.1116 -r1.1117 src/sys/conf/files cvs rdiff -u -r1.1 -r1.2 src/sys/dev/files.audio Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1116 src/sys/conf/files:1.1117 --- src/sys/conf/files:1.1116 Fri Oct 10 12:46:32 2014 +++ src/sys/conf/files Fri Oct 10 17:21:20 2014 @@ -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 @@ include "conf/majors" # generic attributes # -define audiobus { } -define midibus { } -define midisyn define videobus { } define ata {[channel = -1]} define sata Index: src/sys/dev/files.audio diff -u src/sys/dev/files.audio:1.1 src/sys/dev/files.audio:1.2 --- src/sys/dev/files.audio:1.1 Fri Oct 10 12:29:28 2014 +++ src/sys/dev/files.audio Fri Oct 10 17:21:20 2014 @@ -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 @@ define aurateconv # 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