[src/trunk]: src/sys/rump/dev Add a rump kernel components for USB PCI host c...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/130f0554ff06
branches:  trunk
changeset: 338377:130f0554ff06
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed May 20 12:21:38 2015 +0000

description:
Add a rump kernel components for USB PCI host controllers.

diffstat:

 sys/rump/dev/Makefile.rumpdevcomp              |   3 +-
 sys/rump/dev/lib/libpci_usbhc/Makefile         |  22 ++++++++++++
 sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf |  13 +++++++
 sys/rump/dev/lib/libpci_usbhc/ehci.h           |   5 ++
 sys/rump/dev/lib/libpci_usbhc/ohci.h           |   5 ++
 sys/rump/dev/lib/libpci_usbhc/uhci.h           |   5 ++
 sys/rump/dev/lib/libpci_usbhc/usbhc_at_pci.c   |  45 ++++++++++++++++++++++++++
 7 files changed, 97 insertions(+), 1 deletions(-)

diffs (136 lines):

diff -r 848d32699e31 -r 130f0554ff06 sys/rump/dev/Makefile.rumpdevcomp
--- a/sys/rump/dev/Makefile.rumpdevcomp Wed May 20 11:53:08 2015 +0000
+++ b/sys/rump/dev/Makefile.rumpdevcomp Wed May 20 12:21:38 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpdevcomp,v 1.19 2014/11/19 01:08:42 pooka Exp $
+#      $NetBSD: Makefile.rumpdevcomp,v 1.20 2015/05/20 12:21:38 pooka Exp $
 #
 
 RUMPDEVCOMP=   audio bpf cgd disk dm drvctl fss md netsmb              \
@@ -8,6 +8,7 @@
 RUMPUSBDEVS=   ubt ucom ugenhc ulpt umass usb
 
 RUMPPCIDEVS=   pci pci_if_iwn pci_if_pcn pci_if_wm
+RUMPPCIDEVS+=  pci_usbhc
 RUMPPCIDEVS+=  pci_virtio virtio_if_vioif virtio_ld virtio_viornd
 RUMPPCIDEVS+=  audio_ac97 pci_eap pci_hdaudio hdaudio_hdafg
 # Not really a PCI device, but ....
diff -r 848d32699e31 -r 130f0554ff06 sys/rump/dev/lib/libpci_usbhc/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libpci_usbhc/Makefile    Wed May 20 12:21:38 2015 +0000
@@ -0,0 +1,22 @@
+#      $NetBSD: Makefile,v 1.1 2015/05/20 12:21:38 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci ${RUMPTOP}/../dev/usb
+
+LIB=   rumpdev_pci_usbhc
+IOCONF=        PCI_USBHC.ioconf
+SRCS=  usbhc_at_pci.c
+
+SRCS+= ohci_pci.c ohci.c
+SRCS+= uhci_pci.c uhci.c
+SRCS+= ehci_pci.c ehci.c
+SRCS+= usb_pci.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev
+CPPFLAGS+= -I${.CURDIR}/../libusb/opt
+
+.include "${RUMPTOP}/Makefile.rump"
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r 848d32699e31 -r 130f0554ff06 sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf    Wed May 20 12:21:38 2015 +0000
@@ -0,0 +1,13 @@
+#      $NetBSD: PCI_USBHC.ioconf,v 1.1 2015/05/20 12:21:38 pooka Exp $
+#
+
+ioconf pci_usbhc
+
+include "conf/files"
+include "dev/pci/files.pci"
+
+pseudo-root pci*
+
+ohci* at pci?
+uhci* at pci?
+ehci* at pci?
diff -r 848d32699e31 -r 130f0554ff06 sys/rump/dev/lib/libpci_usbhc/ehci.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libpci_usbhc/ehci.h      Wed May 20 12:21:38 2015 +0000
@@ -0,0 +1,5 @@
+/*     $NetBSD: ehci.h,v 1.1 2015/05/20 12:21:38 pooka Exp $   */
+
+#define NEHCI 1
+#define NOHCI 1
+#define NUHCI 1
diff -r 848d32699e31 -r 130f0554ff06 sys/rump/dev/lib/libpci_usbhc/ohci.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libpci_usbhc/ohci.h      Wed May 20 12:21:38 2015 +0000
@@ -0,0 +1,5 @@
+/*     $NetBSD: ohci.h,v 1.1 2015/05/20 12:21:38 pooka Exp $   */
+
+#define NEHCI 1
+#define NOHCI 1
+#define NUHCI 1
diff -r 848d32699e31 -r 130f0554ff06 sys/rump/dev/lib/libpci_usbhc/uhci.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libpci_usbhc/uhci.h      Wed May 20 12:21:38 2015 +0000
@@ -0,0 +1,5 @@
+/*     $NetBSD: uhci.h,v 1.1 2015/05/20 12:21:38 pooka Exp $   */
+
+#define NEHCI 1
+#define NOHCI 1
+#define NUHCI 1
diff -r 848d32699e31 -r 130f0554ff06 sys/rump/dev/lib/libpci_usbhc/usbhc_at_pci.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libpci_usbhc/usbhc_at_pci.c      Wed May 20 12:21:38 2015 +0000
@@ -0,0 +1,45 @@
+/*     $NetBSD: usbhc_at_pci.c,v 1.1 2015/05/20 12:21:38 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: usbhc_at_pci.c,v 1.1 2015/05/20 12:21:38 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_usbhc,
+           cfattach_ioconf_pci_usbhc, cfdata_ioconf_pci_usbhc);
+}