Module Name: src
Committed By: pooka
Date: Tue Nov 18 08:43:03 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libpci_eap: Makefile PCI_EAP.ioconf eap_at_pci.c
joy_eap.h shlib_version
Log Message:
Add eap PCI audio driver.
tested by playing audio with rump kernel booted on qemu with -soundhw es1370
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_eap/Makefile \
src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf \
src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c \
src/sys/rump/dev/lib/libpci_eap/joy_eap.h \
src/sys/rump/dev/lib/libpci_eap/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.15 src/sys/rump/dev/Makefile.rumpdevcomp:1.16
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.15 Thu Nov 6 00:45:58 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Tue Nov 18 08:43:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.15 2014/11/06 00:45:58 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.16 2014/11/18 08:43:03 pooka Exp $
#
RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
@@ -9,6 +9,7 @@ RUMPUSBDEVS= ubt ucom ugenhc ulpt umass
RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm
RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd
+RUMPPCIDEVS+= pci_eap
# Not really a PCI device, but ....
RUMPPCIDEVS+= miiphy
Added files:
Index: src/sys/rump/dev/lib/libpci_eap/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/Makefile:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/Makefile Tue Nov 18 08:43:03 2014
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2014/11/18 08:43:03 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci_eap
+IOCONF= PCI_EAP.ioconf
+SRCS= eap_at_pci.c
+SRCS+= eap.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev
+CPPFLAGS+= -I${.CURDIR}/../libaudio
+
+.include "${RUMPTOP}/Makefile.rump"
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf Tue Nov 18 08:43:03 2014
@@ -0,0 +1,11 @@
+# $NetBSD: PCI_EAP.ioconf,v 1.1 2014/11/18 08:43:03 pooka Exp $
+#
+
+ioconf pci_eap
+
+include "conf/files"
+include "dev/pci/files.pci"
+
+pseudo-root pci*
+
+eap* at pci?
Index: src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c Tue Nov 18 08:43:03 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: eap_at_pci.c,v 1.1 2014/11/18 08:43:03 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: eap_at_pci.c,v 1.1 2014/11/18 08:43:03 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/bus.h>
+
+#include "rump_private.h"
+
+#include "ioconf.c"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_pci_eap,
+ cfattach_ioconf_pci_eap, cfdata_ioconf_pci_eap);
+}
Index: src/sys/rump/dev/lib/libpci_eap/joy_eap.h
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/joy_eap.h:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/joy_eap.h Tue Nov 18 08:43:03 2014
@@ -0,0 +1 @@
+/* $NetBSD: joy_eap.h,v 1.1 2014/11/18 08:43:03 pooka Exp $ */
Index: src/sys/rump/dev/lib/libpci_eap/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/shlib_version:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/shlib_version Tue Nov 18 08:43:03 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
