Module Name: src
Committed By: pooka
Date: Wed Aug 13 15:01:32 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libpci_if_pcn: Makefile PCI_IF_PCN.ioconf
pcn_at_pci.c shlib_version
Log Message:
Add component for the pcnet PCI driver to rump kernels. Virtualbox
emulates it by default, so it's nice-to-have for that.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_if_pcn/Makefile \
src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf \
src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c \
src/sys/rump/dev/lib/libpci_if_pcn/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.12 src/sys/rump/dev/Makefile.rumpdevcomp:1.13
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.12 Thu Jul 17 08:16:12 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Wed Aug 13 15:01:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.12 2014/07/17 08:16:12 prlw1 Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.13 2014/08/13 15:01:32 pooka Exp $
#
RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
@@ -7,7 +7,7 @@ RUMPDEVCOMP= audio bpf cgd disk dm drvct
RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
-RUMPPCIDEVS= pci pci_if_iwn pci_if_wm
+RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm
# Not really a PCI device, but ....
RUMPPCIDEVS+= miiphy
Added files:
Index: src/sys/rump/dev/lib/libpci_if_pcn/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/Makefile:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++ src/sys/rump/dev/lib/libpci_if_pcn/Makefile Wed Aug 13 15:01:32 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/08/13 15:01:32 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci_if_pcn
+IOCONF= PCI_IF_PCN.ioconf
+
+SRCS= pcn_at_pci.c
+
+SRCS+= if_pcn.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+.include "${RUMPTOP}/Makefile.rump"
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++ src/sys/rump/dev/lib/libpci_if_pcn/PCI_IF_PCN.ioconf Wed Aug 13 15:01:32 2014
@@ -0,0 +1,11 @@
+# $NetBSD: PCI_IF_PCN.ioconf,v 1.1 2014/08/13 15:01:32 pooka Exp $
+#
+
+ioconf pci_if_pcn
+
+include "conf/files"
+include "dev/pci/files.pci"
+
+pseudo-root pci*
+
+pcn* at pci? dev ? function ?
Index: src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++ src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c Wed Aug 13 15:01:32 2014
@@ -0,0 +1,44 @@
+/* $NetBSD: pcn_at_pci.c,v 1.1 2014/08/13 15:01:32 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: pcn_at_pci.c,v 1.1 2014/08/13 15:01:32 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_if_pcn,
+ cfattach_ioconf_pci_if_pcn, cfdata_ioconf_pci_if_pcn);
+}
Index: src/sys/rump/dev/lib/libpci_if_pcn/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_pcn/shlib_version:1.1
--- /dev/null Wed Aug 13 15:01:32 2014
+++ src/sys/rump/dev/lib/libpci_if_pcn/shlib_version Wed Aug 13 15:01:32 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
