Module Name: src
Committed By: pooka
Date: Sat May 1 23:19:56 UTC 2010
Added Files:
src/sys/rump/dev/lib/libaudio: AUDIO.ioconf Makefile audio.h
aurateconv.h component.c midi.h mulaw.h shlib_version
Log Message:
add audio(4) support
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libaudio/AUDIO.ioconf \
src/sys/rump/dev/lib/libaudio/Makefile \
src/sys/rump/dev/lib/libaudio/audio.h \
src/sys/rump/dev/lib/libaudio/aurateconv.h \
src/sys/rump/dev/lib/libaudio/component.c \
src/sys/rump/dev/lib/libaudio/midi.h \
src/sys/rump/dev/lib/libaudio/mulaw.h \
src/sys/rump/dev/lib/libaudio/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libaudio/AUDIO.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libaudio/AUDIO.ioconf:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/AUDIO.ioconf Sat May 1 23:19:56 2010
@@ -0,0 +1,10 @@
+# $NetBSD: AUDIO.ioconf,v 1.1 2010/05/01 23:19:56 pooka Exp $
+#
+
+ioconf audio
+
+include "conf/files"
+
+pseudo-root audiobus*
+
+audio* at audiobus?
Index: src/sys/rump/dev/lib/libaudio/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libaudio/Makefile:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/Makefile Sat May 1 23:19:56 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/05/01 23:19:56 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../dev
+
+LIB= rumpdev_audio
+IOCONF= AUDIO.ioconf
+
+SRCS= audio.c auconv.c aurateconv.c mulaw.c
+SRCS+= component.c
+
+CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libaudio/audio.h
diff -u /dev/null src/sys/rump/dev/lib/libaudio/audio.h:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/audio.h Sat May 1 23:19:56 2010
@@ -0,0 +1,3 @@
+/* $NetBSD: audio.h,v 1.1 2010/05/01 23:19:56 pooka Exp $ */
+
+#define NAUDIO 1
Index: src/sys/rump/dev/lib/libaudio/aurateconv.h
diff -u /dev/null src/sys/rump/dev/lib/libaudio/aurateconv.h:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/aurateconv.h Sat May 1 23:19:56 2010
@@ -0,0 +1,3 @@
+/* $NetBSD: aurateconv.h,v 1.1 2010/05/01 23:19:56 pooka Exp $ */
+
+#define NAURATECONV 1
Index: src/sys/rump/dev/lib/libaudio/component.c
diff -u /dev/null src/sys/rump/dev/lib/libaudio/component.c:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/component.c Sat May 1 23:19:56 2010
@@ -0,0 +1,58 @@
+/* $NetBSD: component.c,v 1.1 2010/05/01 23:19:56 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2010/05/01 23:19:56 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/mbuf.h>
+#include <sys/stat.h>
+
+#include "ioconf.c"
+
+#include "rump_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct cdevsw audio_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ config_init_component(cfdriver_ioconf_audio,
+ cfattach_ioconf_audio, cfdata_ioconf_audio);
+
+ bmaj = cmaj = NODEVMAJOR;
+ if ((error = devsw_attach("audio", NULL, &bmaj,
+ &audio_cdevsw, &cmaj)) != 0)
+ panic("audio devsw attach failed: %d", error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/audio", '0',
+ cmaj, 0, 4)) !=0)
+ panic("cannot create audio device nodes: %d", error);
+}
Index: src/sys/rump/dev/lib/libaudio/midi.h
diff -u /dev/null src/sys/rump/dev/lib/libaudio/midi.h:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/midi.h Sat May 1 23:19:56 2010
@@ -0,0 +1 @@
+/* $NetBSD: midi.h,v 1.1 2010/05/01 23:19:56 pooka Exp $ */
Index: src/sys/rump/dev/lib/libaudio/mulaw.h
diff -u /dev/null src/sys/rump/dev/lib/libaudio/mulaw.h:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/mulaw.h Sat May 1 23:19:56 2010
@@ -0,0 +1,3 @@
+/* $NetBSD: mulaw.h,v 1.1 2010/05/01 23:19:56 pooka Exp $ */
+
+#define NMULAW 1
Index: src/sys/rump/dev/lib/libaudio/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libaudio/shlib_version:1.1
--- /dev/null Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/shlib_version Sat May 1 23:19:56 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/05/01 23:19:56 pooka Exp $
+#
+major=0
+minor=0
