Module Name: src
Committed By: pooka
Date: Mon Apr 7 01:45:36 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libpci_if_iwn: Makefile PCI_IF_IWN.ioconf
iwn_at_pci.c shlib_version
Log Message:
Add a rump kernel component for the iwn wireless driver, tested with
the one in my laptop:
iwn0 at pci0 dev 19 function 0: vendor 0x8086 product 0x4237 (rev. 0x00)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_if_iwn/Makefile \
src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf \
src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c \
src/sys/rump/dev/lib/libpci_if_iwn/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.8 src/sys/rump/dev/Makefile.rumpdevcomp:1.9
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.8 Fri Apr 4 14:49:40 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Mon Apr 7 01:45:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.8 2014/04/04 14:49:40 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.9 2014/04/07 01:45:36 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_wm
+RUMPPCIDEVS= pci pci_if_iwn pci_if_wm
# Not really a PCI device, but ....
RUMPPCIDEVS= miiphy
Added files:
Index: src/sys/rump/dev/lib/libpci_if_iwn/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.1
--- /dev/null Mon Apr 7 01:45:36 2014
+++ src/sys/rump/dev/lib/libpci_if_iwn/Makefile Mon Apr 7 01:45:36 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/04/07 01:45:36 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci_if_iwn
+IOCONF= PCI_IF_IWN.ioconf
+
+SRCS= iwn_at_pci.c
+
+SRCS+= if_iwn.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_iwn/PCI_IF_IWN.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf:1.1
--- /dev/null Mon Apr 7 01:45:36 2014
+++ src/sys/rump/dev/lib/libpci_if_iwn/PCI_IF_IWN.ioconf Mon Apr 7 01:45:36 2014
@@ -0,0 +1,12 @@
+# $NetBSD: PCI_IF_IWN.ioconf,v 1.1 2014/04/07 01:45:36 pooka Exp $
+#
+
+ioconf pci_if_iwn
+
+include "conf/files"
+include "dev/pci/files.pci"
+include "rump/dev/files.rump"
+
+pseudo-root pci*
+
+iwn* at pci? dev ? function ? # Intel PRO/Wireless
Index: src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c:1.1
--- /dev/null Mon Apr 7 01:45:36 2014
+++ src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c Mon Apr 7 01:45:36 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: iwn_at_pci.c,v 1.1 2014/04/07 01:45:36 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: iwn_at_pci.c,v 1.1 2014/04/07 01:45:36 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_iwn,
+ cfattach_ioconf_pci_if_iwn, cfdata_ioconf_pci_if_iwn);
+}
Index: src/sys/rump/dev/lib/libpci_if_iwn/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_iwn/shlib_version:1.1
--- /dev/null Mon Apr 7 01:45:36 2014
+++ src/sys/rump/dev/lib/libpci_if_iwn/shlib_version Mon Apr 7 01:45:36 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
