Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/rump/dev/lib/libaudio rename component.c -> audio_compon...
details: https://anonhg.NetBSD.org/src/rev/cbb32dae86b3
branches: trunk
changeset: 327637:cbb32dae86b3
user: pooka <pooka%NetBSD.org@localhost>
date: Thu Mar 13 01:57:52 2014 +0000
description:
rename component.c -> audio_component.c
diffstat:
sys/rump/dev/lib/libaudio/Makefile | 4 +-
sys/rump/dev/lib/libaudio/audio_component.c | 69 +++++++++++++++++++++++++++++
sys/rump/dev/lib/libaudio/component.c | 69 -----------------------------
3 files changed, 71 insertions(+), 71 deletions(-)
diffs (164 lines):
diff -r 3f6251209a76 -r cbb32dae86b3 sys/rump/dev/lib/libaudio/Makefile
--- a/sys/rump/dev/lib/libaudio/Makefile Thu Mar 13 01:57:29 2014 +0000
+++ b/sys/rump/dev/lib/libaudio/Makefile Thu Mar 13 01:57:52 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/05/01 23:19:56 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:57:52 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@
IOCONF= AUDIO.ioconf
SRCS= audio.c auconv.c aurateconv.c mulaw.c
-SRCS+= component.c
+SRCS+= audio_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
diff -r 3f6251209a76 -r cbb32dae86b3 sys/rump/dev/lib/libaudio/audio_component.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libaudio/audio_component.c Thu Mar 13 01:57:52 2014 +0000
@@ -0,0 +1,69 @@
+/* $NetBSD: audio_component.c,v 1.1 2014/03/13 01:57:52 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: audio_component.c,v 1.1 2014/03/13 01:57:52 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/mbuf.h>
+#include <sys/stat.h>
+
+#include <dev/audio_if.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, AUDIO_DEVICE, 4)) !=0)
+ panic("cannot create audio device nodes: %d", error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/sound", '0',
+ cmaj, SOUND_DEVICE, 4)) !=0)
+ panic("cannot create sound device nodes: %d", error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/audioctl", '0',
+ cmaj, AUDIOCTL_DEVICE, 4)) !=0)
+ panic("cannot create audioctl device nodes: %d", error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/mixer", '0',
+ cmaj, MIXER_DEVICE, 4)) !=0)
+ panic("cannot create mixer device nodes: %d", error);
+}
diff -r 3f6251209a76 -r cbb32dae86b3 sys/rump/dev/lib/libaudio/component.c
--- a/sys/rump/dev/lib/libaudio/component.c Thu Mar 13 01:57:29 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/* $NetBSD: component.c,v 1.2 2011/02/25 19:27:05 riz 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.2 2011/02/25 19:27:05 riz Exp $");
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/mbuf.h>
-#include <sys/stat.h>
-
-#include <dev/audio_if.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, AUDIO_DEVICE, 4)) !=0)
- panic("cannot create audio device nodes: %d", error);
- if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/sound", '0',
- cmaj, SOUND_DEVICE, 4)) !=0)
- panic("cannot create sound device nodes: %d", error);
- if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/audioctl", '0',
- cmaj, AUDIOCTL_DEVICE, 4)) !=0)
- panic("cannot create audioctl device nodes: %d", error);
- if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/mixer", '0',
- cmaj, MIXER_DEVICE, 4)) !=0)
- panic("cannot create mixer device nodes: %d", error);
-}
Home |
Main Index |
Thread Index |
Old Index