CVS commit: src/sys/rump/dev/lib
Module Name:src
Committed By: christos
Date: Fri Nov 6 15:35:33 UTC 2020
Modified Files:
src/sys/rump/dev/lib/libpci_usbhc: Makefile PCI_USBHC.ioconf
src/sys/rump/dev/lib/libusb: USB.ioconf
Log Message:
PR/55789: Ruslan Nikolaev: New rump drivers
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libpci_usbhc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libusb/USB.ioconf
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/lib/libpci_usbhc/Makefile
diff -u src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.5 src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.6
--- src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.5 Mon Nov 16 18:27:08 2015
+++ src/sys/rump/dev/lib/libpci_usbhc/Makefile Fri Nov 6 10:35:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/11/16 23:27:08 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/06 15:35:33 christos Exp $
#
RUMPTOP=${TOPRUMP}
@@ -14,6 +14,7 @@ RUMP_COMPONENT=ioconf
SRCS+= ohci_pci.c ohci.c
SRCS+= uhci_pci.c uhci.c
SRCS+= ehci_pci.c ehci.c
+SRCS+= xhci_pci.c xhci.c
SRCS+= usb_pci.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev
Index: src/sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf
diff -u src/sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf:1.1 src/sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf:1.2
--- src/sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf:1.1 Wed May 20 08:21:38 2015
+++ src/sys/rump/dev/lib/libpci_usbhc/PCI_USBHC.ioconf Fri Nov 6 10:35:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: PCI_USBHC.ioconf,v 1.1 2015/05/20 12:21:38 pooka Exp $
+# $NetBSD: PCI_USBHC.ioconf,v 1.2 2020/11/06 15:35:33 christos Exp $
#
ioconf pci_usbhc
@@ -11,3 +11,4 @@ pseudo-root pci*
ohci* at pci?
uhci* at pci?
ehci* at pci?
+xhci* at pci?
Index: src/sys/rump/dev/lib/libusb/USB.ioconf
diff -u src/sys/rump/dev/lib/libusb/USB.ioconf:1.2 src/sys/rump/dev/lib/libusb/USB.ioconf:1.3
--- src/sys/rump/dev/lib/libusb/USB.ioconf:1.2 Wed May 20 07:51:32 2015
+++ src/sys/rump/dev/lib/libusb/USB.ioconf Fri Nov 6 10:35:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: USB.ioconf,v 1.2 2015/05/20 11:51:32 pooka Exp $
+# $NetBSD: USB.ioconf,v 1.3 2020/11/06 15:35:33 christos Exp $
#
ioconf usb
@@ -15,6 +15,7 @@ pseudo-root ugenhc*
pseudo-root ehci*
pseudo-root ohci*
pseudo-root uhci*
+pseudo-root xhci*
#
@@ -25,6 +26,7 @@ usb*at ugenhc?
usb* at ehci?
usb* at ohci?
usb* at uhci?
+usb* at xhci?
# USB ROOT Hub
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src Committed By: christos Date: Mon Nov 2 18:58:06 UTC 2020 Modified Files: src/sys/rump/dev/lib/libpci: rumpdev_bus_dma.c Log Message: PR/55777: Ruslan Nikolaev: use MIN() from instead of min() To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c 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/lib/libpci/rumpdev_bus_dma.c diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.9 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.10 --- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.9 Sat Sep 5 12:30:12 2020 +++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Mon Nov 2 13:58:06 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpdev_bus_dma.c,v 1.9 2020/09/05 16:30:12 riastradh Exp $ */ +/* $NetBSD: rumpdev_bus_dma.c,v 1.10 2020/11/02 18:58:06 christos Exp $ */ /*- * Copyright (c) 2013 Antti Kantee @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_dma.c,v 1.9 2020/09/05 16:30:12 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_dma.c,v 1.10 2020/11/02 18:58:06 christos Exp $"); #include #include @@ -192,7 +192,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t, sgsize = PAGE_SIZE - ((u_long)vaddr & PGOFSET); if (buflen < sgsize) sgsize = buflen; - sgsize = min(sgsize, map->dm_maxsegsz); + sgsize = MIN(sgsize, map->dm_maxsegsz); /* * Make sure we don't cross any boundaries.
CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: jdolecek
Date: Mon Apr 13 11:27:22 UTC 2020
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Log Message:
unhook umass_isdata.c from here too
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libumass/Makefile
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/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.10 src/sys/rump/dev/lib/libumass/Makefile:1.11
--- src/sys/rump/dev/lib/libumass/Makefile:1.10 Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libumass/Makefile Mon Apr 13 11:27:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/10/19 16:16:34 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2020/04/13 11:27:22 jdolecek Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -9,7 +9,7 @@ COMMENT=USB mass storage driver
IOCONF= UMASS.ioconf
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
-SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
+SRCS= umass.c umass_quirks.c umass_scsipi.c
SRCS+= umass_component.c
.else
CVS commit: src/sys/rump/dev/lib/librnd
Module Name:src
Committed By: riastradh
Date: Mon Feb 10 07:13:06 UTC 2020
Modified Files:
src/sys/rump/dev/lib/librnd: rnd_component.c
Log Message:
Omit duplicate rnd_init in rump.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/librnd/rnd_component.c
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/lib/librnd/rnd_component.c
diff -u src/sys/rump/dev/lib/librnd/rnd_component.c:1.5 src/sys/rump/dev/lib/librnd/rnd_component.c:1.6
--- src/sys/rump/dev/lib/librnd/rnd_component.c:1.5 Mon May 30 14:52:06 2016
+++ src/sys/rump/dev/lib/librnd/rnd_component.c Mon Feb 10 07:13:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd_component.c,v 1.5 2016/05/30 14:52:06 pooka Exp $ */
+/* $NetBSD: rnd_component.c,v 1.6 2020/02/10 07:13:06 riastradh Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.5 2016/05/30 14:52:06 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.6 2020/02/10 07:13:06 riastradh Exp $");
#include
#include
@@ -61,7 +61,6 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
panic("cannot create /dev/urandom: %d", error);
rump_pdev_add(rndattach, 4);
- rnd_init();
}
#if 0
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src Committed By: pgoyette Date: Mon Jan 27 17:10:23 UTC 2020 Modified Files: src/sys/rump/dev/lib/libopencrypto: opencrypto_component.c Log Message: Update comment to reflect recent change to the error message in question. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c 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/lib/libopencrypto/opencrypto_component.c diff -u src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.5 src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.6 --- src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.5 Thu Jun 29 08:51:27 2017 +++ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Mon Jan 27 17:10:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: opencrypto_component.c,v 1.5 2017/06/29 08:51:27 knakahara Exp $ */ +/* $NetBSD: opencrypto_component.c,v 1.6 2020/01/27 17:10:23 pgoyette Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.5 2017/06/29 08:51:27 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.6 2020/01/27 17:10:23 pgoyette Exp $"); #include #include @@ -75,8 +75,8 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV) * only. * * TODO: - * There is still "crypto: unable to register devsw" message. it should - * be suppressed. + * There is still "crypto: unable to register devsw, error 17" message. + * it should be suppressed. */ rump_pdev_add(swcryptoattach, 0); #endif
CVS commit: src/sys/rump/dev/lib/libdisk
Module Name:src
Committed By: christos
Date: Fri Apr 5 01:09:33 UTC 2019
Modified Files:
src/sys/rump/dev/lib/libdisk: Makefile
Log Message:
need subr_disklabel.c
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/dev/lib/libdisk/Makefile
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/lib/libdisk/Makefile
diff -u src/sys/rump/dev/lib/libdisk/Makefile:1.9 src/sys/rump/dev/lib/libdisk/Makefile:1.10
--- src/sys/rump/dev/lib/libdisk/Makefile:1.9 Mon Oct 19 12:16:32 2015
+++ src/sys/rump/dev/lib/libdisk/Makefile Thu Apr 4 21:09:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/10/19 16:16:32 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2019/04/05 01:09:33 christos Exp $
#
.PATH: ${.CURDIR}/../../../../kern \
@@ -17,7 +17,7 @@ SRCS= disk_component.c
SRCS+= subr_disk_mbr.c
# sys/kern
-SRCS+= subr_disk.c subr_disk_open.c
+SRCS+= subr_disk.c subr_disk_open.c subr_disklabel.c
# sys/dev
SRCS+= dksubr.c dk.c
CVS commit: src/sys/rump/dev/lib/libraidframe
Module Name:src
Committed By: christos
Date: Wed Feb 6 23:00:56 UTC 2019
Modified Files:
src/sys/rump/dev/lib/libraidframe: Makefile
Log Message:
kill compat code dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/dev/lib/libraidframe/Makefile
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/lib/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.12 src/sys/rump/dev/lib/libraidframe/Makefile:1.13
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.12 Mon Feb 4 16:57:48 2019
+++ src/sys/rump/dev/lib/libraidframe/Makefile Wed Feb 6 18:00:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/02/04 21:57:48 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2019/02/06 23:00:56 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev/raidframe
@@ -27,18 +27,5 @@ SRCS+= raidframe_component.c
.include
-.if !empty(RUMP_NBCOMPAT:M50)
-SRCS+= rf_compat50.c
-.endif
-
-.if !empty(RUMP_NBCOMPAT:M80)
-SRCS+= rf_compat80.c
-.endif
-
-.include "${.CURDIR}/../../../../compat/netbsd32/netbsd32.mk"
-.if ${COMPAT_USE_NETBSD32} != "no"
-CPPFLAGS.rf_netbsdkintf.c+= -DCOMPAT_NETBSD32
-.endif
-
.include
.include
CVS commit: src/sys/rump/dev/lib/libpad
Module Name:src
Committed By: pgoyette
Date: Sat Dec 16 09:20:29 UTC 2017
Modified Files:
src/sys/rump/dev/lib/libpad: Makefile
Added Files:
src/sys/rump/dev/lib/libpad: PAD.ioconf
Log Message:
Now that the pad module has an ioconf file, we need to provide one for
the rump-component, too.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libpad/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpad/PAD.ioconf
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/lib/libpad/Makefile
diff -u src/sys/rump/dev/lib/libpad/Makefile:1.6 src/sys/rump/dev/lib/libpad/Makefile:1.7
--- src/sys/rump/dev/lib/libpad/Makefile:1.6 Tue Jan 26 23:12:15 2016
+++ src/sys/rump/dev/lib/libpad/Makefile Sat Dec 16 09:20:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/26 23:12:15 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2017/12/16 09:20:29 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../dev/pad
@@ -6,6 +6,8 @@
LIB= rumpdev_pad
COMMENT=Pseudo Audio Device
+IOCONF= PAD.ioconf
+
SRCS= pad.c
SRCS+= pad_component.c
Added files:
Index: src/sys/rump/dev/lib/libpad/PAD.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpad/PAD.ioconf:1.1
--- /dev/null Sat Dec 16 09:20:29 2017
+++ src/sys/rump/dev/lib/libpad/PAD.ioconf Sat Dec 16 09:20:29 2017
@@ -0,0 +1,7 @@
+# $NetBSD: PAD.ioconf,v 1.1 2017/12/16 09:20:29 pgoyette Exp $
+#
+
+ioconf pad
+include "conf/files"
+
+pseudo-device pad
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src Committed By: knakahara Date: Thu Jun 29 08:51:27 UTC 2017 Modified Files: src/sys/rump/dev/lib/libopencrypto: opencrypto_component.c Log Message: reduce rump waring message. pointed out by ozaki-r@n.o, thanks. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c 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/lib/libopencrypto/opencrypto_component.c diff -u src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.4 src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.5 --- src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.4 Tue Jan 26 23:12:15 2016 +++ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Thu Jun 29 08:51:27 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: opencrypto_component.c,v 1.4 2016/01/26 23:12:15 pooka Exp $ */ +/* $NetBSD: opencrypto_component.c,v 1.5 2017/06/29 08:51:27 knakahara Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.4 2016/01/26 23:12:15 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opencrypto_component.c,v 1.5 2017/06/29 08:51:27 knakahara Exp $"); #include #include @@ -64,5 +64,20 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV) */ crypto_init(); rump_pdev_add(cryptoattach, 1); +#if 0 + /* + * rump defines "_MODULE" in spite of using built-in module + * initialization(module_init_class()). So, swcryptoattach_internal() + * is called by two functions, one is swcryptoattach() and the other is + * swcrypto_modcmd(). + * That causes "builtin module `swcrypto' failed to init" WARNING message. + * To suppress this warning, we let rump use swcrypto_modcmd() call-path + * only. + * + * TODO: + * There is still "crypto: unable to register devsw" message. it should + * be suppressed. + */ rump_pdev_add(swcryptoattach, 0); +#endif }
CVS commit: src/sys/rump/dev/lib/libucom
Module Name:src Committed By: christos Date: Thu Jun 22 02:07:26 UTC 2017 Modified Files: src/sys/rump/dev/lib/libucom: UCOM.ioconf Log Message: should be umodeswitch! To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libucom/UCOM.ioconf 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/lib/libucom/UCOM.ioconf diff -u src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.5 src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.6 --- src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.5 Mon Aug 30 07:51:29 2010 +++ src/sys/rump/dev/lib/libucom/UCOM.ioconf Wed Jun 21 22:07:26 2017 @@ -1,4 +1,4 @@ -# $NetBSD: UCOM.ioconf,v 1.5 2010/08/30 11:51:29 pooka Exp $ +# $NetBSD: UCOM.ioconf,v 1.6 2017/06/22 02:07:26 christos Exp $ # ioconf ucom @@ -14,6 +14,6 @@ ucom* at uplcom? portno ? # USB 3G datacards u3g* at uhub? port ? -u3ginit* at uhub? port ? +umodeswitch* at uhub? port ? ucom* at u3g?
CVS commit: src/sys/rump/dev/lib
Module Name:src
Committed By: sevan
Date: Wed May 10 06:22:15 UTC 2017
Modified Files:
src/sys/rump/dev/lib/libpci_virtio: PCI_VIRTIO.ioconf
src/sys/rump/dev/lib/libvirtio_if_vioif: VIRTIO_IF_VIOIF.ioconf
src/sys/rump/dev/lib/libvirtio_ld: VIRTIO_LD.ioconf ld_at_virtio.c
src/sys/rump/dev/lib/libvirtio_vioscsi: VIRTIO_VIOSCSI.ioconf
Log Message:
Match the ioconf name in sys/modules.
Resolves rumprun build process.
Put together with the help & direction of riastradh & paulg.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci_virtio/PCI_VIRTIO.ioconf
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/dev/lib/libvirtio_vioscsi/VIRTIO_VIOSCSI.ioconf
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/lib/libpci_virtio/PCI_VIRTIO.ioconf
diff -u src/sys/rump/dev/lib/libpci_virtio/PCI_VIRTIO.ioconf:1.1 src/sys/rump/dev/lib/libpci_virtio/PCI_VIRTIO.ioconf:1.2
--- src/sys/rump/dev/lib/libpci_virtio/PCI_VIRTIO.ioconf:1.1 Fri Aug 22 09:45:29 2014
+++ src/sys/rump/dev/lib/libpci_virtio/PCI_VIRTIO.ioconf Wed May 10 06:22:15 2017
@@ -1,7 +1,7 @@
-# $NetBSD: PCI_VIRTIO.ioconf,v 1.1 2014/08/22 09:45:29 pooka Exp $
+# $NetBSD: PCI_VIRTIO.ioconf,v 1.2 2017/05/10 06:22:15 sevan Exp $
#
-ioconf pci_virtio
+ioconf virtio
include "conf/files"
include "dev/pci/files.pci"
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf
diff -u src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf:1.1 src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf:1.2
--- src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf:1.1 Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf Wed May 10 06:22:15 2017
@@ -1,7 +1,7 @@
-# $NetBSD: VIRTIO_IF_VIOIF.ioconf,v 1.1 2014/08/22 09:48:54 pooka Exp $
+# $NetBSD: VIRTIO_IF_VIOIF.ioconf,v 1.2 2017/05/10 06:22:15 sevan Exp $
#
-ioconf virtio_if_vioif
+ioconf if_vioif
include "conf/files"
include "dev/pci/files.pci"
Index: src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf
diff -u src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf:1.1 src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf:1.2
--- src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf:1.1 Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf Wed May 10 06:22:15 2017
@@ -1,7 +1,7 @@
-# $NetBSD: VIRTIO_LD.ioconf,v 1.1 2014/08/22 09:57:05 pooka Exp $
+# $NetBSD: VIRTIO_LD.ioconf,v 1.2 2017/05/10 06:22:15 sevan Exp $
#
-ioconf virtio_ld
+ioconf ld_virtio
include "conf/files"
include "dev/pci/files.pci"
Index: src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c
diff -u src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.3 src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.4
--- src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.3 Tue Jan 26 23:12:16 2016
+++ src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c Wed May 10 06:22:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_at_virtio.c,v 1.3 2016/01/26 23:12:16 pooka Exp $ */
+/* $NetBSD: ld_at_virtio.c,v 1.4 2017/05/10 06:22:15 sevan Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ld_at_virtio.c,v 1.3 2016/01/26 23:12:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_at_virtio.c,v 1.4 2017/05/10 06:22:15 sevan Exp $");
#include
#include
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: ld_at_virtio
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
- config_init_component(cfdriver_ioconf_virtio_ld,
- cfattach_ioconf_virtio_ld, cfdata_ioconf_virtio_ld);
+ config_init_component(cfdriver_ioconf_ld_virtio,
+ cfattach_ioconf_ld_virtio, cfdata_ioconf_ld_virtio);
}
/*
Index: src/sys/rump/dev/lib/libvirtio_vioscsi/VIRTIO_VIOSCSI.ioconf
diff -u src/sys/rump/dev/lib/libvirtio_vioscsi/VIRTIO_VIOSCSI.ioconf:1.1 src/sys/rump/dev/lib/libvirtio_vioscsi/VIRTIO_VIOSCSI.ioconf:1.2
--- src/sys/rump/dev/lib/libvirtio_vioscsi/VIRTIO_VIOSCSI.ioconf:1.1 Sun Nov 1 09:03:28 2015
+++ src/sys/rump/dev/lib/libvirtio_vioscsi/VIRTIO_VIOSCSI.ioconf Wed May 10 06:22:15 2017
@@ -1,7 +1,7 @@
-# $NetBSD: VIRTIO_VIOSCSI.ioconf,v 1.1 2015/11/01 09:03:28 pooka Exp $
+# $NetBSD: VIRTIO_VIOSCSI.ioconf,v 1.2 2017/05/10 06:22:15 sevan Exp $
#
-ioconf virtio_vioscsi
+ioconf vioscsi
include "conf/files"
include "dev/pci/files.pci"
CVS commit: src/sys/rump/dev/lib/libualea
Module Name:src Committed By: riastradh Date: Tue Apr 18 19:41:27 UTC 2017 Modified Files: src/sys/rump/dev/lib/libualea: UALEA.ioconf Log Message: Make comment match. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libualea/UALEA.ioconf 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/lib/libualea/UALEA.ioconf diff -u src/sys/rump/dev/lib/libualea/UALEA.ioconf:1.1 src/sys/rump/dev/lib/libualea/UALEA.ioconf:1.2 --- src/sys/rump/dev/lib/libualea/UALEA.ioconf:1.1 Mon Apr 17 08:59:37 2017 +++ src/sys/rump/dev/lib/libualea/UALEA.ioconf Tue Apr 18 19:41:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: UALEA.ioconf,v 1.1 2017/04/17 08:59:37 riastradh Exp $ +# $NetBSD: UALEA.ioconf,v 1.2 2017/04/18 19:41:27 riastradh Exp $ # ioconf ualea @@ -8,4 +8,5 @@ include "dev/usb/files.usb" pseudo-root uhub* -ualea* at uhub? port ? configuration ? interface ? # Alea II TRNG +# Araneus Alea I/II TRNG +ualea* at uhub? port ? configuration ? interface ?
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: riastradh
Date: Mon Apr 17 07:13:30 UTC 2017
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
Log Message:
Fix bulk xfer buffer with usedma = false.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/dev/lib/libugenhc/ugenhc.c
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/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.25 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.26
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.25 Mon Apr 17 05:11:05 2017
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Mon Apr 17 07:13:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.25 2017/04/17 05:11:05 riastradh Exp $ */
+/* $NetBSD: ugenhc.c,v 1.26 2017/04/17 07:13:30 riastradh Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.25 2017/04/17 05:11:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.26 2017/04/17 07:13:30 riastradh Exp $");
#include
#include
@@ -603,7 +603,7 @@ rumpusb_device_bulk_start(struct usbd_xf
endpt = UE_GET_ADDR(endpt);
KASSERT(endpt < UGEN_NEPTS);
- buf = KERNADDR(>ux_dmabuf, 0);
+ buf = xfer->ux_buf;
done = 0;
if ((ed->bmAttributes & UE_XFERTYPE) == UE_ISOCHRONOUS) {
for (i = 0, len = 0; i < xfer->ux_nframes; i++)
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: riastradh
Date: Mon Apr 17 05:11:05 UTC 2017
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
Log Message:
Fix order of outputs in rumpuser_open call.
Now ugenhc works again after a four-year hiatus...
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/dev/lib/libugenhc/ugenhc.c
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/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.24 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.25
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.24 Sat Apr 23 10:15:30 2016
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Mon Apr 17 05:11:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.24 2016/04/23 10:15:30 skrll Exp $ */
+/* $NetBSD: ugenhc.c,v 1.25 2017/04/17 05:11:05 riastradh Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.24 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.25 2017/04/17 05:11:05 riastradh Exp $");
#include
#include
@@ -489,7 +489,7 @@ rhscintr(void *arg)
*/
for (;;) {
- fd = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, );
+ error = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, );
if (fd == -1)
break;
CVS commit: src/sys/rump/dev/lib/libdrvctl
Module Name:src Committed By: pgoyette Date: Sun Jan 15 01:48:05 UTC 2017 Modified Files: src/sys/rump/dev/lib/libdrvctl: drvctl_component.c Log Message: We no longer need ioconf.c - remove it to avoid "defined but not used" compiler error. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libdrvctl/drvctl_component.c 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/lib/libdrvctl/drvctl_component.c diff -u src/sys/rump/dev/lib/libdrvctl/drvctl_component.c:1.3 src/sys/rump/dev/lib/libdrvctl/drvctl_component.c:1.4 --- src/sys/rump/dev/lib/libdrvctl/drvctl_component.c:1.3 Sat Jan 14 21:36:58 2017 +++ src/sys/rump/dev/lib/libdrvctl/drvctl_component.c Sun Jan 15 01:48:05 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: drvctl_component.c,v 1.3 2017/01/14 21:36:58 pgoyette Exp $ */ +/* $NetBSD: drvctl_component.c,v 1.4 2017/01/15 01:48:05 pgoyette Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,15 +26,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drvctl_component.c,v 1.3 2017/01/14 21:36:58 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drvctl_component.c,v 1.4 2017/01/15 01:48:05 pgoyette Exp $"); #include #include #include #include -#include "ioconf.c" - #include #include
CVS commit: src/sys/rump/dev/lib/libfss
Module Name:src
Committed By: pgoyette
Date: Sat Jul 30 23:07:23 UTC 2016
Modified Files:
src/sys/rump/dev/lib/libfss: fss_component.c
Log Message:
Fix variable names in previous
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libfss/fss_component.c
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/lib/libfss/fss_component.c
diff -u src/sys/rump/dev/lib/libfss/fss_component.c:1.3 src/sys/rump/dev/lib/libfss/fss_component.c:1.4
--- src/sys/rump/dev/lib/libfss/fss_component.c:1.3 Sat Jul 30 22:36:14 2016
+++ src/sys/rump/dev/lib/libfss/fss_component.c Sat Jul 30 23:07:23 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fss_component.c,v 1.3 2016/07/30 22:36:14 pgoyette Exp $ */
+/* $NetBSD: fss_component.c,v 1.4 2016/07/30 23:07:23 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fss_component.c,v 1.3 2016/07/30 22:36:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss_component.c,v 1.4 2016/07/30 23:07:23 pgoyette Exp $");
#include
#include
@@ -40,7 +40,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
extern const struct bdevsw fss_bdevsw;
extern const struct cdevsw fss_cdevsw;
- extern devmajor_t fss_bmaj, fss_cmaj;
+ extern devmajor_t fss_bmajor, fss_cmajor;
int error;
fss_bmajor = bdevsw_lookup_major(_bdevsw);
CVS commit: src/sys/rump/dev/lib/librnd
Module Name:src
Committed By: pooka
Date: Mon May 30 14:52:06 UTC 2016
Modified Files:
src/sys/rump/dev/lib/librnd: rnd_component.c
Log Message:
Disable PR kern/51135 hack now that the problem is supposedly
fixed (to see if tests pass).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/librnd/rnd_component.c
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/lib/librnd/rnd_component.c
diff -u src/sys/rump/dev/lib/librnd/rnd_component.c:1.4 src/sys/rump/dev/lib/librnd/rnd_component.c:1.5
--- src/sys/rump/dev/lib/librnd/rnd_component.c:1.4 Mon May 16 16:31:07 2016
+++ src/sys/rump/dev/lib/librnd/rnd_component.c Mon May 30 14:52:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd_component.c,v 1.4 2016/05/16 16:31:07 pooka Exp $ */
+/* $NetBSD: rnd_component.c,v 1.5 2016/05/30 14:52:06 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.4 2016/05/16 16:31:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.5 2016/05/30 14:52:06 pooka Exp $");
#include
#include
@@ -64,6 +64,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
rnd_init();
}
+#if 0
/*
* XXX: the following hack works around PR kern/51135 and should ASAP be
* nuked to and then from orbit.
@@ -90,3 +91,4 @@ RUMP_COMPONENT(RUMP_COMPONENT_POSTINIT)
panic("rnd_system_ioctl failed"); /* XXX */
}
}
+#endif
CVS commit: src/sys/rump/dev/lib/librnd
Module Name:src
Committed By: pooka
Date: Mon May 16 16:31:07 UTC 2016
Modified Files:
src/sys/rump/dev/lib/librnd: rnd_component.c
Log Message:
Add workaround for PR kern/51135
If the rnd component is present, load extra initial entropy to avoid
/dev/random not being able to request it on demand. The extra initial
entropy will allow a few instances of /dev/random, but will eventually
go into the failure mode described in the PR.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/librnd/rnd_component.c
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/lib/librnd/rnd_component.c
diff -u src/sys/rump/dev/lib/librnd/rnd_component.c:1.3 src/sys/rump/dev/lib/librnd/rnd_component.c:1.4
--- src/sys/rump/dev/lib/librnd/rnd_component.c:1.3 Tue Jan 26 23:12:16 2016
+++ src/sys/rump/dev/lib/librnd/rnd_component.c Mon May 16 16:31:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd_component.c,v 1.3 2016/01/26 23:12:16 pooka Exp $ */
+/* $NetBSD: rnd_component.c,v 1.4 2016/05/16 16:31:07 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.3 2016/01/26 23:12:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd_component.c,v 1.4 2016/05/16 16:31:07 pooka Exp $");
#include
#include
@@ -63,3 +63,30 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
rump_pdev_add(rndattach, 4);
rnd_init();
}
+
+/*
+ * XXX: the following hack works around PR kern/51135 and should ASAP be
+ * nuked to and then from orbit.
+ */
+#define RNDPRELOAD 256
+#include
+RUMP_COMPONENT(RUMP_COMPONENT_POSTINIT)
+{
+ rnddata_t *rd;
+ size_t dsize, i;
+
+ CTASSERT(RNDPRELOAD <= sizeof(rd->data));
+
+ aprint_verbose("/dev/random: "
+ "loading initial entropy to workaround PR kern/51135\n");
+ rd = kmem_alloc(sizeof(*rd), KM_SLEEP);
+ for (i = 0; i < RNDPRELOAD; i += dsize) {
+ if (rumpuser_getrandom(rd->data,
+ RNDPRELOAD-i, RUMPUSER_RANDOM_HARD, ) != 0)
+ panic("rumpuser_getrandom failed"); /* XXX */
+ rd->len = dsize;
+ rd->entropy = dsize*NBBY;
+ if (rnd_system_ioctl(NULL, RNDADDDATA, rd))
+ panic("rnd_system_ioctl failed"); /* XXX */
+ }
+}
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Tue May 10 19:38:29 UTC 2016
Modified Files:
src/sys/rump/dev/lib/libpci: Makefile
Log Message:
Avoid '.' in variable names which are expected to be passed to
this Makefile via the env.
That character is strictly speaking not allowed by POSIX in an exported
variable name, and at least dash >= 0.58 refuses to export such variables.
Furthermore, since the individual CFLAGS/CPPFLAGS/etc. variables
are not comprehensive enough for all cases (e.g. HURD), just
support the .includable version from now on, i.e.
RUMPCOMP_MAKEFILEINC_rumpdev_pci.
curious failure mode debugged by Martin Lucina
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libpci/Makefile
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/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.10 src/sys/rump/dev/lib/libpci/Makefile:1.11
--- src/sys/rump/dev/lib/libpci/Makefile:1.10 Tue Jan 26 23:12:15 2016
+++ src/sys/rump/dev/lib/libpci/Makefile Tue May 10 19:38:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/01/26 23:12:15 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2016/05/10 19:38:29 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
@@ -28,23 +28,36 @@ SRCS+= pci_at_mainbus.c
.error RUMP_PCI_IOSPACE defined in Makefile. Use userfeatures.h instead.
.endif
+RUMPCOMP_USER_CPPFLAGS:=-I${.PARSEDIR}
+
+# current state-of-the-art interface (remains to be seen if it's "good enuf")
+.ifdef RUMPCOMP_MAKEFILEINC_rumpdev_pci
+.include "${RUMPCOMP_MAKEFILEINC_rumpdev_pci}"
+.endif
+
+# old-style ("compat") interfaces. will go away some day or year.
+# why? the "protocol" requires passing variables via the env, and
+# the names include dots which POSIX does not, strictly speaking,
+# allow in env names. There is at least one shell (dash >= 0.58)
+# which refuses to pass variables with dots.
+.if defined(RUMPCOMP_USER_SRCS.rumpdev_pci) \
+|| defined(RUMPCOMP_MAKEFILEINC.rumpdev_pci)
+.warning Use new style RUMPCOMP_MAKEFILEINC_rumpdev_pci
+.endif
+.ifdef RUMPCOMP_USER_PATH.rumpdev_pci
.PATH: ${RUMPCOMP_USER_PATH.rumpdev_pci}
RUMPCOMP_USER_SRCS= ${RUMPCOMP_USER_SRCS.rumpdev_pci}
-MYDIR:= ${.PARSEDIR}
-RUMPCOMP_USER_CPPFLAGS= -I${MYDIR}
RUMPCOMP_USER_CPPFLAGS+=${RUMPCOMP_USER_CPPFLAGS.rumpdev_pci}
RUMPCOMP_USER_CFLAGS= ${RUMPCOMP_USER_CFLAGS.rumpdev_pci}
-
CPPFLAGS+= ${RUMPCOMP_CPPFLAGS.rumpdev_pci}
-
-# XXX: messy
-.undef RUMPKERN_ONLY
-
+.endif
.ifdef RUMPCOMP_MAKEFILEINC.rumpdev_pci
-.warning RUMPCOMP_MAKEFILEINC interface is unstable and may change
.include "${RUMPCOMP_MAKEFILEINC.rumpdev_pci}"
.endif
+# XXX: messy
+.undef RUMPKERN_ONLY
+
.include "${RUMPTOP}/Makefile.rump"
.include
.include
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Mon Jan 18 14:37:54 UTC 2016
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_bus_space.c
Log Message:
Implement the inverse of a nop.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
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/lib/libpci/rumpdev_bus_space.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.6 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.7
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.6 Tue Aug 11 22:28:34 2015
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Mon Jan 18 14:37:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_space.c,v 1.6 2015/08/11 22:28:34 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_space.c,v 1.7 2016/01/18 14:37:53 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -272,6 +272,9 @@ bus_space_unmap(bus_space_tag_t bst, bus
bus_size_t size)
{
+ if (bst == 0)
+ return;
+
panic("%s: unimplemented", __func__);
}
CVS commit: src/sys/rump/dev/lib/libraidframe
Module Name:src
Committed By: pgoyette
Date: Sat Dec 26 10:22:09 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libraidframe: raidframe_component.c
Log Message:
Detach the {b,c}devsw after obtaining the device major numbers. We'll
re-attach during module initialization.
This enables the atf tests to once again succeed.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/rump/dev/lib/libraidframe/raidframe_component.c
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/lib/libraidframe/raidframe_component.c
diff -u src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.3 src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.4
--- src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.3 Sat Dec 26 01:01:30 2015
+++ src/sys/rump/dev/lib/libraidframe/raidframe_component.c Sat Dec 26 10:22:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframe_component.c,v 1.3 2015/12/26 01:01:30 pgoyette Exp $ */
+/* $NetBSD: raidframe_component.c,v 1.4 2015/12/26 10:22:09 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.3 2015/12/26 01:01:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.4 2015/12/26 10:22:09 pgoyette Exp $");
#include
#include
@@ -46,13 +46,17 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
devmajor_t bmaj, cmaj;
int error;
- config_cfdriver_attach(_cd);
-
bmaj = cmaj = -1;
if ((error = devsw_attach("raid", _bdevsw, ,
_cdevsw, )) != 0)
panic("raid devsw attach failed: %d", error);
+ /*
+ * Now that we have the major numbers, detach. It will get
+ * re-attached later during raid's module initialization.
+ */
+ devsw_detach(_bdevsw, _cdevsw);
+
if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/raid0", 'a',
bmaj, 0, 7)) != 0)
panic("cannot create cooked raid dev nodes: %d", error);
CVS commit: src/sys/rump/dev/lib/libraidframe
Module Name:src
Committed By: pgoyette
Date: Sat Dec 26 01:01:30 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libraidframe: raidframe_component.c
Log Message:
Remove local CF_DRIVER_DECL - it is now defined in the raidframe driver's
module initialization code
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/rump/dev/lib/libraidframe/raidframe_component.c
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/lib/libraidframe/raidframe_component.c
diff -u src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.2 src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.3
--- src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.2 Thu Aug 20 11:51:12 2015
+++ src/sys/rump/dev/lib/libraidframe/raidframe_component.c Sat Dec 26 01:01:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframe_component.c,v 1.2 2015/08/20 11:51:12 christos Exp $ */
+/* $NetBSD: raidframe_component.c,v 1.3 2015/12/26 01:01:30 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.2 2015/08/20 11:51:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.3 2015/12/26 01:01:30 pgoyette Exp $");
#include
#include
@@ -39,8 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: raidframe_co
#include "ioconf.h"
-CFDRIVER_DECL(raid, DV_DISK, NULL);
-
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
extern const struct bdevsw raid_bdevsw;
CVS commit: src/sys/rump/dev/lib
Module Name:src
Committed By: pooka
Date: Tue Nov 17 01:07:34 UTC 2015
Modified Files:
src/sys/rump/dev/lib: Makefile.inc
Log Message:
Fix argument to empty()
Guess none of the fast-running tests exercised the
component being initialized ...
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/Makefile.inc
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/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.6 src/sys/rump/dev/lib/Makefile.inc:1.7
--- src/sys/rump/dev/lib/Makefile.inc:1.6 Mon Nov 16 23:27:07 2015
+++ src/sys/rump/dev/lib/Makefile.inc Tue Nov 17 01:07:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2015/11/16 23:27:07 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.7 2015/11/17 01:07:34 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../..
@@ -6,7 +6,7 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
RUMPDEVLIBDIR:= ${.PARSEDIR}
-.if defined(RUMP_COMPONENT) && !empty(${RUMP_COMPONENT:Mioconf})
+.if defined(RUMP_COMPONENT) && !empty(RUMP_COMPONENT:Mioconf)
.PATH: ${RUMPDEVLIBDIR}
SRCS+= component_simple.c
.endif
CVS commit: src/sys/rump/dev/lib
Module Name:src
Committed By: pooka
Date: Wed Nov 11 21:52:47 UTC 2015
Modified Files:
src/sys/rump/dev/lib: Makefile.inc
src/sys/rump/dev/lib/libmiiphy: Makefile
src/sys/rump/dev/lib/libpci_auich: Makefile
src/sys/rump/dev/lib/libpci_eap: Makefile
src/sys/rump/dev/lib/libpci_if_iwn: Makefile
src/sys/rump/dev/lib/libpci_if_pcn: Makefile
src/sys/rump/dev/lib/libpci_if_wm: Makefile
src/sys/rump/dev/lib/libpci_usbhc: Makefile
src/sys/rump/dev/lib/libpci_virtio: Makefile
src/sys/rump/dev/lib/libubt: Makefile
src/sys/rump/dev/lib/libugenhc: Makefile
src/sys/rump/dev/lib/libusb: Makefile
src/sys/rump/dev/lib/libvirtio_if_vioif: Makefile
src/sys/rump/dev/lib/libvirtio_ld: Makefile
src/sys/rump/dev/lib/libvirtio_viornd: Makefile
src/sys/rump/dev/lib/libvirtio_vioscsi: Makefile
Added Files:
src/sys/rump/dev/lib: component_simple.c
Removed Files:
src/sys/rump/dev/lib/libmiiphy: phy_at_mii.c
src/sys/rump/dev/lib/libpci_auich: auich_at_pci.c
src/sys/rump/dev/lib/libpci_eap: eap_at_pci.c
src/sys/rump/dev/lib/libpci_if_iwn: iwn_at_pci.c
src/sys/rump/dev/lib/libpci_if_pcn: pcn_at_pci.c
src/sys/rump/dev/lib/libpci_if_wm: wm_at_pci.c
src/sys/rump/dev/lib/libpci_usbhc: usbhc_at_pci.c
src/sys/rump/dev/lib/libpci_virtio: virtio_at_pci.c
src/sys/rump/dev/lib/libubt: ubt_at_usb.c
src/sys/rump/dev/lib/libugenhc: ugenhc_at_mainbus.c
src/sys/rump/dev/lib/libusb: usb_at_hc.c
src/sys/rump/dev/lib/libvirtio_if_vioif: vioif_at_virtio.c
src/sys/rump/dev/lib/libvirtio_viornd: viornd_at_virtio.c
src/sys/rump/dev/lib/libvirtio_vioscsi: vioscsi_at_virtio.c
Log Message:
Make it easier to create rump kernel components, part 1.
Reduce copypasteware for the component constructors. If a constructor
calls only config_init_component(), handle it from a common source file
instead of copying the same(ish) file around to every component.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/component_simple.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libmiiphy/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libmiiphy/phy_at_mii.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci_auich/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_auich/auich_at_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci_eap/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci_if_iwn/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_if_iwn/iwn_at_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci_if_pcn/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_if_pcn/pcn_at_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci_if_wm/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_if_wm/wm_at_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_usbhc/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_usbhc/usbhc_at_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci_virtio/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libpci_virtio/virtio_at_pci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libubt/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/lib/libubt/ubt_at_usb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libugenhc/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libusb/usb_at_hc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
cvs rdiff -u -r1.1 -r0 \
src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libvirtio_ld/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libvirtio_viornd/Makefile
cvs rdiff -u -r1.1 -r0 \
src/sys/rump/dev/lib/libvirtio_viornd/viornd_at_virtio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile
cvs rdiff -u -r1.1 -r0 \
src/sys/rump/dev/lib/libvirtio_vioscsi/vioscsi_at_virtio.c
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/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.4 src/sys/rump/dev/lib/Makefile.inc:1.5
--- src/sys/rump/dev/lib/Makefile.inc:1.4 Mon Aug 24 23:01:58 2015
+++ src/sys/rump/dev/lib/Makefile.inc Wed Nov 11 21:52:45 2015
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.4 2015/08/24 23:01:58 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.5 2015/11/11 21:52:45 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../..
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev
+RUMPDEVLIBDIR:= ${.PARSEDIR}
+.ifdef COMPONENT_SIMPLE
+.PATH:
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Sun Nov 1 22:41:24 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: Makefile
Log Message:
Allow PCI implementers to specify arbitrary makefile constructs.
(interface subject to change)
from Robert Millan
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libpci/Makefile
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/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.8 src/sys/rump/dev/lib/libpci/Makefile:1.9
--- src/sys/rump/dev/lib/libpci/Makefile:1.8 Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libpci/Makefile Sun Nov 1 22:41:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/10/19 16:16:33 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2015/11/01 22:41:24 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
@@ -43,6 +43,11 @@ CPPFLAGS+= ${RUMPCOMP_CPPFLAGS.rumpdev_
# XXX: messy
.undef RUMPKERN_ONLY
+.ifdef RUMPCOMP_MAKEFILEINC.rumpdev_pci
+.warning RUMPCOMP_MAKEFILEINC interface is unstable and may change
+.include "${RUMPCOMP_MAKEFILEINC.rumpdev_pci}"
+.endif
+
.include "${RUMPTOP}/Makefile.rump"
.include
.include
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Mon Sep 14 15:08:50 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc_dma.c
Log Message:
Note in comment why this "d"ma implementation is not in libusb.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c
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/lib/libugenhc/ugenhc_dma.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.1 src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.2
--- src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.1 Thu Sep 19 17:55:22 2013
+++ src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c Mon Sep 14 15:08:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc_dma.c,v 1.1 2013/09/19 17:55:22 pooka Exp $ */
+/* $NetBSD: ugenhc_dma.c,v 1.2 2015/09/14 15:08:50 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,16 @@
#include
/*
- * bus_dma(9) that works for USB drivers
+ * bus_dma(9) that works for USB drivers.
+ *
+ * So why is it here instead of in libusb? Well, first of all, it's
+ * actually a bus_dma implementation which works with ugenhc. Of course,
+ * ugenhc doesn't make any bus_dma calls itself, all of those calls come
+ * from the usb code. However, the USB component can be paired with other
+ * USB host controllers, such as {e,o,u}hci. Therefore, we keep the "D"MA
+ * code here.
+ *
+ * Note: this implementation requires a __HAVE_NEW_STYLE_BUS_H arch
*/
int
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Mon Sep 14 15:09:35 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libugenhc: Makefile
Log Message:
Fully build ugenhc only on archs where libusb is built.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libugenhc/Makefile
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/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.8 src/sys/rump/dev/lib/libugenhc/Makefile:1.9
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.8 Thu Mar 13 01:38:11 2014
+++ src/sys/rump/dev/lib/libugenhc/Makefile Mon Sep 14 15:09:35 2015
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/03/13 01:38:11 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2015/09/14 15:09:35 pooka Exp $
#
LIB= rumpdev_ugenhc
+
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
IOCONF= UGENHC.ioconf
SRCS= ugenhc.c ugenhc_at_mainbus.c ugenhc_dma.c
@@ -9,6 +11,10 @@ SRCS= ugenhc.c ugenhc_at_mainbus.c ugenh
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
RUMPCOMP_USER_SRCS= ugenhc_user.c
+.else
+.PATH: ${.CURDIR}/../libusb
+SRCS= dummy.c
+.endif
.include
.include
CVS commit: src/sys/rump/dev/lib/libraidframe
Module Name:src
Committed By: christos
Date: Thu Aug 20 11:58:26 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libraidframe: Makefile
Log Message:
put back bsd.init.mk
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libraidframe/Makefile
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/lib/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.7 src/sys/rump/dev/lib/libraidframe/Makefile:1.8
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.7 Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libraidframe/Makefile Thu Aug 20 07:58:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/08/20 11:51:12 christos Exp $
+# $NetBSD: Makefile,v 1.8 2015/08/20 11:58:26 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev/raidframe
@@ -23,6 +23,8 @@ SRCS= rf_acctrace.c rf_alloclist.c rf_
SRCS+= raidframe_component.c
+.include bsd.init.mk
+
.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= rf_compat50.c
.endif
CVS commit: src/sys/rump/dev/lib
Module Name:src
Committed By: christos
Date: Thu Aug 20 11:51:12 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libcgd: Makefile
src/sys/rump/dev/lib/libdm: Makefile
src/sys/rump/dev/lib/libfss: Makefile
src/sys/rump/dev/lib/libnetsmb: Makefile netsmb_component.c
src/sys/rump/dev/lib/libopencrypto: Makefile opencrypto_component.c
src/sys/rump/dev/lib/libraidframe: Makefile raidframe_component.c
src/sys/rump/dev/lib/librnd: Makefile rnd_component.c
src/sys/rump/dev/lib/libvnd: Makefile
Added Files:
src/sys/rump/dev/lib/libcgd: CGD.ioconf
src/sys/rump/dev/lib/libdm: DM.ioconf
src/sys/rump/dev/lib/libfss: FSS.ioconf
src/sys/rump/dev/lib/libnetsmb: NETSMB.ioconf
src/sys/rump/dev/lib/libopencrypto: OPENCRYPTO.ioconf
src/sys/rump/dev/lib/libraidframe: RAIDFRAME.ioconf
src/sys/rump/dev/lib/librnd: RND.ioconf
src/sys/rump/dev/lib/libvnd: VND.ioconf
Log Message:
use ioconf files for pseudo-device attach prototypes
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libcgd/CGD.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libcgd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdm/DM.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libdm/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libfss/FSS.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libfss/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libnetsmb/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libnetsmb/NETSMB.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libopencrypto/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libopencrypto/OPENCRYPTO.ioconf
cvs rdiff -u -r1.2 -r1.3 \
src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libraidframe/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libraidframe/RAIDFRAME.ioconf
cvs rdiff -u -r1.1 -r1.2 \
src/sys/rump/dev/lib/libraidframe/raidframe_component.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/librnd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/librnd/RND.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/librnd/rnd_component.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libvnd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvnd/VND.ioconf
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/lib/libcgd/Makefile
diff -u src/sys/rump/dev/lib/libcgd/Makefile:1.4 src/sys/rump/dev/lib/libcgd/Makefile:1.5
--- src/sys/rump/dev/lib/libcgd/Makefile:1.4 Wed Mar 12 21:50:51 2014
+++ src/sys/rump/dev/lib/libcgd/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/03/13 01:50:51 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev
LIB= rumpdev_cgd
-
+IOCONF= CGD.ioconf
SRCS= cgd.c cgd_crypto.c
SRCS+= cgd_component.c
Index: src/sys/rump/dev/lib/libdm/Makefile
diff -u src/sys/rump/dev/lib/libdm/Makefile:1.4 src/sys/rump/dev/lib/libdm/Makefile:1.5
--- src/sys/rump/dev/lib/libdm/Makefile:1.4 Wed Mar 12 21:54:22 2014
+++ src/sys/rump/dev/lib/libdm/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/03/13 01:54:22 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev/dm
LIB= rumpdev_dm
-
+IOCONF= DM.ioconf
SRCS= device-mapper.c dm_dev.c dm_ioctl.c dm_pdev.c dm_table.c dm_target.c \
dm_target_linear.c dm_target_stripe.c
Index: src/sys/rump/dev/lib/libfss/Makefile
diff -u src/sys/rump/dev/lib/libfss/Makefile:1.2 src/sys/rump/dev/lib/libfss/Makefile:1.3
--- src/sys/rump/dev/lib/libfss/Makefile:1.2 Wed Mar 12 21:59:05 2014
+++ src/sys/rump/dev/lib/libfss/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 01:59:05 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../dev
LIB= rumpdev_fss
-
+IOCONF= FSS.ioconf
SRCS= fss.c
SRCS+= fss_component.c
Index: src/sys/rump/dev/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.5 src/sys/rump/dev/lib/libnetsmb/Makefile:1.6
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.5 Sat Nov 15 13:49:04 2014
+++ src/sys/rump/dev/lib/libnetsmb/Makefile Thu Aug 20 07:51:12 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/11/15 18:49:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2015/08/20 11:51:12 christos Exp $
#
.PATH: ${.CURDIR}/../../../../netsmb
LIB= rumpdev_netsmb
-
+IOCONF= NETSMB.ioconf
SRCS= iconv.c smb_conn.c smb_crypt.c smb_dev.c smb_iod.c smb_rq.c \
smb_smb.c smb_subr.c smb_trantcp.c smb_usr.c subr_mchain.c
@@ -14,7 +14,7 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
CVS commit: src/sys/rump/dev/lib/libnetsmb
Module Name:src
Committed By: christos
Date: Thu Aug 20 14:27:15 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libnetsmb: Makefile
Log Message:
XXX: there must be a better way to do this.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libnetsmb/Makefile
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/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.6 src/sys/rump/dev/lib/libnetsmb/Makefile:1.7
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.6 Thu Aug 20 07:51:12 2015
+++ src/sys/rump/dev/lib/libnetsmb/Makefile Thu Aug 20 10:27:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/08/20 11:51:12 christos Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/20 14:27:15 christos Exp $
#
.PATH: ${.CURDIR}/../../../../netsmb
@@ -14,7 +14,7 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
#CPPFLAGS+= -DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG
SRCS+= netsmb_iconv.c
-#RUMPCOMP_USER_SRCS= netsmb_user.c
+RUMPCOMP_USER_SRCS= netsmb_user.c
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Tue Aug 11 22:28:34 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_bus_space.c
Log Message:
Fix handle typos/pastos in bus_space_barrier() calls
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
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/lib/libpci/rumpdev_bus_space.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.5 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.6
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.5 Mon Jun 15 15:38:52 2015
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Tue Aug 11 22:28:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_space.c,v 1.5 2015/06/15 15:38:52 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_space.c,v 1.6 2015/08/11 22:28:34 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -134,7 +134,7 @@ bus_space_read_multi_1(bus_space_tag_t b
while (count--) {
*datap++ = bus_space_read_1(bst, bsh, offset);
- bus_space_barrier(bst, bst, offset, 1, BUS_SPACE_BARRIER_READ);
+ bus_space_barrier(bst, bsh, offset, 1, BUS_SPACE_BARRIER_READ);
}
}
@@ -145,7 +145,7 @@ bus_space_read_multi_2(bus_space_tag_t b
while (count--) {
*datap++ = bus_space_read_2(bst, bsh, offset);
- bus_space_barrier(bst, bst, offset, 2, BUS_SPACE_BARRIER_READ);
+ bus_space_barrier(bst, bsh, offset, 2, BUS_SPACE_BARRIER_READ);
}
}
@@ -156,7 +156,7 @@ bus_space_read_multi_4(bus_space_tag_t b
while (count--) {
*datap++ = bus_space_read_4(bst, bsh, offset);
- bus_space_barrier(bst, bst, offset, 4, BUS_SPACE_BARRIER_READ);
+ bus_space_barrier(bst, bsh, offset, 4, BUS_SPACE_BARRIER_READ);
}
}
@@ -220,7 +220,7 @@ bus_space_write_multi_1(bus_space_tag_t
const uint8_t value = *datap++;
bus_space_write_1(bst, bsh, offset, value);
- bus_space_barrier(bst, bst, offset, 1, BUS_SPACE_BARRIER_WRITE);
+ bus_space_barrier(bst, bsh, offset, 1, BUS_SPACE_BARRIER_WRITE);
}
}
@@ -233,7 +233,7 @@ bus_space_write_multi_2(bus_space_tag_t
const uint16_t value = *datap++;
bus_space_write_2(bst, bsh, offset, value);
- bus_space_barrier(bst, bst, offset, 2, BUS_SPACE_BARRIER_WRITE);
+ bus_space_barrier(bst, bsh, offset, 2, BUS_SPACE_BARRIER_WRITE);
}
}
@@ -246,7 +246,7 @@ bus_space_write_multi_4(bus_space_tag_t
const uint32_t value = *datap++;
bus_space_write_4(bst, bsh, offset, value);
- bus_space_barrier(bst, bst, offset, 4, BUS_SPACE_BARRIER_WRITE);
+ bus_space_barrier(bst, bsh, offset, 4, BUS_SPACE_BARRIER_WRITE);
}
}
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Mon Jun 15 15:38:52 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: Makefile pci_at_mainbus.c pci_user.h
rumpdev_bus_dma.c rumpdev_bus_space.c
Log Message:
Add a userfeature definition for iospace. I/O space is supported if
that flag is given and calling the init routine succeeds (and we're on
x86, which we probably need to be on anyway for this PCI component to
currently be supported).
Also, some adjustments to make things between flags consistent, namely
deprecate the Makefile variable RUMP_PCI_IOSPACE and don't require
userfeature.h to map 1:1 to the interfaces.
Includes contributions from Robert Millan.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libpci/Makefile \
src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/pci_user.h \
src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c \
src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
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/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.5 src/sys/rump/dev/lib/libpci/Makefile:1.6
--- src/sys/rump/dev/lib/libpci/Makefile:1.5 Wed Jun 3 13:41:56 2015
+++ src/sys/rump/dev/lib/libpci/Makefile Mon Jun 15 15:38:52 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/06/03 13:41:56 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/15 15:38:52 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
@@ -26,7 +26,7 @@ CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.if ${RUMP_PCI_IOSPACE:Uno} == yes
-CPPFLAGS+=-DRUMP_PCI_IOSPACE
+.error RUMP_PCI_IOSPACE defined in Makefile. Use userfeatures.h instead.
.endif
.PATH: ${RUMPCOMP_USER_PATH.rumpdev_pci}
Index: src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
diff -u src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.5 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.6
--- src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.5 Fri Aug 22 14:28:58 2014
+++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Mon Jun 15 15:38:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_at_mainbus.c,v 1.5 2014/08/22 14:28:58 pooka Exp $ */
+/* $NetBSD: pci_at_mainbus.c,v 1.6 2015/06/15 15:38:52 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.5 2014/08/22 14:28:58 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.6 2015/06/15 15:38:52 pooka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -43,6 +43,8 @@ __KERNEL_RCSID(0, $NetBSD: pci_at_mainb
#include rump_private.h
#include rump_vfs_private.h
+#include pci_user.h
+
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
extern const struct cdevsw pci_cdevsw;
@@ -80,8 +82,17 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERM
#endif
pba.pba_flags = PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;;
-#ifdef RUMP_PCI_IOSPACE
- pba.pba_flags |= PCI_FLAGS_IO_OKAY;
+
+#ifdef RUMPCOMP_USERFEATURE_PCI_IOSPACE
+ int error;
+
+ error = rumpcomp_pci_iospace_init();
+ if (!error) {
+ pba.pba_flags |= PCI_FLAGS_IO_OKAY;
+ } else {
+ aprint_error(pci: I/O space init error %d, I/O space not
+ available\n, error);
+ }
#endif
mainbus = device_find_by_driver_unit(mainbus, 0);
Index: src/sys/rump/dev/lib/libpci/pci_user.h
diff -u src/sys/rump/dev/lib/libpci/pci_user.h:1.4 src/sys/rump/dev/lib/libpci/pci_user.h:1.5
--- src/sys/rump/dev/lib/libpci/pci_user.h:1.4 Wed Jun 3 13:55:42 2015
+++ src/sys/rump/dev/lib/libpci/pci_user.h Mon Jun 15 15:38:52 2015
@@ -1,3 +1,14 @@
+/*
+ * Possible userfeature macro flags:
+ *
+ * RUMPCOMP_USERFEATURE_PCI_DMAFREE:
+ * Support free'ing DMA memory. If not, panic() when free() is called.
+ *
+ * RUMPCOMP_USERFEATURE_PCI_IOSPACE
+ * Support for PCI I/O space. If yes, rumpcomp_pci_iospace_init()
+ * must be provided.
+ */
+
#include rumpcomp_userfeatures_pci.h
void *rumpcomp_pci_map(unsigned long, unsigned long);
@@ -9,8 +20,8 @@ void *rumpcomp_pci_irq_establish(unsigne
/* XXX: needs work: support boundary-restricted allocations */
int rumpcomp_pci_dmalloc(size_t, size_t, unsigned long *, unsigned long *);
-#ifdef rumpcomp_pci_free
-void rumpcomp_pci_free(unsigned long, size_t);
+#ifdef RUMPCOMP_USERFEATURE_PCI_DMAFREE
+void rumpcomp_pci_dmafree(unsigned long, size_t);
#endif
struct rumpcomp_pci_dmaseg {
@@ -22,3 +33,7 @@ int rumpcomp_pci_dmamem_map(struct rumpc
void **);
unsigned long rumpcomp_pci_virt_to_mach(void *);
+
+#ifdef RUMPCOMP_USERFEATURE_PCI_IOSPACE
+int rumpcomp_pci_iospace_init(void);
+#endif
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.4 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.5
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.4 Wed Jun 3
CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: pooka
Date: Sat Jun 13 23:33:20 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Log Message:
fix snafu to enable umass component also for amd64
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libumass/Makefile
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/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.7 src/sys/rump/dev/lib/libumass/Makefile:1.8
--- src/sys/rump/dev/lib/libumass/Makefile:1.7 Thu Mar 13 01:54:59 2014
+++ src/sys/rump/dev/lib/libumass/Makefile Sat Jun 13 23:33:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/13 01:54:59 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/13 23:33:20 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -6,7 +6,7 @@
LIB= rumpdev_umass
IOCONF= UMASS.ioconf
-.if ${MACHINE} == i386
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
SRCS+= umass_component.c
CVS commit: src/sys/rump/dev/lib/libaudio
Module Name:src
Committed By: pooka
Date: Mon Jun 8 12:18:04 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libaudio: audio_component.c
Log Message:
create /dev/{audio,sound,mixer,audioctl} - foo0 symlinks
from Robert Millan r...@freebsd.org via rumpkernel-users
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libaudio/audio_component.c
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/lib/libaudio/audio_component.c
diff -u src/sys/rump/dev/lib/libaudio/audio_component.c:1.1 src/sys/rump/dev/lib/libaudio/audio_component.c:1.2
--- src/sys/rump/dev/lib/libaudio/audio_component.c:1.1 Thu Mar 13 01:57:52 2014
+++ src/sys/rump/dev/lib/libaudio/audio_component.c Mon Jun 8 12:18:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: audio_component.c,v 1.1 2014/03/13 01:57:52 pooka Exp $ */
+/* $NetBSD: audio_component.c,v 1.2 2015/06/08 12:18:04 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audio_component.c,v 1.1 2014/03/13 01:57:52 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: audio_component.c,v 1.2 2015/06/08 12:18:04 pooka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -57,13 +57,21 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
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_makesymlink(audio0, /dev/audio)) != 0)
+ panic(cannot create audio symlink: %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_makesymlink(sound0, /dev/sound)) != 0)
+ panic(cannot create sound symlink: %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_makesymlink(audioctl0, /dev/audioctl)) != 0)
+ panic(cannot create audioctl symlink: %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);
+ if ((error = rump_vfs_makesymlink(mixer0, /dev/mixer)) != 0)
+ panic(cannot create mixer symlink: %d, error);
}
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Wed Jun 3 13:41:56 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: Makefile
Log Message:
Rework how the external hypercalls are specified, more in the direction of
something general. I'm not sure if it's entirely general yet (since PCI
is the only place to use it), but at least a step in the right direction.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/Makefile
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/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.4 src/sys/rump/dev/lib/libpci/Makefile:1.5
--- src/sys/rump/dev/lib/libpci/Makefile:1.4 Fri Aug 22 14:28:58 2014
+++ src/sys/rump/dev/lib/libpci/Makefile Wed Jun 3 13:41:56 2015
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/08/22 14:28:58 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/03 13:41:56 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
+.include bsd.own.mk
+
.PATH: ${RUMPTOP}/../dev/pci
LIB= rumpdev_pci
@@ -27,11 +29,17 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
CPPFLAGS+=-DRUMP_PCI_IOSPACE
.endif
-.if defined(RUMP_PCI_USER)
-RUMPCOMP_USER_SRCS= ${RUMP_PCI_USER}
-RUMPCOMP_INCS_DIR:= ${.PARSEDIR}
-RUMPCOMP_USER_CPPFLAGS=-I${RUMPCOMP_INCS_DIR}
-.endif
+.PATH: ${RUMPCOMP_USER_PATH.rumpdev_pci}
+RUMPCOMP_USER_SRCS= ${RUMPCOMP_USER_SRCS.rumpdev_pci}
+MYDIR:= ${.PARSEDIR}
+RUMPCOMP_USER_CPPFLAGS= -I${MYDIR}
+RUMPCOMP_USER_CPPFLAGS+=${RUMPCOMP_USER_CPPFLAGS.rumpdev_pci}
+RUMPCOMP_USER_CFLAGS= ${RUMPCOMP_USER_CFLAGS.rumpdev_pci}
+
+CPPFLAGS+= ${RUMPCOMP_CPPFLAGS.rumpdev_pci}
+
+# XXX: messy
+.undef RUMPKERN_ONLY
.include ${RUMPTOP}/Makefile.rump
.include bsd.lib.mk
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src Committed By: pooka Date: Wed Jun 3 13:43:24 UTC 2015 Modified Files: src/sys/rump/dev/lib/libpci: pci_user.h Log Message: Demand that rumpcomp_userfeatures_pci.h is available for providing information about the hypercall interface implementation. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci/pci_user.h 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/lib/libpci/pci_user.h diff -u src/sys/rump/dev/lib/libpci/pci_user.h:1.2 src/sys/rump/dev/lib/libpci/pci_user.h:1.3 --- src/sys/rump/dev/lib/libpci/pci_user.h:1.2 Mon Apr 14 21:43:00 2014 +++ src/sys/rump/dev/lib/libpci/pci_user.h Wed Jun 3 13:43:23 2015 @@ -1,3 +1,5 @@ +#include rumpcomp_userfeatures_pci.h + void *rumpcomp_pci_map(unsigned long, unsigned long); int rumpcomp_pci_confread(unsigned, unsigned, unsigned, int, unsigned int *); int rumpcomp_pci_confwrite(unsigned, unsigned, unsigned, int, unsigned int);
CVS commit: src/sys/rump/dev/lib/libusb
Module Name:src
Committed By: pooka
Date: Wed May 20 11:53:08 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libusb: Makefile
Added Files:
src/sys/rump/dev/lib/libusb: usb_at_hc.c
Removed Files:
src/sys/rump/dev/lib/libusb: usb_at_ugenhc.c
Log Message:
Rename usb_at_ugenhc.c to the more generic usb_at_hc.c now that
host controllers beyond ugenhc are attached.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libusb/usb_at_hc.c
cvs rdiff -u -r1.3 -r0 src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c
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/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.6 src/sys/rump/dev/lib/libusb/Makefile:1.7
--- src/sys/rump/dev/lib/libusb/Makefile:1.6 Mon Jan 31 00:10:06 2011
+++ src/sys/rump/dev/lib/libusb/Makefile Wed May 20 11:53:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/01/31 00:10:06 christos Exp $
+# $NetBSD: Makefile,v 1.7 2015/05/20 11:53:08 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -10,7 +10,7 @@ IOCONF= USB.ioconf
SRCS= usb.c usbdi.c usbdi_util.c usb_mem.c usb_subr.c usb_quirks.c \
uhub.c usbroothub_subr.c usb_verbose.c
-SRCS+= usb_at_ugenhc.c
+SRCS+= usb_at_hc.c
.else
SRCS= dummy.c
.endif
Added files:
Index: src/sys/rump/dev/lib/libusb/usb_at_hc.c
diff -u /dev/null src/sys/rump/dev/lib/libusb/usb_at_hc.c:1.1
--- /dev/null Wed May 20 11:53:08 2015
+++ src/sys/rump/dev/lib/libusb/usb_at_hc.c Wed May 20 11:53:08 2015
@@ -0,0 +1,20 @@
+/* $NetBSD: usb_at_hc.c,v 1.1 2015/05/20 11:53:08 pooka Exp $ */
+
+#include sys/param.h
+#include sys/types.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/kmem.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+#include rump_dev_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_usb,
+ cfattach_ioconf_usb, cfdata_ioconf_usb);
+}
CVS commit: src/sys/rump/dev/lib/libusb
Module Name:src
Committed By: pooka
Date: Wed May 20 11:51:32 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libusb: USB.ioconf
Log Message:
also attach usb@{e,o,u}hci
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libusb/USB.ioconf
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/lib/libusb/USB.ioconf
diff -u src/sys/rump/dev/lib/libusb/USB.ioconf:1.1 src/sys/rump/dev/lib/libusb/USB.ioconf:1.2
--- src/sys/rump/dev/lib/libusb/USB.ioconf:1.1 Mon Mar 8 10:24:37 2010
+++ src/sys/rump/dev/lib/libusb/USB.ioconf Wed May 20 11:51:32 2015
@@ -1,20 +1,36 @@
-# $NetBSD: USB.ioconf,v 1.1 2010/03/08 10:24:37 pooka Exp $
+# $NetBSD: USB.ioconf,v 1.2 2015/05/20 11:51:32 pooka Exp $
#
ioconf usb
include conf/files
include dev/usb/files.usb
+include dev/pci/files.pci
include rump/dev/files.rump
+# /dev/ugen fake host controller
pseudo-root ugenhc*
+# PCI host controllers
+pseudo-root ehci*
+pseudo-root ohci*
+pseudo-root uhci*
+
+
+#
# USB bus support
+#
usb*at ugenhc?
+usb* at ehci?
+usb* at ohci?
+usb* at uhci?
+
+
# USB ROOT Hub
#
# Do *NOT* configure uhub @ uhub.
# That is not compatible with ugen.
+# XXX: fix ugenhc to deal with it?
#
uhub* at usb?
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Sun May 17 13:45:37 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_bus_space.c
Log Message:
Implement bus_space_read/write_multi() and bus_space_subregion().
Used by (at least) wdc.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
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/lib/libpci/rumpdev_bus_space.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.3 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.4
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.3 Fri Aug 22 14:28:58 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Sun May 17 13:45:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_space.c,v 1.3 2014/08/22 14:28:58 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_space.c,v 1.4 2015/05/17 13:45:37 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -127,6 +127,39 @@ bus_space_read_4(bus_space_tag_t bst, bu
}
void
+bus_space_read_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint8_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ *datap++ = bus_space_read_1(bst, bsh, offset);
+ bus_space_barrier(bst, bst, offset, 1, BUS_SPACE_BARRIER_READ);
+ }
+}
+
+void
+bus_space_read_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint16_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ *datap++ = bus_space_read_2(bst, bsh, offset);
+ bus_space_barrier(bst, bst, offset, 2, BUS_SPACE_BARRIER_READ);
+ }
+}
+
+void
+bus_space_read_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint32_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ *datap++ = bus_space_read_4(bst, bsh, offset);
+ bus_space_barrier(bst, bst, offset, 4, BUS_SPACE_BARRIER_READ);
+ }
+}
+
+void
bus_space_write_1(bus_space_tag_t bst, bus_space_handle_t bsh,
bus_size_t offset, uint8_t v)
{
@@ -177,6 +210,45 @@ bus_space_write_4(bus_space_tag_t bst, b
}
}
+void
+bus_space_write_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, const uint8_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ const uint8_t value = *datap++;
+
+ bus_space_write_1(bst, bsh, offset, value);
+ bus_space_barrier(bst, bst, offset, 1, BUS_SPACE_BARRIER_WRITE);
+ }
+}
+
+void
+bus_space_write_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, const uint16_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ const uint16_t value = *datap++;
+
+ bus_space_write_2(bst, bsh, offset, value);
+ bus_space_barrier(bst, bst, offset, 2, BUS_SPACE_BARRIER_WRITE);
+ }
+}
+
+void
+bus_space_write_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, const uint32_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ const uint32_t value = *datap++;
+
+ bus_space_write_4(bst, bsh, offset, value);
+ bus_space_barrier(bst, bst, offset, 4, BUS_SPACE_BARRIER_WRITE);
+ }
+}
+
paddr_t
bus_space_mmap(bus_space_tag_t bst, bus_addr_t addr, off_t off,
int prot, int flags)
@@ -190,7 +262,8 @@ bus_space_subregion(bus_space_tag_t bst,
bus_size_t offset, bus_size_t size, bus_space_handle_t *nhandlep)
{
- panic(%s: unimplemented, __func__);
+ *nhandlep = bsh + offset;
+ return 0;
}
void
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Sun May 17 13:51:31 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_pci.c
Added Files:
src/sys/rump/dev/lib/libpci/opt: opt_pciide.h
Log Message:
Add pciide_machdep_compat_intr_establish().
Used by ... would you believe pciide?
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/rumpdev_pci.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci/opt/opt_pciide.h
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/lib/libpci/rumpdev_pci.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.4 src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.5
--- src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.4 Tue Aug 26 10:58:13 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_pci.c Sun May 17 13:51:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $ */
+/* $NetBSD: rumpdev_pci.c,v 1.5 2015/05/17 13:51:31 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpdev_pci.c,v 1.5 2015/05/17 13:51:31 pooka Exp $);
#include sys/cdefs.h
#include sys/param.h
@@ -166,3 +166,26 @@ pci_intr_disestablish(pci_chipset_tag_t
panic(%s: unimplemented, __func__);
}
+
+#ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+#include dev/pci/pcireg.h
+#include dev/pci/pcivar.h
+#include dev/pci/pciidereg.h
+#include dev/pci/pciidevar.h
+
+void *
+pciide_machdep_compat_intr_establish(device_t dev,
+ const struct pci_attach_args *pa, int chan,
+ int (*func)(void *), void *arg)
+{
+ pci_intr_handle_t ih;
+ struct pci_attach_args mypa = *pa;
+
+ mypa.pa_intrline = PCIIDE_COMPAT_IRQ(chan);
+ if (pci_intr_map(mypa, ih) != 0)
+ return NULL;
+ return rumpcomp_pci_irq_establish(ih, func, arg);
+}
+
+__strong_alias(pciide_machdep_compat_intr_disestablish,pci_intr_disestablish);
+#endif /* __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH */
Added files:
Index: src/sys/rump/dev/lib/libpci/opt/opt_pciide.h
diff -u /dev/null src/sys/rump/dev/lib/libpci/opt/opt_pciide.h:1.1
--- /dev/null Sun May 17 13:51:31 2015
+++ src/sys/rump/dev/lib/libpci/opt/opt_pciide.h Sun May 17 13:51:31 2015
@@ -0,0 +1 @@
+/* $NetBSD: opt_pciide.h,v 1.1 2015/05/17 13:51:31 pooka Exp $ */
CVS commit: src/sys/rump/dev/lib/libdisk
Module Name:src
Committed By: pooka
Date: Sat May 16 13:59:00 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libdisk: Makefile
Added Files:
src/sys/rump/dev/lib/libdisk: disk_component.c
Log Message:
Satisfy yet another non-modular driver still requiring a manual init call.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libdisk/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdisk/disk_component.c
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/lib/libdisk/Makefile
diff -u src/sys/rump/dev/lib/libdisk/Makefile:1.7 src/sys/rump/dev/lib/libdisk/Makefile:1.8
--- src/sys/rump/dev/lib/libdisk/Makefile:1.7 Tue Feb 16 20:42:44 2010
+++ src/sys/rump/dev/lib/libdisk/Makefile Sat May 16 13:59:00 2015
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2010/02/16 20:42:44 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2015/05/16 13:59:00 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../kern \
${.CURDIR}/../../../../dev ${.CURDIR}/../../../../dev/dkwedge
LIB= rumpdev_disk
+SRCS= disk_component.c
#
# We use subr_disk_mbr on all platforms. The current structure of
# code allows us to pick only one readdisklabel() routine. While
# this is not the native one for all platforms, it's probably the
# most common one in an image floating on the internetto.
-SRCS= subr_disk_mbr.c
+SRCS+= subr_disk_mbr.c
# sys/kern
SRCS+= subr_disk.c subr_disk_open.c
Added files:
Index: src/sys/rump/dev/lib/libdisk/disk_component.c
diff -u /dev/null src/sys/rump/dev/lib/libdisk/disk_component.c:1.1
--- /dev/null Sat May 16 13:59:00 2015
+++ src/sys/rump/dev/lib/libdisk/disk_component.c Sat May 16 13:59:00 2015
@@ -0,0 +1,43 @@
+/* $NetBSD: disk_component.c,v 1.1 2015/05/16 13:59:00 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: disk_component.c,v 1.1 2015/05/16 13:59:00 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/disk.h
+
+#include rump_private.h
+#include rump_dev_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ dkwedge_init();
+}
CVS commit: src/sys/rump/dev/lib/libvirtio_ld
Module Name:src
Committed By: pooka
Date: Sat May 16 15:03:12 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libvirtio_ld: ld_at_virtio.c
Log Message:
Autogenerate /dev/ldNx nodes based on which units attached instead of
hardcoding some arbitrary value for N.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c
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/lib/libvirtio_ld/ld_at_virtio.c
diff -u src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.1 src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.2
--- src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.1 Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c Sat May 16 15:03:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_at_virtio.c,v 1.1 2014/08/22 09:57:05 pooka Exp $ */
+/* $NetBSD: ld_at_virtio.c,v 1.2 2015/05/16 15:03:12 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,13 +26,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ld_at_virtio.c,v 1.1 2014/08/22 09:57:05 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ld_at_virtio.c,v 1.2 2015/05/16 15:03:12 pooka Exp $);
#include sys/param.h
#include sys/conf.h
#include sys/device.h
#include sys/bus.h
#include sys/stat.h
+#include sys/disklabel.h
#include rump_private.h
#include rump_vfs_private.h
@@ -46,21 +47,38 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
cfattach_ioconf_virtio_ld, cfdata_ioconf_virtio_ld);
}
-RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+/*
+ * Pseudo-devfs. Since creating device nodes is non-free, don't
+ * speculatively create hundreds of them (= milliseconds slower
+ * bootstrap). Instead, after the probe is done, see which units
+ * were found and create nodes only for them.
+ */
+RUMP_COMPONENT(RUMP_COMPONENT_POSTINIT)
{
extern const struct bdevsw ld_bdevsw;
extern const struct cdevsw ld_cdevsw;
devmajor_t bmaj = -1, cmaj = -1;
- int error;
+ int error, i;
if ((error = devsw_attach(ld, ld_bdevsw, bmaj,
ld_cdevsw, cmaj)) != 0)
panic(cannot attach ld: %d, error);
- if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/ld0, 'a',
- bmaj, 0, 7)) != 0)
- panic(cannot create cooked ld dev nodes: %d, error);
- if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rld0, 'a',
- cmaj, 0, 7)) != 0)
- panic(cannot create raw ld dev nodes: %d, error);
+ for (i = 0; i 10; i++) {
+ char bbase[] = /dev/ldX;
+ char rbase[] = /dev/rldX;
+
+ if (device_lookup(ld_cd, i) == NULL)
+ break;
+
+ bbase[sizeof(bbase)-2] = '0' + i;
+ rbase[sizeof(rbase)-2] = '0' + i;
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, bbase, 'a',
+ bmaj, DISKMINOR(i, 0), 5)) != 0)
+ panic(cannot create cooked ld dev nodes: %d, error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, rbase, 'a',
+ cmaj, DISKMINOR(i, 0), 5)) != 0)
+ panic(cannot create raw ld dev nodes: %d, error);
+ }
}
CVS commit: src/sys/rump/dev/lib/libsysmon
Module Name:src
Committed By: pgoyette
Date: Thu Apr 23 23:23:14 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libsysmon: sysmon_component.c
Log Message:
Update initialization of sysmon rump library sub-components. These are now
handled as part of module initialization, and do not require manual invocation.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libsysmon/sysmon_component.c
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/lib/libsysmon/sysmon_component.c
diff -u src/sys/rump/dev/lib/libsysmon/sysmon_component.c:1.1 src/sys/rump/dev/lib/libsysmon/sysmon_component.c:1.2
--- src/sys/rump/dev/lib/libsysmon/sysmon_component.c:1.1 Thu Mar 13 01:47:07 2014
+++ src/sys/rump/dev/lib/libsysmon/sysmon_component.c Thu Apr 23 23:23:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_component.c,v 1.1 2014/03/13 01:47:07 pooka Exp $ */
+/* $NetBSD: sysmon_component.c,v 1.2 2015/04/23 23:23:14 pgoyette Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_component.c,v 1.1 2014/03/13 01:47:07 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_component.c,v 1.2 2015/04/23 23:23:14 pgoyette Exp $);
#include sys/param.h
#include sys/conf.h
@@ -40,27 +40,22 @@ __KERNEL_RCSID(0, $NetBSD: sysmon_compo
#include rump_dev_private.h
#include rump_vfs_private.h
-#include ioconf.c
-
-void swwdogattach(int);
-void swsensorattach(int);
-
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
extern const struct cdevsw sysmon_cdevsw;
devmajor_t bmaj, cmaj;
int error;
- if ((error = config_init_component(cfdriver_ioconf_swwdog,
- cfattach_ioconf_swwdog, cfdata_ioconf_swwdog)) != 0) {
- printf(cannot attach swwdog: %d\n, error);
- return;
- }
-
+ /*
+ * Temporarily attach the devsw so we can determine our
+ * major device number. We'll detach it immediately, so
+ * normal module initialization can permanently attach.
+ */
bmaj = cmaj = -1;
if ((error = devsw_attach(sysmon, NULL, bmaj,
sysmon_cdevsw, cmaj)) != 0)
panic(sysmon devsw attach failed: %d, error);
+ devsw_detach(NULL, sysmon_cdevsw);
if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/sysmon,
cmaj, SYSMON_MINOR_ENVSYS)) != 0)
@@ -71,12 +66,4 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/power,
cmaj, SYSMON_MINOR_POWER)) != 0)
panic(cannot create /dev/power: %d, error);
-
- sysmon_task_queue_preinit();
- sysmon_task_queue_init();
- sysmon_envsys_init();
- sysmon_power_init();
- sysmon_wdog_init();
-
- rump_pdev_add(swwdogattach, 0);
}
CVS commit: src/sys/rump/dev/lib
Module Name:src
Committed By: nonaka
Date: Tue Nov 18 04:29:06 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libaudio: Makefile
src/sys/rump/dev/lib/libpad: Makefile
Log Message:
Adopy recent software volume control change.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libaudio/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpad/Makefile
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/lib/libaudio/Makefile
diff -u src/sys/rump/dev/lib/libaudio/Makefile:1.2 src/sys/rump/dev/lib/libaudio/Makefile:1.3
--- src/sys/rump/dev/lib/libaudio/Makefile:1.2 Thu Mar 13 01:57:52 2014
+++ src/sys/rump/dev/lib/libaudio/Makefile Tue Nov 18 04:29:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 01:57:52 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2014/11/18 04:29:06 nonaka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -6,7 +6,7 @@
LIB= rumpdev_audio
IOCONF= AUDIO.ioconf
-SRCS= audio.c auconv.c aurateconv.c mulaw.c
+SRCS= audio.c auconv.c aurateconv.c auvolconv.c mulaw.c
SRCS+= audio_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
Index: src/sys/rump/dev/lib/libpad/Makefile
diff -u src/sys/rump/dev/lib/libpad/Makefile:1.3 src/sys/rump/dev/lib/libpad/Makefile:1.4
--- src/sys/rump/dev/lib/libpad/Makefile:1.3 Thu Mar 13 01:52:04 2014
+++ src/sys/rump/dev/lib/libpad/Makefile Tue Nov 18 04:29:06 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2014/03/13 01:52:04 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/11/18 04:29:06 nonaka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/pad
LIB= rumpdev_pad
-SRCS= pad.c padvol.c
+SRCS= pad.c
SRCS+= pad_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
CVS commit: src/sys/rump/dev/lib/libnetsmb
Module Name:src Committed By: nakayama Date: Sun Nov 16 15:31:12 UTC 2014 Modified Files: src/sys/rump/dev/lib/libnetsmb: netsmb_user.c Log Message: Wrap iconv.h also with #ifdef __NetBSD__. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libnetsmb/netsmb_user.c 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/lib/libnetsmb/netsmb_user.c diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.3 --- src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.2 Sun Nov 16 04:26:46 2014 +++ src/sys/rump/dev/lib/libnetsmb/netsmb_user.c Sun Nov 16 15:31:12 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: netsmb_user.c,v 1.2 2014/11/16 04:26:46 nakayama Exp $ */ +/* $NetBSD: netsmb_user.c,v 1.3 2014/11/16 15:31:12 nakayama Exp $ */ /* * Copyright (c) 2014 Takeshi Nakayama. @@ -26,8 +26,10 @@ */ #ifndef _KERNEL #include stddef.h -#include iconv.h #include errno.h +#ifdef __NetBSD__ +#include iconv.h +#endif #include rump/rumpuser_component.h
CVS commit: src/sys/rump/dev/lib/libnetsmb
Module Name:src
Committed By: nakayama
Date: Sun Nov 16 04:26:46 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libnetsmb: netsmb_user.c
Log Message:
Using host iconv(3) is limited to NetBSD host.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_user.c
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/lib/libnetsmb/netsmb_user.c
diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.1 src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.2
--- src/sys/rump/dev/lib/libnetsmb/netsmb_user.c:1.1 Sat Nov 15 18:49:04 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_user.c Sun Nov 16 04:26:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netsmb_user.c,v 1.1 2014/11/15 18:49:04 nakayama Exp $ */
+/* $NetBSD: netsmb_user.c,v 1.2 2014/11/16 04:26:46 nakayama Exp $ */
/*
* Copyright (c) 2014 Takeshi Nakayama.
@@ -36,6 +36,7 @@
int
rumpcomp_netsmb_iconv_open(const char *to, const char *from, void **handle)
{
+#ifdef __NetBSD__
iconv_t cd;
int rv;
@@ -49,11 +50,16 @@ rumpcomp_netsmb_iconv_open(const char *t
}
return rumpuser_component_errtrans(rv);
+#else
+ /* fallback to use dumb copy function */
+ return 0;
+#endif
}
int
rumpcomp_netsmb_iconv_close(void *handle)
{
+#ifdef __NetBSD__
int rv;
if (iconv_close((iconv_t)handle) == -1)
@@ -62,12 +68,17 @@ rumpcomp_netsmb_iconv_close(void *handle
rv = 0;
return rumpuser_component_errtrans(rv);
+#else
+ /* do nothing */
+ return 0;
+#endif
}
int
rumpcomp_netsmb_iconv_conv(void *handle, const char **inbuf,
size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
{
+#ifdef __NetBSD__
int rv;
if (iconv((iconv_t)handle, inbuf, inbytesleft, outbuf, outbytesleft)
@@ -77,5 +88,9 @@ rumpcomp_netsmb_iconv_conv(void *handle,
rv = 0;
return rumpuser_component_errtrans(rv);
+#else
+ /* do nothing */
+ return 0;
+#endif
}
#endif
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Tue Aug 26 10:58:13 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_pci.c
Log Message:
Implement pci_intr_setattr()
(well, kinda. it just ignores the MPSAFE param for now, but that's
easy to fix later)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/rumpdev_pci.c
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/lib/libpci/rumpdev_pci.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.3 src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.4
--- src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.3 Tue Apr 15 13:47:06 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_pci.c Tue Aug 26 10:58:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_pci.c,v 1.3 2014/04/15 13:47:06 pooka Exp $ */
+/* $NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpdev_pci.c,v 1.3 2014/04/15 13:47:06 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $);
#include sys/cdefs.h
#include sys/param.h
@@ -147,6 +147,19 @@ pci_intr_establish(pci_chipset_tag_t pc,
return rumpcomp_pci_irq_establish(ih, func, arg);
}
+int
+pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ih,
+ int attr, uint64_t data)
+{
+
+ switch (attr) {
+ case PCI_INTR_MPSAFE:
+ return 0;
+ default:
+ return ENODEV;
+ }
+}
+
void
pci_intr_disestablish(pci_chipset_tag_t pc, void *not_your_above_ih)
{
CVS commit: src/sys/rump/dev/lib/libvirtio_if_vioif
Module Name:src
Committed By: pooka
Date: Fri Aug 22 09:48:54 UTC 2014
Added Files:
src/sys/rump/dev/lib/libvirtio_if_vioif: Makefile
VIRTIO_IF_VIOIF.ioconf shlib_version vioif_at_virtio.c
Log Message:
Add a rump kernel component for the vioif virtio network interface.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile \
src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf \
src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version \
src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile Fri Aug 22 09:48:54 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/08/22 09:48:54 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_virtio_if_vioif
+IOCONF= VIRTIO_IF_VIOIF.ioconf
+
+SRCS= vioif_at_virtio.c
+
+SRCS+= if_vioif.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/VIRTIO_IF_VIOIF.ioconf Fri Aug 22 09:48:54 2014
@@ -0,0 +1,12 @@
+# $NetBSD: VIRTIO_IF_VIOIF.ioconf,v 1.1 2014/08/22 09:48:54 pooka Exp $
+#
+
+ioconf virtio_if_vioif
+
+include conf/files
+include dev/pci/files.pci
+include rump/dev/files.rump
+
+pseudo-root virtio*
+
+vioif* at virtio? # Virtio network device
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/shlib_version Fri Aug 22 09:48:54 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c:1.1
--- /dev/null Fri Aug 22 09:48:54 2014
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/vioif_at_virtio.c Fri Aug 22 09:48:54 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: vioif_at_virtio.c,v 1.1 2014/08/22 09:48:54 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: vioif_at_virtio.c,v 1.1 2014/08/22 09:48:54 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_virtio_if_vioif,
+ cfattach_ioconf_virtio_if_vioif, cfdata_ioconf_virtio_if_vioif);
+}
CVS commit: src/sys/rump/dev/lib/libvirtio_ld
Module Name:src
Committed By: pooka
Date: Fri Aug 22 09:57:05 UTC 2014
Added Files:
src/sys/rump/dev/lib/libvirtio_ld: Makefile VIRTIO_LD.ioconf
ld_at_virtio.c shlib_version
Log Message:
Add a rump kernel component for ld@virtio.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvirtio_ld/Makefile \
src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf \
src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c \
src/sys/rump/dev/lib/libvirtio_ld/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libvirtio_ld/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_ld/Makefile:1.1
--- /dev/null Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/Makefile Fri Aug 22 09:57:05 2014
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2014/08/22 09:57:05 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev \
+ ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_virtio_ld
+IOCONF= VIRTIO_LD.ioconf
+
+SRCS= ld_at_virtio.c
+
+SRCS+= ld_virtio.c
+
+# XXX: ld.c does not really belong here, but placing it in libdisk
+# requires revamping config to be more modular in how CFDRIVER() is
+# used. moving ld up in the component tree later to libdisk won't
+# create problems, so just put it here for now. the excessive
+# dependencies of virtio_ld should prevent anyone from want to
+# provide ld via this component ...
+SRCS+= ld.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf:1.1
--- /dev/null Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/VIRTIO_LD.ioconf Fri Aug 22 09:57:05 2014
@@ -0,0 +1,12 @@
+# $NetBSD: VIRTIO_LD.ioconf,v 1.1 2014/08/22 09:57:05 pooka Exp $
+#
+
+ioconf virtio_ld
+
+include conf/files
+include dev/pci/files.pci
+include rump/dev/files.rump
+
+pseudo-root virtio*
+
+ld* at virtio? # Virtio disk device
Index: src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c
diff -u /dev/null src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c:1.1
--- /dev/null Fri Aug 22 09:57:05 2014
+++ src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c Fri Aug 22 09:57:05 2014
@@ -0,0 +1,66 @@
+/* $NetBSD: ld_at_virtio.c,v 1.1 2014/08/22 09:57:05 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: ld_at_virtio.c,v 1.1 2014/08/22 09:57:05 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/bus.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+#include ioconf.c
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_virtio_ld,
+ cfattach_ioconf_virtio_ld, cfdata_ioconf_virtio_ld);
+}
+
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+{
+ extern const struct bdevsw ld_bdevsw;
+ extern const struct cdevsw ld_cdevsw;
+ devmajor_t bmaj = -1, cmaj = -1;
+ int error;
+
+ if ((error = devsw_attach(ld, ld_bdevsw, bmaj,
+ ld_cdevsw, cmaj)) != 0)
+ panic(cannot attach ld: %d, error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/ld0, 'a',
+ bmaj, 0, 7)) != 0)
+ panic(cannot create cooked ld dev nodes: %d, error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rld0, 'a',
+ cmaj, 0, 7)) != 0)
+ panic(cannot create raw ld dev nodes: %d, error);
+}
Index: src/sys/rump/dev/lib/libvirtio_ld/shlib_version
diff -u
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Fri Aug 22 14:28:58 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpci: Makefile pci_at_mainbus.c
rumpdev_bus_space.c
Log Message:
Add a compile-time selector for I/O space operations. Needs more work
some day, but allows virtio drivers to work today.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
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/lib/libpci/Makefile
diff -u src/sys/rump/dev/lib/libpci/Makefile:1.3 src/sys/rump/dev/lib/libpci/Makefile:1.4
--- src/sys/rump/dev/lib/libpci/Makefile:1.3 Mon Apr 14 23:53:42 2014
+++ src/sys/rump/dev/lib/libpci/Makefile Fri Aug 22 14:28:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/14 23:53:42 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/22 14:28:58 pooka Exp $
#
RUMPTOP= ${TOPRUMP}
@@ -23,6 +23,10 @@ SRCS+= pci_at_mainbus.c
CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpkern
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
+.if ${RUMP_PCI_IOSPACE:Uno} == yes
+CPPFLAGS+=-DRUMP_PCI_IOSPACE
+.endif
+
.if defined(RUMP_PCI_USER)
RUMPCOMP_USER_SRCS= ${RUMP_PCI_USER}
RUMPCOMP_INCS_DIR:= ${.PARSEDIR}
Index: src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
diff -u src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.4 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.5
--- src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.4 Thu Jul 31 15:55:08 2014
+++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Fri Aug 22 14:28:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_at_mainbus.c,v 1.4 2014/07/31 15:55:08 pooka Exp $ */
+/* $NetBSD: pci_at_mainbus.c,v 1.5 2014/08/22 14:28:58 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.4 2014/07/31 15:55:08 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.5 2014/08/22 14:28:58 pooka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -80,7 +80,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERM
#endif
pba.pba_flags = PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;;
-#if 0
+#ifdef RUMP_PCI_IOSPACE
pba.pba_flags |= PCI_FLAGS_IO_OKAY;
#endif
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.2 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.3
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.2 Sun Apr 13 15:43:26 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Fri Aug 22 14:28:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_space.c,v 1.2 2014/04/13 15:43:26 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_space.c,v 1.3 2014/08/22 14:28:58 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -34,6 +34,10 @@
#include pci_user.h
+#if defined(RUMP_PCI_IOSPACE) (defined(__i386__) || defined(__x86_64__))
+#define IOSPACE_SUPPORTED
+#endif
+
int
bus_space_map(bus_space_tag_t bst, bus_addr_t address, bus_size_t size,
int flags, bus_space_handle_t *handlep)
@@ -48,8 +52,12 @@ bus_space_map(bus_space_tag_t bst, bus_a
* make a hypercall to request it.
*/
if (bst == 0) {
+#ifdef IOSPACE_SUPPORTED
*handlep = address;
rv = 0;
+#else
+ rv = ENOTSUP;
+#endif
} else {
*handlep = (bus_space_handle_t)rumpcomp_pci_map(address, size);
rv = *handlep ? 0 : EINVAL;
@@ -65,7 +73,12 @@ bus_space_read_1(bus_space_tag_t bst, bu
uint8_t rv;
if (bst == 0) {
- panic(8bit IO space not supported);
+#ifdef IOSPACE_SUPPORTED
+ unsigned short addr = bsh + offset;
+ __asm__ __volatile__(inb %1, %0 : =a(rv) : d(addr));
+#else
+ panic(IO space not supported);
+#endif
} else {
rv = *(volatile uint8_t *)(bsh + offset);
}
@@ -80,7 +93,12 @@ bus_space_read_2(bus_space_tag_t bst, bu
uint16_t rv;
if (bst == 0) {
- panic(16bit IO space not supported);
+#ifdef IOSPACE_SUPPORTED
+ unsigned short addr = bsh + offset;
+ __asm__ __volatile__(in %1, %0 : =a(rv) : d(addr));
+#else
+ panic(IO space not supported);
+#endif
} else {
rv = *(volatile uint16_t *)(bsh + offset);
}
@@ -95,11 +113,11 @@ bus_space_read_4(bus_space_tag_t bst, bu
uint32_t rv;
if (bst == 0) {
-#if 1
- panic(IO space not supported in this build);
-#else
+#ifdef IOSPACE_SUPPORTED
unsigned short addr = bsh + offset;
__asm__ __volatile__(inl %1, %0 : =a(rv) : d(addr));
+#else
+ panic(IO space not supported);
#endif
} else {
rv = *(volatile uint32_t *)(bsh + offset);
@@ -114,8 +132,11 @@ bus_space_write_1(bus_space_tag_t bst, b
{
if (bst == 0) {
-#if 1
- panic(IO space not supported in this build);
+#ifdef IOSPACE_SUPPORTED
+ unsigned short addr = bsh + offset;
+ __asm__
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src Committed By: skrll Date: Sat Aug 2 07:18:47 UTC 2014 Modified Files: src/sys/rump/dev/lib/libugenhc: ugenhc.c Log Message: Return a valid error in rumpusb_root_intr_start on failure. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/rump/dev/lib/libugenhc/ugenhc.c 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/lib/libugenhc/ugenhc.c diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.18 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.19 --- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.18 Thu Mar 20 20:42:08 2014 +++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Sat Aug 2 07:18:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ugenhc.c,v 1.18 2014/03/20 20:42:08 christos Exp $ */ +/* $NetBSD: ugenhc.c,v 1.19 2014/08/02 07:18:47 skrll Exp $ */ /* * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.18 2014/03/20 20:42:08 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.19 2014/08/02 07:18:47 skrll Exp $); #include sys/param.h #include sys/bus.h @@ -667,7 +667,7 @@ rumpusb_root_intr_start(usbd_xfer_handle error = kthread_create(PRI_NONE, 0, NULL, rhscintr, sc, sc-sc_rhintr, ugenrhi); if (error) - xfer-status = error; + xfer-status = USBD_IOERROR; } return (USBD_IN_PROGRESS);
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: skrll
Date: Sat Aug 2 07:20:08 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
Log Message:
Let's believe the spec when it says must.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/dev/lib/libugenhc/ugenhc.c
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/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.19 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.20
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.19 Sat Aug 2 07:18:47 2014
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Sat Aug 2 07:20:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.19 2014/08/02 07:18:47 skrll Exp $ */
+/* $NetBSD: ugenhc.c,v 1.20 2014/08/02 07:20:08 skrll Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.19 2014/08/02 07:18:47 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.20 2014/08/02 07:20:08 skrll Exp $);
#include sys/param.h
#include sys/bus.h
@@ -152,7 +152,6 @@ static const usb_config_descriptor_t rum
.bNumInterface = 1,
.bmAttributes = UC_SELF_POWERED | UC_ATTR_MBO,
};
-/* XXX: spec says UC_ATTR_MBO is reserved and set to one. required? */
static const usb_interface_descriptor_t rumphub_uid = {
.bLength = USB_INTERFACE_DESCRIPTOR_SIZE,
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: skrll
Date: Sat Aug 2 11:43:21 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
Log Message:
First pass at adapting to usbmp.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/dev/lib/libugenhc/ugenhc.c
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/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.20 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.21
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.20 Sat Aug 2 07:20:08 2014
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Sat Aug 2 11:43:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.20 2014/08/02 07:20:08 skrll Exp $ */
+/* $NetBSD: ugenhc.c,v 1.21 2014/08/02 11:43:21 skrll Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.20 2014/08/02 07:20:08 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.21 2014/08/02 11:43:21 skrll Exp $);
#include sys/param.h
#include sys/bus.h
@@ -71,6 +71,7 @@ __KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1
#include sys/kmem.h
#include sys/kernel.h
#include sys/kthread.h
+#include sys/mutex.h
#include dev/usb/usb.h
#include dev/usb/usbdi.h
@@ -103,6 +104,8 @@ struct ugenhc_softc {
struct lwp *sc_rhintr;
usbd_xfer_handle sc_intrxfer;
+
+ kmutex_t sc_lock;
};
static int ugenhc_probe(device_t, cfdata_t, void *);
@@ -313,17 +316,22 @@ rumpusb_root_ctrl_start(usbd_xfer_handle
ret:
xfer-status = err;
- /* XXX locking */
+ mutex_enter(sc-sc_lock);
usb_transfer_complete(xfer);
+ mutex_exit(sc-sc_lock);
+
return (USBD_IN_PROGRESS);
}
static usbd_status
rumpusb_root_ctrl_transfer(usbd_xfer_handle xfer)
{
+ struct ugenhc_softc *sc = xfer-pipe-device-bus-hci_private;
usbd_status err;
+ mutex_enter(sc-sc_lock);
err = usb_insert_transfer(xfer);
+ mutex_exit(sc-sc_lock);
if (err)
return (err);
@@ -538,16 +546,22 @@ rumpusb_device_ctrl_start(usbd_xfer_hand
ret:
xfer-status = err;
+ mutex_enter(sc-sc_lock);
usb_transfer_complete(xfer);
+ mutex_exit(sc-sc_lock);
+
return (USBD_IN_PROGRESS);
}
static usbd_status
rumpusb_device_ctrl_transfer(usbd_xfer_handle xfer)
{
+ struct ugenhc_softc *sc = xfer-pipe-device-bus-hci_private;
usbd_status err;
+ mutex_enter(sc-sc_lock);
err = usb_insert_transfer(xfer);
+ mutex_exit(sc-sc_lock);
if (err)
return (err);
@@ -619,7 +633,9 @@ rhscintr(void *arg)
xfer-actlen = xfer-length;
xfer-status = USBD_NORMAL_COMPLETION;
+ mutex_enter(sc-sc_lock);
usb_transfer_complete(xfer);
+ mutex_exit(sc-sc_lock);
kpause(ugwait2, false, hz, NULL);
@@ -647,7 +663,9 @@ rhscintr(void *arg)
memset(xfer-buffer, 0xff, xfer-length);
xfer-actlen = xfer-length;
xfer-status = USBD_NORMAL_COMPLETION;
+ mutex_enter(sc-sc_lock);
usb_transfer_complete(xfer);
+ mutex_exit(sc-sc_lock);
kpause(ugwait3, false, hz, NULL);
}
@@ -661,6 +679,7 @@ rumpusb_root_intr_start(usbd_xfer_handle
struct ugenhc_softc *sc = xfer-pipe-device-bus-hci_private;
int error;
+ mutex_enter(sc-sc_lock);
sc-sc_intrxfer = xfer;
if (!sc-sc_rhintr) {
error = kthread_create(PRI_NONE, 0, NULL,
@@ -668,6 +687,7 @@ rumpusb_root_intr_start(usbd_xfer_handle
if (error)
xfer-status = USBD_IOERROR;
}
+ mutex_exit(sc-sc_lock);
return (USBD_IN_PROGRESS);
}
@@ -675,9 +695,12 @@ rumpusb_root_intr_start(usbd_xfer_handle
static usbd_status
rumpusb_root_intr_transfer(usbd_xfer_handle xfer)
{
+ struct ugenhc_softc *sc = xfer-pipe-device-bus-hci_private;
usbd_status err;
+ mutex_enter(sc-sc_lock);
err = usb_insert_transfer(xfer);
+ mutex_exit(sc-sc_lock);
if (err)
return (err);
@@ -815,24 +838,33 @@ rumpusb_device_bulk_start(usbd_xfer_hand
if (done != len)
panic(lazy bum);
xfer-status = xfererr;
+ mutex_enter(sc-sc_lock);
usb_transfer_complete(xfer);
+ mutex_exit(sc-sc_lock);
return (USBD_IN_PROGRESS);
}
static void
doxfer_kth(void *arg)
{
- usbd_xfer_handle xfer = arg;
+ usbd_pipe_handle pipe = arg;
+ struct ugenhc_softc *sc = pipe-device-bus-hci_private;
+ mutex_enter(sc-sc_lock);
do {
- rumpusb_device_bulk_start(SIMPLEQ_FIRST(xfer-pipe-queue));
- } while (!SIMPLEQ_EMPTY(xfer-pipe-queue));
+ usbd_xfer_handle xfer = SIMPLEQ_FIRST(pipe-queue);
+ mutex_exit(sc-sc_lock);
+ rumpusb_device_bulk_start(xfer);
+ mutex_enter(sc-sc_lock);
+ } while (!SIMPLEQ_EMPTY(pipe-queue));
+ mutex_exit(sc-sc_lock);
kthread_exit(0);
}
static usbd_status
rumpusb_device_bulk_transfer(usbd_xfer_handle xfer)
{
+ struct ugenhc_softc *sc = xfer-pipe-device-bus-hci_private;
usbd_status err;
if (!rump_threads) {
@@ -843,19 +875,21 @@ rumpusb_device_bulk_transfer(usbd_xfer_h
return USBD_IN_PROGRESS;
}
+ mutex_enter(sc-sc_lock);
err = usb_insert_transfer(xfer);
+
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: skrll
Date: Sat Aug 2 12:38:01 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
Log Message:
Fix error checking mistake introduced in r1.15.
Hi Antti!
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/dev/lib/libugenhc/ugenhc.c
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/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.21 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.22
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.21 Sat Aug 2 11:43:21 2014
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Sat Aug 2 12:38:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.21 2014/08/02 11:43:21 skrll Exp $ */
+/* $NetBSD: ugenhc.c,v 1.22 2014/08/02 12:38:01 skrll Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.21 2014/08/02 11:43:21 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.22 2014/08/02 12:38:01 skrll Exp $);
#include sys/param.h
#include sys/bus.h
@@ -618,7 +618,7 @@ rhscintr(void *arg)
for (;;) {
error = rumpuser_open(buf, RUMPUSER_OPEN_RDWR, fd);
- if (error != 0)
+ if (error == 0)
break;
kpause(ugwait, false, hz/4, NULL);
}
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src Committed By: pooka Date: Thu Jul 31 15:55:08 UTC 2014 Modified Files: src/sys/rump/dev/lib/libpci: pci_at_mainbus.c Log Message: add missing \n from Robert Millan r...@freebsd.org via rumpkernel-users To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c 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/lib/libpci/pci_at_mainbus.c diff -u src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.3 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.4 --- src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.3 Mon Apr 14 21:34:08 2014 +++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Thu Jul 31 15:55:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_at_mainbus.c,v 1.3 2014/04/14 21:34:08 pooka Exp $ */ +/* $NetBSD: pci_at_mainbus.c,v 1.4 2014/07/31 15:55:08 pooka Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.3 2014/04/14 21:34:08 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_at_mainbus.c,v 1.4 2014/07/31 15:55:08 pooka Exp $); #include sys/param.h #include sys/conf.h @@ -61,7 +61,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV) if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/pci, '0', cmaj, 0, 4)) != 0) - printf(pci: failed to create /dev/pci nodes: %d, error); + printf(pci: failed to create /dev/pci nodes: %d\n, error); } RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERMAINBUS)
CVS commit: src/sys/rump/dev/lib/libnetsmb
Module Name:src Committed By: maxv Date: Fri Jul 18 16:25:17 UTC 2014 Modified Files: src/sys/rump/dev/lib/libnetsmb: netsmb_component.c Log Message: Fix the ATF failures caused by my recent smbfs change (smbfs_vfsops.c -r1.103). ok pooka@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c 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/lib/libnetsmb/netsmb_component.c diff -u src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.2 --- src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1 Thu Mar 13 01:57:29 2014 +++ src/sys/rump/dev/lib/libnetsmb/netsmb_component.c Fri Jul 18 16:25:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $ */ +/* $NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: netsmb_component.c,v 1.2 2014/07/18 16:25:17 maxv Exp $); #include sys/param.h #include sys/conf.h @@ -48,7 +48,8 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV) int error; bmaj = cmaj = NODEVMAJOR; - if ((error = devsw_attach(nsmb, NULL, bmaj, nsmb_cdevsw, cmaj))!=0) + error = devsw_attach(nsmb, NULL, bmaj, nsmb_cdevsw, cmaj); + if (error error != EEXIST) panic(nsmb devsw attach failed: %d, error); if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/nsmb, '0', cmaj, 0, 4)) != 0)
CVS commit: src/sys/rump/dev/lib/libmiiphy
Module Name:src
Committed By: pooka
Date: Mon May 26 19:55:53 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libmiiphy: Makefile
Log Message:
mvphy is not configured, so don't try to build it
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libmiiphy/Makefile
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/lib/libmiiphy/Makefile
diff -u src/sys/rump/dev/lib/libmiiphy/Makefile:1.1 src/sys/rump/dev/lib/libmiiphy/Makefile:1.2
--- src/sys/rump/dev/lib/libmiiphy/Makefile:1.1 Fri Apr 4 14:18:19 2014
+++ src/sys/rump/dev/lib/libmiiphy/Makefile Mon May 26 19:55:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/04/04 14:18:19 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/26 19:55:53 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -13,7 +13,7 @@ SRCS= phy_at_mii.c
SRCS+= mii.c mii_ethersubr.c mii_physubr.c ukphy.c ukphy_subr.c
SRCS+= acphy.c amhphy.c atphy.c bmtphy.c brgphy.c ciphy.c dmphy.c etphy.c \
exphy.c gentbi.c glxtphy.c gphyter.c icsphy.c igphy.c ihphy.c ikphy.c \
-inphy.c iophy.c lxtphy.c makphy.c mvphy.c nsphy.c nsphyter.c pnaphy.c \
+inphy.c iophy.c lxtphy.c makphy.c nsphy.c nsphyter.c pnaphy.c \
qsphy.c rdcphy.c rgephy.c rlphy.c sqphy.c tlphy.c tqphy.c urlphy.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${.CURDIR}/opt
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Sun Apr 13 15:43:26 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_bus_space.c
Log Message:
add some sort of bus_space_barrier()
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c
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/lib/libpci/rumpdev_bus_space.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.1 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.2
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.1 Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Sun Apr 13 15:43:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_space.c,v 1.1 2014/04/04 12:53:59 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_space.c,v 1.2 2014/04/13 15:43:26 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -26,6 +26,7 @@
*/
#include sys/cdefs.h
+#include sys/atomic.h
#include sys/param.h
@@ -175,3 +176,12 @@ bus_space_unmap(bus_space_tag_t bst, bus
panic(%s: unimplemented, __func__);
}
+
+void
+bus_space_barrier(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, bus_size_t len, int flags)
+{
+
+ /* weelll ... */
+ membar_sync();
+}
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Fri Apr 11 01:03:08 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_bus_dma.c
Log Message:
remove obfuscation macros
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
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/lib/libpci/rumpdev_bus_dma.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.1 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.2
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.1 Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Fri Apr 11 01:03:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_dma.c,v 1.1 2014/04/04 12:53:59 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_dma.c,v 1.2 2014/04/11 01:03:08 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee
@@ -86,11 +86,6 @@
int _bus_dmamap_load_buffer (bus_dma_tag_t, bus_dmamap_t, void *,
bus_size_t, struct vmspace *, int, paddr_t *, int *, int);
-#undef PHYS_TO_BUS_MEM
-#define PHYS_TO_BUS_MEM(_t_, _a_) rumpcomp_pci_virt_to_mach((void *)_a_)
-#undef BUS_MEM_TO_PHYS
-#define BUS_MEM_TO_PHYS(_t_, _a_) rumpcomp_pci_mach_to_virt(_a_)
-
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
@@ -212,7 +207,8 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
* the previous segment if possible.
*/
if (first) {
- map-dm_segs[seg].ds_addr = PHYS_TO_BUS_MEM(t, curaddr);
+ map-dm_segs[seg].ds_addr
+ = rumpcomp_pci_virt_to_mach((void *)curaddr);
map-dm_segs[seg].ds_len = sgsize;
first = 0;
} else {
@@ -221,13 +217,13 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
map-dm_maxsegsz
(map-_dm_boundary == 0 ||
(map-dm_segs[seg].ds_addr bmask) ==
- (PHYS_TO_BUS_MEM(t, curaddr) bmask)))
+ (rumpcomp_pci_virt_to_mach((void*)curaddr)bmask)))
map-dm_segs[seg].ds_len += sgsize;
else {
if (++seg = map-_dm_segcnt)
break;
map-dm_segs[seg].ds_addr =
- PHYS_TO_BUS_MEM(t, curaddr);
+rumpcomp_pci_virt_to_mach((void *)curaddr);
map-dm_segs[seg].ds_len = sgsize;
}
}
@@ -334,7 +330,7 @@ bus_dmamap_load_mbuf(bus_dma_tag_t t, bu
continue;
}
map-dm_segs[seg].ds_addr =
- PHYS_TO_BUS_MEM(t, lastaddr);
+ rumpcomp_pci_virt_to_mach((void *)lastaddr);
map-dm_segs[seg].ds_len = m-m_len;
lastaddr += m-m_len;
continue;
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Fri Apr 4 12:53:59 UTC 2014
Added Files:
src/sys/rump/dev/lib/libpci: Makefile PCI.ioconf pci_at_mainbus.c
pci_user.h rumpdev_bus_dma.c rumpdev_bus_space.c rumpdev_pci.c
shlib_version
src/sys/rump/dev/lib/libpci/opt: opt_pci.h
Log Message:
Add a rump kernel component for the PCI bus. It works both in Xen DomU
(via Xen's PCI passthrough) and Linux userspace (via uio_pci_generic).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci/Makefile \
src/sys/rump/dev/lib/libpci/PCI.ioconf \
src/sys/rump/dev/lib/libpci/pci_at_mainbus.c \
src/sys/rump/dev/lib/libpci/pci_user.h \
src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c \
src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c \
src/sys/rump/dev/lib/libpci/rumpdev_pci.c \
src/sys/rump/dev/lib/libpci/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci/opt/opt_pci.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libpci/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci/Makefile:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/Makefile Fri Apr 4 12:53:59 2014
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2014/04/04 12:53:59 pooka Exp $
+#
+
+RUMPTOP= ${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci
+IOCONF= PCI.ioconf
+
+SRCS+= pci.c pci_map.c pci_quirks.c pci_subr.c pci_stub.c pci_usrreq.c
+SRCS+= pcibusprint.c
+
+SRCS+= rumpdev_pci.c
+
+# ok, these don't _really_ belong here, but it's the only
+# place they're currently useful, so let it slide
+SRCS+= rumpdev_bus_space.c
+SRCS+= rumpdev_bus_dma.c
+
+SRCS+= pci_at_mainbus.c
+
+CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpkern
+
+#RUMPCOMP_USER_SRCS= pci_user.c
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libpci/PCI.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci/PCI.ioconf:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/PCI.ioconf Fri Apr 4 12:53:59 2014
@@ -0,0 +1,12 @@
+# $NetBSD: PCI.ioconf,v 1.1 2014/04/04 12:53:59 pooka Exp $
+#
+
+ioconf pci
+
+include conf/files
+include dev/pci/files.pci
+include rump/dev/files.rump
+
+pseudo-root mainbus*
+
+pci*at mainbus? bus ?
Index: src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
diff -u /dev/null src/sys/rump/dev/lib/libpci/pci_at_mainbus.c:1.1
--- /dev/null Fri Apr 4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/pci_at_mainbus.c Fri Apr 4 12:53:59 2014
@@ -0,0 +1,75 @@
+/* $NetBSD: pci_at_mainbus.c,v 1.1 2014/04/04 12:53:59 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: pci_at_mainbus.c,v 1.1 2014/04/04 12:53:59 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/mbuf.h
+#include sys/stat.h
+#include sys/bus.h
+
+#include dev/pci/pcivar.h
+#include machine/bus_private.h
+
+#include ioconf.c
+
+#include rump_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_pci,
+ cfattach_ioconf_pci, cfdata_ioconf_pci);
+}
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV_AFTERMAINBUS)
+{
+ struct pcibus_attach_args pba;
+ device_t mainbus;
+
+ /* XXX: attach args should come from elsewhere */
+ memset(pba, 0, sizeof(pba));
+ pba.pba_iot = (bus_space_tag_t)0;
+ pba.pba_memt = (bus_space_tag_t)1;
+ pba.pba_dmat = (void *)0x20;
+#ifdef _LP64
+ pba.pba_dmat64 = (void *)0x40;
+#endif
+ pba.pba_flags = PCI_FLAGS_MEM_OKAY |
+
CVS commit: src/sys/rump/dev/lib/libmiiphy
Module Name:src
Committed By: pooka
Date: Fri Apr 4 14:18:19 UTC 2014
Added Files:
src/sys/rump/dev/lib/libmiiphy: MIIPHY.ioconf Makefile phy_at_mii.c
shlib_version
src/sys/rump/dev/lib/libmiiphy/opt: opt_mii.h
Log Message:
Add a rump kernel component for mii support and phy drivers.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libmiiphy/MIIPHY.ioconf \
src/sys/rump/dev/lib/libmiiphy/Makefile \
src/sys/rump/dev/lib/libmiiphy/phy_at_mii.c \
src/sys/rump/dev/lib/libmiiphy/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libmiiphy/opt/opt_mii.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libmiiphy/MIIPHY.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libmiiphy/MIIPHY.ioconf:1.1
--- /dev/null Fri Apr 4 14:18:19 2014
+++ src/sys/rump/dev/lib/libmiiphy/MIIPHY.ioconf Fri Apr 4 14:18:19 2014
@@ -0,0 +1,41 @@
+# $NetBSD: MIIPHY.ioconf,v 1.1 2014/04/04 14:18:19 pooka Exp $
+#
+
+ioconf phy
+
+include conf/files
+
+pseudo-root mii*
+
+acphy* at mii? phy ? # Altima AC101 and AMD Am79c874 PHYs
+amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
+atphy* at mii? phy ? # Attansic/Atheros PHYs
+bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs
+brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
+ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs
+dmphy* at mii? phy ? # Davicom DM9101 PHYs
+etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E PHYs
+exphy* at mii? phy ? # 3Com internal PHYs
+gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
+glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
+gphyter* at mii? phy ? # NS83861 Gig-E PHY
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+igphy* at mii? phy ? # Intel IGP01E1000
+ihphy* at mii? phy ? # Intel 82577 PHYs
+ikphy* at mii? phy ? # Intel 82563 PHYs
+inphy* at mii? phy ? # Intel 82555 PHYs
+iophy* at mii? phy ? # Intel 82553 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
+nsphy* at mii? phy ? # NS83840 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
+pnaphy* at mii? phy ? # generic HomePNA PHYs
+qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
+rdcphy* at mii? phy ? # RDC R6040 10/100 PHY
+rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
+rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
+sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
+tlphy* at mii? phy ? # ThunderLAN PHYs
+tqphy* at mii? phy ? # TDK Semiconductor PHYs
+ukphy* at mii? phy ? # generic unknown PHYs
+urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
Index: src/sys/rump/dev/lib/libmiiphy/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libmiiphy/Makefile:1.1
--- /dev/null Fri Apr 4 14:18:19 2014
+++ src/sys/rump/dev/lib/libmiiphy/Makefile Fri Apr 4 14:18:19 2014
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2014/04/04 14:18:19 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci ${RUMPTOP}/../dev/mii
+
+LIB= rumpdev_miiphy
+IOCONF= MIIPHY.ioconf
+
+SRCS= phy_at_mii.c
+
+SRCS+= mii.c mii_ethersubr.c mii_physubr.c ukphy.c ukphy_subr.c
+SRCS+= acphy.c amhphy.c atphy.c bmtphy.c brgphy.c ciphy.c dmphy.c etphy.c \
+exphy.c gentbi.c glxtphy.c gphyter.c icsphy.c igphy.c ihphy.c ikphy.c \
+inphy.c iophy.c lxtphy.c makphy.c mvphy.c nsphy.c nsphyter.c pnaphy.c \
+qsphy.c rdcphy.c rgephy.c rlphy.c sqphy.c tlphy.c tqphy.c urlphy.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${.CURDIR}/opt
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libmiiphy/phy_at_mii.c
diff -u /dev/null src/sys/rump/dev/lib/libmiiphy/phy_at_mii.c:1.1
--- /dev/null Fri Apr 4 14:18:19 2014
+++ src/sys/rump/dev/lib/libmiiphy/phy_at_mii.c Fri Apr 4 14:18:19 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: phy_at_mii.c,v 1.1 2014/04/04 14:18:19 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
CVS commit: src/sys/rump/dev/lib/libpci_if_wm
Module Name:src
Committed By: pooka
Date: Fri Apr 4 14:49:09 UTC 2014
Added Files:
src/sys/rump/dev/lib/libpci_if_wm: Makefile PCI_IF_WM.ioconf
shlib_version wm_at_pci.c
Log Message:
Add a rump kernel component that can attach if_wm @ pci
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_if_wm/Makefile \
src/sys/rump/dev/lib/libpci_if_wm/PCI_IF_WM.ioconf \
src/sys/rump/dev/lib/libpci_if_wm/shlib_version \
src/sys/rump/dev/lib/libpci_if_wm/wm_at_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libpci_if_wm/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_wm/Makefile:1.1
--- /dev/null Fri Apr 4 14:49:09 2014
+++ src/sys/rump/dev/lib/libpci_if_wm/Makefile Fri Apr 4 14:49:09 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2014/04/04 14:49:09 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci_if_wm
+IOCONF= PCI_IF_WM.ioconf
+
+SRCS= wm_at_pci.c
+
+SRCS+= if_wm.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_wm/PCI_IF_WM.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_wm/PCI_IF_WM.ioconf:1.1
--- /dev/null Fri Apr 4 14:49:09 2014
+++ src/sys/rump/dev/lib/libpci_if_wm/PCI_IF_WM.ioconf Fri Apr 4 14:49:09 2014
@@ -0,0 +1,12 @@
+# $NetBSD: PCI_IF_WM.ioconf,v 1.1 2014/04/04 14:49:09 pooka Exp $
+#
+
+ioconf pci_if_wm
+
+include conf/files
+include dev/pci/files.pci
+include rump/dev/files.rump
+
+pseudo-root pci*
+
+wm* at pci? dev ? function ?# Intel gigabit
Index: src/sys/rump/dev/lib/libpci_if_wm/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_wm/shlib_version:1.1
--- /dev/null Fri Apr 4 14:49:09 2014
+++ src/sys/rump/dev/lib/libpci_if_wm/shlib_version Fri Apr 4 14:49:09 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libpci_if_wm/wm_at_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci_if_wm/wm_at_pci.c:1.1
--- /dev/null Fri Apr 4 14:49:09 2014
+++ src/sys/rump/dev/lib/libpci_if_wm/wm_at_pci.c Fri Apr 4 14:49:09 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: wm_at_pci.c,v 1.1 2014/04/04 14:49:09 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: wm_at_pci.c,v 1.1 2014/04/04 14:49:09 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_wm,
+ cfattach_ioconf_pci_if_wm, cfdata_ioconf_pci_if_wm);
+}
CVS commit: src/sys/rump/dev/lib/libmd
Module Name:src
Committed By: pooka
Date: Mon Mar 17 11:30:40 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libmd: Makefile
Added Files:
src/sys/rump/dev/lib/libmd: md_component.c
Removed Files:
src/sys/rump/dev/lib/libmd: component.c
Log Message:
rename component.c - md_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libmd/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/rump/dev/lib/libmd/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libmd/md_component.c
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/lib/libmd/Makefile
diff -u src/sys/rump/dev/lib/libmd/Makefile:1.1 src/sys/rump/dev/lib/libmd/Makefile:1.2
--- src/sys/rump/dev/lib/libmd/Makefile:1.1 Mon Nov 22 21:20:32 2010
+++ src/sys/rump/dev/lib/libmd/Makefile Mon Mar 17 11:30:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/11/22 21:20:32 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/17 11:30:40 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@ LIB= rumpdev_md
IOCONF= MD.ioconf
SRCS= md.c
-SRCS+= component.c
+SRCS+= md_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libmd/md_component.c
diff -u /dev/null src/sys/rump/dev/lib/libmd/md_component.c:1.1
--- /dev/null Mon Mar 17 11:30:41 2014
+++ src/sys/rump/dev/lib/libmd/md_component.c Mon Mar 17 11:30:40 2014
@@ -0,0 +1,68 @@
+/* $NetBSD: md_component.c,v 1.1 2014/03/17 11:30:40 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: md_component.c,v 1.1 2014/03/17 11:30:40 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/mbuf.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+extern void mdattach(int); /* XXX */
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+extern const struct bdevsw md_bdevsw;
+extern const struct cdevsw md_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ config_init_component(cfdriver_ioconf_md,
+ cfattach_ioconf_md, cfdata_ioconf_md);
+
+ bmaj = cmaj = NODEVMAJOR;
+ if ((error = devsw_attach(md, md_bdevsw, bmaj,
+ md_cdevsw, cmaj)) != 0)
+ panic(md devsw attach failed: %d, error);
+
+if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/md0, 'a',
+bmaj, 0, 7)) != 0)
+panic(cannot create cooked md dev nodes: %d, error);
+if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rmd0, 'a',
+cmaj, 0, 7)) != 0)
+panic(cannot create raw md dev nodes: %d, error);
+
+ rump_pdev_add(mdattach, 0);
+}
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:38:11 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libugenhc: Makefile ugenhc.c
Added Files:
src/sys/rump/dev/lib/libugenhc: ugenhc_user.c ugenhc_user.h
Removed Files:
src/sys/rump/dev/lib/libugenhc: rumpcomp_user.c rumpcomp_user.h
Log Message:
rename rumpcomp_user.* - ugenhc_user.*
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libugenhc/Makefile
cvs rdiff -u -r1.6 -r0 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.h
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/dev/lib/libugenhc/ugenhc.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libugenhc/ugenhc_user.c \
src/sys/rump/dev/lib/libugenhc/ugenhc_user.h
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/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.7 src/sys/rump/dev/lib/libugenhc/Makefile:1.8
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.7 Thu Sep 19 17:55:22 2013
+++ src/sys/rump/dev/lib/libugenhc/Makefile Thu Mar 13 01:38:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/09/19 17:55:22 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/13 01:38:11 pooka Exp $
#
LIB= rumpdev_ugenhc
@@ -8,7 +8,7 @@ SRCS= ugenhc.c ugenhc_at_mainbus.c ugenh
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
-RUMPCOMP_USER= #ioctl
+RUMPCOMP_USER_SRCS= ugenhc_user.c
.include bsd.lib.mk
.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.16 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.17
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.16 Fri Sep 13 20:38:39 2013
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Thu Mar 13 01:38:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $ */
+/* $NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $);
#include sys/param.h
#include sys/bus.h
@@ -81,7 +81,7 @@ __KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1
#include rump/rumpuser.h
-#include rumpcomp_user.h
+#include ugenhc_user.h
#include rump_private.h
#include rump_dev_private.h
Added files:
Index: src/sys/rump/dev/lib/libugenhc/ugenhc_user.c
diff -u /dev/null src/sys/rump/dev/lib/libugenhc/ugenhc_user.c:1.1
--- /dev/null Thu Mar 13 01:38:11 2014
+++ src/sys/rump/dev/lib/libugenhc/ugenhc_user.c Thu Mar 13 01:38:11 2014
@@ -0,0 +1,54 @@
+/* $NetBSD: ugenhc_user.c,v 1.1 2014/03/13 01:38:11 pooka Exp $ */
+
+/*
+ * Copyright (c) 2007-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.
+ */
+#ifndef _KERNEL
+#include sys/types.h
+#include sys/ioctl.h
+
+#include errno.h
+#include unistd.h
+
+#include rump/rumpuser_component.h
+
+#include ugenhc_user.h
+
+int
+rumpcomp_ugenhc_ioctl(int fd, u_long cmd, void *data, int *ioctlrv)
+{
+ void *cookie;
+ int rv;
+
+ cookie = rumpuser_component_unschedule();
+ *ioctlrv = ioctl(fd, cmd, data);
+ if (*ioctlrv == -1)
+ rv = errno;
+ else
+ rv = 0;
+ rumpuser_component_schedule(cookie);
+
+ return rumpuser_component_errtrans(rv);
+}
+#endif
Index: src/sys/rump/dev/lib/libugenhc/ugenhc_user.h
diff -u /dev/null src/sys/rump/dev/lib/libugenhc/ugenhc_user.h:1.1
--- /dev/null Thu Mar 13 01:38:11 2014
+++ src/sys/rump/dev/lib/libugenhc/ugenhc_user.h Thu Mar 13 01:38:11 2014
@@ -0,0 +1,28 @@
+/* $NetBSD:
CVS commit: src/sys/rump/dev/lib/libsysmon
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:47:07 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libsysmon: Makefile
Added Files:
src/sys/rump/dev/lib/libsysmon: sysmon_component.c
Removed Files:
src/sys/rump/dev/lib/libsysmon: component.c
Log Message:
rename component.c - sysmon_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libsysmon/Makefile
cvs rdiff -u -r1.6 -r0 src/sys/rump/dev/lib/libsysmon/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libsysmon/sysmon_component.c
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/lib/libsysmon/Makefile
diff -u src/sys/rump/dev/lib/libsysmon/Makefile:1.5 src/sys/rump/dev/lib/libsysmon/Makefile:1.6
--- src/sys/rump/dev/lib/libsysmon/Makefile:1.5 Sun Dec 5 16:50:09 2010
+++ src/sys/rump/dev/lib/libsysmon/Makefile Thu Mar 13 01:47:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/05 16:50:09 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/13 01:47:07 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/sysmon
@@ -10,7 +10,7 @@ SRCS= sysmon_taskq.c sysmon_power.c sysm
sysmon_envsys_tables.c sysmon_envsys_util.c sysmon_wdog.c sysmon.c \
swsensor.c swwdog.c
-SRCS+= component.c
+SRCS+= sysmon_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
Added files:
Index: src/sys/rump/dev/lib/libsysmon/sysmon_component.c
diff -u /dev/null src/sys/rump/dev/lib/libsysmon/sysmon_component.c:1.1
--- /dev/null Thu Mar 13 01:47:07 2014
+++ src/sys/rump/dev/lib/libsysmon/sysmon_component.c Thu Mar 13 01:47:07 2014
@@ -0,0 +1,82 @@
+/* $NetBSD: sysmon_component.c,v 1.1 2014/03/13 01:47:07 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: sysmon_component.c,v 1.1 2014/03/13 01:47:07 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include dev/sysmon/sysmon_taskq.h
+#include dev/sysmon/sysmonvar.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+#include ioconf.c
+
+void swwdogattach(int);
+void swsensorattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct cdevsw sysmon_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ if ((error = config_init_component(cfdriver_ioconf_swwdog,
+ cfattach_ioconf_swwdog, cfdata_ioconf_swwdog)) != 0) {
+ printf(cannot attach swwdog: %d\n, error);
+ return;
+ }
+
+ bmaj = cmaj = -1;
+ if ((error = devsw_attach(sysmon, NULL, bmaj,
+ sysmon_cdevsw, cmaj)) != 0)
+ panic(sysmon devsw attach failed: %d, error);
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/sysmon,
+ cmaj, SYSMON_MINOR_ENVSYS)) != 0)
+ panic(cannot create /dev/sysmon: %d, error);
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/watchdog,
+ cmaj, SYSMON_MINOR_WDOG)) != 0)
+ panic(cannot create /dev/watchdog: %d, error);
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/power,
+ cmaj, SYSMON_MINOR_POWER)) != 0)
+ panic(cannot create /dev/power: %d, error);
+
+ sysmon_task_queue_preinit();
+ sysmon_task_queue_init();
+ sysmon_envsys_init();
+ sysmon_power_init();
+ sysmon_wdog_init();
+
+ rump_pdev_add(swwdogattach, 0);
+}
CVS commit: src/sys/rump/dev/lib/libwscons
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:48:08 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libwscons: Makefile
Added Files:
src/sys/rump/dev/lib/libwscons: wscons_component.c
Removed Files:
src/sys/rump/dev/lib/libwscons: component.c
Log Message:
rename component.c - wscons_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libwscons/Makefile
cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/lib/libwscons/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libwscons/wscons_component.c
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/lib/libwscons/Makefile
diff -u src/sys/rump/dev/lib/libwscons/Makefile:1.3 src/sys/rump/dev/lib/libwscons/Makefile:1.4
--- src/sys/rump/dev/lib/libwscons/Makefile:1.3 Mon Mar 8 10:54:21 2010
+++ src/sys/rump/dev/lib/libwscons/Makefile Thu Mar 13 01:48:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/03/08 10:54:21 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:48:08 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/wscons
@@ -8,7 +8,7 @@ IOCONF= WSCONS.ioconf
SRCS= wsevent.c wskbd.c wskbdutil.c wsmouse.c
-SRCS+= component.c
+SRCS+= wscons_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
Added files:
Index: src/sys/rump/dev/lib/libwscons/wscons_component.c
diff -u /dev/null src/sys/rump/dev/lib/libwscons/wscons_component.c:1.1
--- /dev/null Thu Mar 13 01:48:08 2014
+++ src/sys/rump/dev/lib/libwscons/wscons_component.c Thu Mar 13 01:48:08 2014
@@ -0,0 +1,31 @@
+/* $NetBSD: wscons_component.c,v 1.1 2014/03/13 01:48:08 pooka Exp $ */
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/mount.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern struct cdevsw wskbd_cdevsw, wsmouse_cdevsw;
+ devmajor_t bmaj, cmaj;
+
+ config_init_component(cfdriver_ioconf_wscons,
+ cfattach_ioconf_wscons, cfdata_ioconf_wscons);
+
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach(wskbd, NULL, bmaj, wskbd_cdevsw, cmaj));
+ FLAWLESSCALL(rump_vfs_makeonedevnode(S_IFCHR, /dev/wskbd, cmaj, 0));
+
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach(wsmouse, NULL, bmaj,
+ wsmouse_cdevsw, cmaj));
+ FLAWLESSCALL(rump_vfs_makeonedevnode(S_IFCHR, /dev/wsmouse, cmaj, 0));
+}
CVS commit: src/sys/rump/dev/lib/libraidframe
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:49:59 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libraidframe: Makefile
Added Files:
src/sys/rump/dev/lib/libraidframe: raidframe_component.c
Removed Files:
src/sys/rump/dev/lib/libraidframe: component.c
Log Message:
rename component.c - raidframe_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libraidframe/Makefile
cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/lib/libraidframe/component.c
cvs rdiff -u -r0 -r1.1 \
src/sys/rump/dev/lib/libraidframe/raidframe_component.c
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/lib/libraidframe/Makefile
diff -u src/sys/rump/dev/lib/libraidframe/Makefile:1.3 src/sys/rump/dev/lib/libraidframe/Makefile:1.4
--- src/sys/rump/dev/lib/libraidframe/Makefile:1.3 Mon Nov 23 12:23:20 2009
+++ src/sys/rump/dev/lib/libraidframe/Makefile Thu Mar 13 01:49:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/11/23 12:23:20 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:49:59 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/raidframe
@@ -21,7 +21,7 @@ SRCS= rf_acctrace.c rf_alloclist.c rf_
rf_shutdown.c rf_sstf.c rf_states.c rf_stripelocks.c \
rf_strutils.c rf_utils.c rf_compat50.c rf_paritymap.c
-SRCS+= component.c
+SRCS+= raidframe_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libraidframe/raidframe_component.c
diff -u /dev/null src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.1
--- /dev/null Thu Mar 13 01:49:59 2014
+++ src/sys/rump/dev/lib/libraidframe/raidframe_component.c Thu Mar 13 01:49:59 2014
@@ -0,0 +1,66 @@
+/* $NetBSD: raidframe_component.c,v 1.1 2014/03/13 01:49:59 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: raidframe_component.c,v 1.1 2014/03/13 01:49:59 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+CFDRIVER_DECL(raid, DV_DISK, NULL);
+
+void raidattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct bdevsw raid_bdevsw;
+ extern const struct cdevsw raid_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ config_cfdriver_attach(raid_cd);
+
+ bmaj = cmaj = -1;
+ if ((error = devsw_attach(raid, raid_bdevsw, bmaj,
+ raid_cdevsw, cmaj)) != 0)
+ panic(raid devsw attach failed: %d, error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/raid0, 'a',
+ bmaj, 0, 7)) != 0)
+ panic(cannot create cooked raid dev nodes: %d, error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rraid0, 'a',
+ cmaj, 0, 7)) != 0)
+ panic(cannot create raw raid dev nodes: %d, error);
+
+ rump_pdev_add(raidattach, 4);
+}
CVS commit: src/sys/rump/dev/lib/libcgd
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:50:51 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libcgd: Makefile
Added Files:
src/sys/rump/dev/lib/libcgd: cgd_component.c
Removed Files:
src/sys/rump/dev/lib/libcgd: component.c
Log Message:
rename component.c - cgd_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libcgd/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libcgd/cgd_component.c
cvs rdiff -u -r1.7 -r0 src/sys/rump/dev/lib/libcgd/component.c
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/lib/libcgd/Makefile
diff -u src/sys/rump/dev/lib/libcgd/Makefile:1.3 src/sys/rump/dev/lib/libcgd/Makefile:1.4
--- src/sys/rump/dev/lib/libcgd/Makefile:1.3 Tue Feb 16 20:42:44 2010
+++ src/sys/rump/dev/lib/libcgd/Makefile Thu Mar 13 01:50:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 20:42:44 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:50:51 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@ LIB= rumpdev_cgd
SRCS= cgd.c cgd_crypto.c
-SRCS+= component.c
+SRCS+= cgd_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libcgd/cgd_component.c
diff -u /dev/null src/sys/rump/dev/lib/libcgd/cgd_component.c:1.1
--- /dev/null Thu Mar 13 01:50:51 2014
+++ src/sys/rump/dev/lib/libcgd/cgd_component.c Thu Mar 13 01:50:51 2014
@@ -0,0 +1,59 @@
+/* $NetBSD: cgd_component.c,v 1.1 2014/03/13 01:50:51 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: cgd_component.c,v 1.1 2014/03/13 01:50:51 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct bdevsw cgd_bdevsw;
+ extern const struct cdevsw cgd_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach(/dev/cgd0, cgd_bdevsw, bmaj,
+ cgd_cdevsw, cmaj)) != 0)
+ panic(cannot attach cgd: %d, error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/cgd0, 'a',
+ bmaj, 0, 7)) != 0)
+ panic(cannot create cooked cgd dev nodes: %d, error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rcgd0, 'a',
+ cmaj, 0, 7)) != 0)
+ panic(cannot create raw cgd dev nodes: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:51:30 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libopencrypto: Makefile
Added Files:
src/sys/rump/dev/lib/libopencrypto: opencrypto_component.c
Removed Files:
src/sys/rump/dev/lib/libopencrypto: component.c
Log Message:
rename component.c - opencrypto_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libopencrypto/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libopencrypto/component.c
cvs rdiff -u -r0 -r1.1 \
src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
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/lib/libopencrypto/Makefile
diff -u src/sys/rump/dev/lib/libopencrypto/Makefile:1.6 src/sys/rump/dev/lib/libopencrypto/Makefile:1.7
--- src/sys/rump/dev/lib/libopencrypto/Makefile:1.6 Mon Feb 3 23:11:40 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Thu Mar 13 01:51:30 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2014/02/03 23:11:40 pgoyette Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/13 01:51:30 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../opencrypto
LIB= rumpdev_opencrypto
-SRCS= component.c
+SRCS= opencrypto_component.c
# Sources for crypto framework
Added files:
Index: src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c
diff -u /dev/null src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c:1.1
--- /dev/null Thu Mar 13 01:51:30 2014
+++ src/sys/rump/dev/lib/libopencrypto/opencrypto_component.c Thu Mar 13 01:51:30 2014
@@ -0,0 +1,69 @@
+/* $NetBSD: opencrypto_component.c,v 1.1 2014/03/13 01:51:30 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: opencrypto_component.c,v 1.1 2014/03/13 01:51:30 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/rnd.h
+#include sys/stat.h
+#include sys/module.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+void cryptoattach(int);
+void swcryptoattach(int);
+void crypto_init(void);
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct cdevsw crypto_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach(crypto, NULL, bmaj,
+ crypto_cdevsw, cmaj)) != 0)
+ panic(cannot attach crypto: %d, error);
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/crypto,
+ cmaj, 0)) != 0)
+ panic(cannot create /dev/crypto: %d, error);
+
+ /*
+ * Initialize OpenCrypto and its pseudo-devices here
+ */
+ crypto_init();
+ rump_pdev_add(cryptoattach, 1);
+ rump_pdev_add(swcryptoattach, 0);
+}
CVS commit: src/sys/rump/dev/lib/libpad
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:52:04 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpad: Makefile
Added Files:
src/sys/rump/dev/lib/libpad: pad_component.c
Removed Files:
src/sys/rump/dev/lib/libpad: component.c
Log Message:
rename component.c - pad_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libpad/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/lib/libpad/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpad/pad_component.c
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/lib/libpad/Makefile
diff -u src/sys/rump/dev/lib/libpad/Makefile:1.2 src/sys/rump/dev/lib/libpad/Makefile:1.3
--- src/sys/rump/dev/lib/libpad/Makefile:1.2 Thu Apr 4 01:41:51 2013
+++ src/sys/rump/dev/lib/libpad/Makefile Thu Mar 13 01:52:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/04/04 01:41:51 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/13 01:52:04 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/pad
@@ -6,7 +6,7 @@
LIB= rumpdev_pad
SRCS= pad.c padvol.c
-SRCS+= component.c
+SRCS+= pad_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libpad/pad_component.c
diff -u /dev/null src/sys/rump/dev/lib/libpad/pad_component.c:1.1
--- /dev/null Thu Mar 13 01:52:04 2014
+++ src/sys/rump/dev/lib/libpad/pad_component.c Thu Mar 13 01:52:04 2014
@@ -0,0 +1,46 @@
+/* $NetBSD: pad_component.c,v 1.1 2014/03/13 01:52:04 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: pad_component.c,v 1.1 2014/03/13 01:52:04 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ int error;
+
+if ((error = rump_vfs_makedevnodes(S_IFCHR,
+ /dev/pad, '0', 189, 0, 4)) != 0)
+ panic(cannot create pad device: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libpud
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:53:04 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libpud: Makefile
Added Files:
src/sys/rump/dev/lib/libpud: pud_component.c
Removed Files:
src/sys/rump/dev/lib/libpud: component.c
Log Message:
rename component.c - pud_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpud/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/lib/libpud/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpud/pud_component.c
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/lib/libpud/Makefile
diff -u src/sys/rump/dev/lib/libpud/Makefile:1.1 src/sys/rump/dev/lib/libpud/Makefile:1.2
--- src/sys/rump/dev/lib/libpud/Makefile:1.1 Thu Mar 31 08:36:25 2011
+++ src/sys/rump/dev/lib/libpud/Makefile Thu Mar 13 01:53:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/03/31 08:36:25 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:53:04 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/pud
@@ -7,7 +7,7 @@ LIB= rumpdev_pud
SRCS= pud.c pud_dev.c
-SRCS+= component.c
+SRCS+= pud_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libpud/pud_component.c
diff -u /dev/null src/sys/rump/dev/lib/libpud/pud_component.c:1.1
--- /dev/null Thu Mar 13 01:53:04 2014
+++ src/sys/rump/dev/lib/libpud/pud_component.c Thu Mar 13 01:53:04 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: pud_component.c,v 1.1 2014/03/13 01:53:04 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: pud_component.c,v 1.1 2014/03/13 01:53:04 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ int error;
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/pud, 178, 1)) != 0)
+ panic(cannot create /dev/pud: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/librnd
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:52:37 UTC 2014
Modified Files:
src/sys/rump/dev/lib/librnd: Makefile
Added Files:
src/sys/rump/dev/lib/librnd: rnd_component.c
Removed Files:
src/sys/rump/dev/lib/librnd: component.c
Log Message:
rename component.c - rnd_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/librnd/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/lib/librnd/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/librnd/rnd_component.c
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/lib/librnd/Makefile
diff -u src/sys/rump/dev/lib/librnd/Makefile:1.6 src/sys/rump/dev/lib/librnd/Makefile:1.7
--- src/sys/rump/dev/lib/librnd/Makefile:1.6 Thu Feb 2 19:43:08 2012
+++ src/sys/rump/dev/lib/librnd/Makefile Thu Mar 13 01:52:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/02/02 19:43:08 tls Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/13 01:52:37 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@ LIB= rumpdev_rnd
SRCS= rndpseudo.c
-SRCS+= component.c
+SRCS+= rnd_component.c
# sys/rump/Makefile.rump sets CPPFLAGS+= -DCOMPAT_50=1,
# so we need rndpseudo_50.c from the compat/common directory.
Added files:
Index: src/sys/rump/dev/lib/librnd/rnd_component.c
diff -u /dev/null src/sys/rump/dev/lib/librnd/rnd_component.c:1.1
--- /dev/null Thu Mar 13 01:52:37 2014
+++ src/sys/rump/dev/lib/librnd/rnd_component.c Thu Mar 13 01:52:37 2014
@@ -0,0 +1,65 @@
+/* $NetBSD: rnd_component.c,v 1.1 2014/03/13 01:52:37 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: rnd_component.c,v 1.1 2014/03/13 01:52:37 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/rnd.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+void rndattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct cdevsw rnd_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach(random, NULL, bmaj,
+ rnd_cdevsw, cmaj)) != 0)
+ panic(cannot attach rnd: %d, error);
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/random,
+ cmaj, RND_DEV_RANDOM)) != 0)
+ panic(cannot create /dev/random: %d, error);
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/urandom,
+ cmaj, RND_DEV_URANDOM)) != 0)
+ panic(cannot create /dev/urandom: %d, error);
+
+ rump_pdev_add(rndattach, 4);
+ rnd_init();
+}
CVS commit: src/sys/rump/dev/lib/libputter
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:53:48 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libputter: Makefile
Added Files:
src/sys/rump/dev/lib/libputter: putter_component.c
Removed Files:
src/sys/rump/dev/lib/libputter: component.c
Log Message:
rename component.c - putter_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libputter/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/rump/dev/lib/libputter/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libputter/putter_component.c
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/lib/libputter/Makefile
diff -u src/sys/rump/dev/lib/libputter/Makefile:1.5 src/sys/rump/dev/lib/libputter/Makefile:1.6
--- src/sys/rump/dev/lib/libputter/Makefile:1.5 Thu Apr 4 01:48:19 2013
+++ src/sys/rump/dev/lib/libputter/Makefile Thu Mar 13 01:53:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/04/04 01:48:19 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/13 01:53:48 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/putter
@@ -6,7 +6,7 @@
LIB= rumpdev_putter
SRCS= putter.c
-SRCS+= component.c
+SRCS+= putter_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libputter/putter_component.c
diff -u /dev/null src/sys/rump/dev/lib/libputter/putter_component.c:1.1
--- /dev/null Thu Mar 13 01:53:48 2014
+++ src/sys/rump/dev/lib/libputter/putter_component.c Thu Mar 13 01:53:48 2014
@@ -0,0 +1,46 @@
+/* $NetBSD: putter_component.c,v 1.1 2014/03/13 01:53:48 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2009 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: putter_component.c,v 1.1 2014/03/13 01:53:48 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ int error;
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR,
+ /dev/putter, 178, 0)) != 0)
+ panic(cannot create /dev/putter: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libdm
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:54:22 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libdm: Makefile
Added Files:
src/sys/rump/dev/lib/libdm: dm_component.c
Removed Files:
src/sys/rump/dev/lib/libdm: component.c
Log Message:
rename component.c - dm_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libdm/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/rump/dev/lib/libdm/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdm/dm_component.c
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/lib/libdm/Makefile
diff -u src/sys/rump/dev/lib/libdm/Makefile:1.3 src/sys/rump/dev/lib/libdm/Makefile:1.4
--- src/sys/rump/dev/lib/libdm/Makefile:1.3 Mon Jun 7 13:57:20 2010
+++ src/sys/rump/dev/lib/libdm/Makefile Thu Mar 13 01:54:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/07 13:57:20 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:54:22 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/dm
@@ -8,7 +8,7 @@ LIB= rumpdev_dm
SRCS= device-mapper.c dm_dev.c dm_ioctl.c dm_pdev.c dm_table.c dm_target.c \
dm_target_linear.c dm_target_stripe.c
-SRCS+= component.c
+SRCS+= dm_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libdm/dm_component.c
diff -u /dev/null src/sys/rump/dev/lib/libdm/dm_component.c:1.1
--- /dev/null Thu Mar 13 01:54:22 2014
+++ src/sys/rump/dev/lib/libdm/dm_component.c Thu Mar 13 01:54:22 2014
@@ -0,0 +1,64 @@
+/* $NetBSD: dm_component.c,v 1.1 2014/03/13 01:54:22 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: dm_component.c,v 1.1 2014/03/13 01:54:22 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+#include sys/filedesc.h
+
+#include sys/vfs_syscalls.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct bdevsw dm_bdevsw;
+ extern const struct cdevsw dm_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach(dm, dm_bdevsw, bmaj,
+ dm_cdevsw, cmaj)) != 0)
+ panic(cannot attach dm: %d, error);
+
+ do_sys_mkdir(/dev/mapper, 0770, UIO_SYSSPACE);
+
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/mapper/control, 0,
+ cmaj, 0, 1)) != 0) {
+ panic(cannot create device-mapper control device: %d, error);
+
+ }
+}
CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:54:59 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Added Files:
src/sys/rump/dev/lib/libumass: umass_component.c
Removed Files:
src/sys/rump/dev/lib/libumass: component.c
Log Message:
rename component.c - umass_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libumass/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libumass/umass_component.c
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/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.6 src/sys/rump/dev/lib/libumass/Makefile:1.7
--- src/sys/rump/dev/lib/libumass/Makefile:1.6 Mon Aug 23 20:49:53 2010
+++ src/sys/rump/dev/lib/libumass/Makefile Thu Mar 13 01:54:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/08/23 20:49:53 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/13 01:54:59 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -9,7 +9,7 @@ IOCONF= UMASS.ioconf
.if ${MACHINE} == i386
SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
-SRCS+= component.c
+SRCS+= umass_component.c
.else
SRCS= dummy.c
.endif
Added files:
Index: src/sys/rump/dev/lib/libumass/umass_component.c
diff -u /dev/null src/sys/rump/dev/lib/libumass/umass_component.c:1.1
--- /dev/null Thu Mar 13 01:54:59 2014
+++ src/sys/rump/dev/lib/libumass/umass_component.c Thu Mar 13 01:54:59 2014
@@ -0,0 +1,19 @@
+/* $NetBSD: umass_component.c,v 1.1 2014/03/13 01:54:59 pooka Exp $ */
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/kmem.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+#include rump_dev_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_umass,
+ cfattach_ioconf_umass, cfdata_ioconf_umass);
+}
CVS commit: src/sys/rump/dev/lib/libdrvctl
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:56:56 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libdrvctl: Makefile
Added Files:
src/sys/rump/dev/lib/libdrvctl: drvctl_component.c
Removed Files:
src/sys/rump/dev/lib/libdrvctl: component.c
Log Message:
rename component.c - drvctl_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libdrvctl/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/lib/libdrvctl/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libdrvctl/drvctl_component.c
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/lib/libdrvctl/Makefile
diff -u src/sys/rump/dev/lib/libdrvctl/Makefile:1.1 src/sys/rump/dev/lib/libdrvctl/Makefile:1.2
--- src/sys/rump/dev/lib/libdrvctl/Makefile:1.1 Tue Dec 7 21:38:07 2010
+++ src/sys/rump/dev/lib/libdrvctl/Makefile Thu Mar 13 01:56:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/12/07 21:38:07 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:56:55 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../kern
@@ -7,7 +7,7 @@ LIB= rumpdev_drvctl
IOCONF= DRVCTL.ioconf
SRCS= kern_drvctl.c
-SRCS+= component.c
+SRCS+= drvctl_component.c
.include bsd.lib.mk
.include bsd.klinks.mk
Added files:
Index: src/sys/rump/dev/lib/libdrvctl/drvctl_component.c
diff -u /dev/null src/sys/rump/dev/lib/libdrvctl/drvctl_component.c:1.1
--- /dev/null Thu Mar 13 01:56:56 2014
+++ src/sys/rump/dev/lib/libdrvctl/drvctl_component.c Thu Mar 13 01:56:55 2014
@@ -0,0 +1,55 @@
+/* $NetBSD: drvctl_component.c,v 1.1 2014/03/13 01:56:55 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: drvctl_component.c,v 1.1 2014/03/13 01:56:55 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+extern const struct cdevsw drvctl_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ drvctl_init();
+
+ config_init_component(cfdriver_ioconf_drvctl,
+ cfattach_ioconf_drvctl, cfdata_ioconf_drvctl);
+
+ bmaj = cmaj = NODEVMAJOR;
+ if ((error = devsw_attach(drvctl, NULL, bmaj,
+ drvctl_cdevsw, cmaj)) != 0)
+ panic(drvctl devsw attach failed: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libaudio
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:57:52 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libaudio: Makefile
Added Files:
src/sys/rump/dev/lib/libaudio: audio_component.c
Removed Files:
src/sys/rump/dev/lib/libaudio: component.c
Log Message:
rename component.c - audio_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libaudio/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libaudio/audio_component.c
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/lib/libaudio/component.c
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/lib/libaudio/Makefile
diff -u src/sys/rump/dev/lib/libaudio/Makefile:1.1 src/sys/rump/dev/lib/libaudio/Makefile:1.2
--- src/sys/rump/dev/lib/libaudio/Makefile:1.1 Sat May 1 23:19:56 2010
+++ src/sys/rump/dev/lib/libaudio/Makefile Thu Mar 13 01:57:52 2014
@@ -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 @@ LIB= rumpdev_audio
IOCONF= AUDIO.ioconf
SRCS= audio.c auconv.c aurateconv.c mulaw.c
-SRCS+= component.c
+SRCS+= audio_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libaudio/audio_component.c
diff -u /dev/null src/sys/rump/dev/lib/libaudio/audio_component.c:1.1
--- /dev/null Thu Mar 13 01:57:52 2014
+++ src/sys/rump/dev/lib/libaudio/audio_component.c Thu Mar 13 01:57:52 2014
@@ -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);
+}
CVS commit: src/sys/rump/dev/lib/libnetsmb
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:57:29 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libnetsmb: Makefile
Added Files:
src/sys/rump/dev/lib/libnetsmb: netsmb_component.c
Removed Files:
src/sys/rump/dev/lib/libnetsmb: component.c
Log Message:
rename component.c - netsmb_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libnetsmb/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/lib/libnetsmb/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
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/lib/libnetsmb/Makefile
diff -u src/sys/rump/dev/lib/libnetsmb/Makefile:1.3 src/sys/rump/dev/lib/libnetsmb/Makefile:1.4
--- src/sys/rump/dev/lib/libnetsmb/Makefile:1.3 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/lib/libnetsmb/Makefile Thu Mar 13 01:57:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 20:42:45 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/13 01:57:29 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../netsmb
@@ -8,7 +8,7 @@ LIB= rumpdev_netsmb
SRCS= iconv.c smb_conn.c smb_crypt.c smb_dev.c smb_iod.c smb_rq.c \
smb_smb.c smb_subr.c smb_trantcp.c smb_usr.c subr_mchain.c
-SRCS+= component.c
+SRCS+= netsmb_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
#CPPFLAGS+= -DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG
Added files:
Index: src/sys/rump/dev/lib/libnetsmb/netsmb_component.c
diff -u /dev/null src/sys/rump/dev/lib/libnetsmb/netsmb_component.c:1.1
--- /dev/null Thu Mar 13 01:57:29 2014
+++ src/sys/rump/dev/lib/libnetsmb/netsmb_component.c Thu Mar 13 01:57:29 2014
@@ -0,0 +1,58 @@
+/* $NetBSD: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * Development of this software was supported by The Nokia Foundation
+ *
+ * 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: netsmb_component.c,v 1.1 2014/03/13 01:57:29 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+void nsmbattach(int); /* XXX */
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct cdevsw nsmb_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ bmaj = cmaj = NODEVMAJOR;
+ if ((error = devsw_attach(nsmb, NULL, bmaj, nsmb_cdevsw, cmaj))!=0)
+ panic(nsmb devsw attach failed: %d, error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/nsmb, '0',
+ cmaj, 0, 4)) != 0)
+ panic(cannot create nsmb device nodes: %d, error);
+
+ rump_pdev_add(nsmbattach, 4);
+}
CVS commit: src/sys/rump/dev/lib/libscsipi
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:58:20 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libscsipi: Makefile
Added Files:
src/sys/rump/dev/lib/libscsipi: scsipi_component.c
Removed Files:
src/sys/rump/dev/lib/libscsipi: component.c
Log Message:
rename component.c - scsipi_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libscsipi/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsipi/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libscsipi/scsipi_component.c
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/lib/libscsipi/Makefile
diff -u src/sys/rump/dev/lib/libscsipi/Makefile:1.1 src/sys/rump/dev/lib/libscsipi/Makefile:1.2
--- src/sys/rump/dev/lib/libscsipi/Makefile:1.1 Mon Aug 23 20:49:53 2010
+++ src/sys/rump/dev/lib/libscsipi/Makefile Thu Mar 13 01:58:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/23 20:49:53 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:58:20 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/scsipi
@@ -14,7 +14,7 @@ SRCS+= cd.c sd.c
SRCS+= scsipi_verbose.c
.endif
-SRCS+= component.c
+SRCS+= scsipi_component.c
CPPFLAGS+= -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libscsipi/scsipi_component.c
diff -u /dev/null src/sys/rump/dev/lib/libscsipi/scsipi_component.c:1.1
--- /dev/null Thu Mar 13 01:58:20 2014
+++ src/sys/rump/dev/lib/libscsipi/scsipi_component.c Thu Mar 13 01:58:20 2014
@@ -0,0 +1,39 @@
+/* $NetBSD: scsipi_component.c,v 1.1 2014/03/13 01:58:20 pooka Exp $ */
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/kmem.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern struct bdevsw sd_bdevsw, cd_bdevsw;
+ extern struct cdevsw sd_cdevsw, cd_cdevsw;
+ devmajor_t bmaj, cmaj;
+
+ config_init_component(cfdriver_ioconf_scsipi,
+ cfattach_ioconf_scsipi, cfdata_ioconf_scsipi);
+
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach(sd, sd_bdevsw, bmaj, sd_cdevsw, cmaj));
+
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, /dev/sd0, 'a',
+ bmaj, 0, 8));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, /dev/rsd0, 'a',
+ cmaj, 0, 8));
+
+ bmaj = cmaj = -1;
+ FLAWLESSCALL(devsw_attach(cd, cd_bdevsw, bmaj, cd_cdevsw, cmaj));
+
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFBLK, /dev/cd0, 'a',
+ bmaj, 0, 8));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, /dev/rcd0, 'a',
+ cmaj, 0, 8));
+}
CVS commit: src/sys/rump/dev/lib/libfss
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:59:06 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libfss: Makefile
Added Files:
src/sys/rump/dev/lib/libfss: fss_component.c
Removed Files:
src/sys/rump/dev/lib/libfss: component.c
Log Message:
rename component.c - fss_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libfss/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libfss/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libfss/fss_component.c
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/lib/libfss/Makefile
diff -u src/sys/rump/dev/lib/libfss/Makefile:1.1 src/sys/rump/dev/lib/libfss/Makefile:1.2
--- src/sys/rump/dev/lib/libfss/Makefile:1.1 Mon Apr 12 22:31:48 2010
+++ src/sys/rump/dev/lib/libfss/Makefile Thu Mar 13 01:59:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/04/12 22:31:48 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:59:05 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@ LIB= rumpdev_fss
SRCS= fss.c
-SRCS+= component.c
+SRCS+= fss_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libfss/fss_component.c
diff -u /dev/null src/sys/rump/dev/lib/libfss/fss_component.c:1.1
--- /dev/null Thu Mar 13 01:59:06 2014
+++ src/sys/rump/dev/lib/libfss/fss_component.c Thu Mar 13 01:59:05 2014
@@ -0,0 +1,59 @@
+/* $NetBSD: fss_component.c,v 1.1 2014/03/13 01:59:05 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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: fss_component.c,v 1.1 2014/03/13 01:59:05 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct bdevsw fss_bdevsw;
+ extern const struct cdevsw fss_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ bmaj = bdevsw_lookup_major(fss_bdevsw);
+ cmaj = cdevsw_lookup_major(fss_cdevsw);
+
+ if ((error = devsw_attach(fss, fss_bdevsw, bmaj,
+ fss_cdevsw, cmaj)) != 0)
+ panic(cannot attach fss: %d, error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/fss, '0',
+ bmaj, 0, 4)) != 0)
+ panic(cannot create cooked fss dev nodes: %d, error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rfss, '0',
+ cmaj, 0, 4)) != 0)
+ panic(cannot create raw fss dev nodes: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src
Committed By: pooka
Date: Thu Mar 13 01:58:46 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libscsitest: Makefile
Added Files:
src/sys/rump/dev/lib/libscsitest: scsitest_component.c
Removed Files:
src/sys/rump/dev/lib/libscsitest: component.c
Log Message:
rename component.c - scsitest_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libscsitest/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libscsitest/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libscsitest/scsitest_component.c
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/lib/libscsitest/Makefile
diff -u src/sys/rump/dev/lib/libscsitest/Makefile:1.1 src/sys/rump/dev/lib/libscsitest/Makefile:1.2
--- src/sys/rump/dev/lib/libscsitest/Makefile:1.1 Tue Aug 24 11:23:35 2010
+++ src/sys/rump/dev/lib/libscsitest/Makefile Thu Mar 13 01:58:46 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2010/08/24 11:23:35 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 01:58:46 pooka Exp $
#
LIB= rumpdev_scsitest
IOCONF= SCSITEST.ioconf
SRCS= scsitest.c
-SRCS+= component.c
+SRCS+= scsitest_component.c
.include bsd.lib.mk
.include bsd.klinks.mk
Added files:
Index: src/sys/rump/dev/lib/libscsitest/scsitest_component.c
diff -u /dev/null src/sys/rump/dev/lib/libscsitest/scsitest_component.c:1.1
--- /dev/null Thu Mar 13 01:58:46 2014
+++ src/sys/rump/dev/lib/libscsitest/scsitest_component.c Thu Mar 13 01:58:46 2014
@@ -0,0 +1,46 @@
+/* $NetBSD: scsitest_component.c,v 1.1 2014/03/13 01:58:46 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: scsitest_component.c,v 1.1 2014/03/13 01:58:46 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/mbuf.h
+#include sys/stat.h
+
+#include ioconf.c
+
+#include rump_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_scsitest,
+ cfattach_ioconf_scsitest, cfdata_ioconf_scsitest);
+}
CVS commit: src/sys/rump/dev/lib/libbpf
Module Name:src
Committed By: pooka
Date: Thu Mar 13 02:01:04 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libbpf: Makefile
Added Files:
src/sys/rump/dev/lib/libbpf: bpf_component.c
Removed Files:
src/sys/rump/dev/lib/libbpf: component.c
Log Message:
rename component.c - bpf_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libbpf/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libbpf/bpf_component.c
cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/lib/libbpf/component.c
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/lib/libbpf/Makefile
diff -u src/sys/rump/dev/lib/libbpf/Makefile:1.1 src/sys/rump/dev/lib/libbpf/Makefile:1.2
--- src/sys/rump/dev/lib/libbpf/Makefile:1.1 Tue Jan 19 22:38:21 2010
+++ src/sys/rump/dev/lib/libbpf/Makefile Thu Mar 13 02:01:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/01/19 22:38:21 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 02:01:04 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../net
@@ -6,7 +6,7 @@
LIB= rumpdev_bpf
SRCS= bpf.c bpf_filter.c
-SRCS+= component.c
+SRCS+= bpf_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libbpf/bpf_component.c
diff -u /dev/null src/sys/rump/dev/lib/libbpf/bpf_component.c:1.1
--- /dev/null Thu Mar 13 02:01:04 2014
+++ src/sys/rump/dev/lib/libbpf/bpf_component.c Thu Mar 13 02:01:04 2014
@@ -0,0 +1,53 @@
+/* $NetBSD: bpf_component.c,v 1.1 2014/03/13 02:01:04 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: bpf_component.c,v 1.1 2014/03/13 02:01:04 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/mbuf.h
+#include sys/stat.h
+
+#include net/bpf.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
+extern const struct cdevsw bpf_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ bmaj = cmaj = NODEVMAJOR;
+ if ((error = devsw_attach(bpf, NULL, bmaj, bpf_cdevsw, cmaj)) != 0)
+ panic(bpf devsw attach failed: %d, error);
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/bpf, cmaj, 0)) !=0)
+ panic(cannot create bpf device nodes: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src
Committed By: pgoyette
Date: Fri Jan 31 18:13:01 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libopencrypto: Makefile
Added Files:
src/sys/rump/dev/lib/libopencrypto: CRYPTO.ioconf
Log Message:
Use ioconf file to generate config data structures
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libopencrypto/CRYPTO.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libopencrypto/Makefile
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/lib/libopencrypto/Makefile
diff -u src/sys/rump/dev/lib/libopencrypto/Makefile:1.4 src/sys/rump/dev/lib/libopencrypto/Makefile:1.5
--- src/sys/rump/dev/lib/libopencrypto/Makefile:1.4 Thu Jan 16 14:12:09 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Fri Jan 31 18:13:01 2014
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/01/16 14:12:09 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/31 18:13:01 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../opencrypto
LIB= rumpdev_opencrypto
+IOCONF= CRYPTO.ioconf
SRCS= component.c
Added files:
Index: src/sys/rump/dev/lib/libopencrypto/CRYPTO.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libopencrypto/CRYPTO.ioconf:1.1
--- /dev/null Fri Jan 31 18:13:01 2014
+++ src/sys/rump/dev/lib/libopencrypto/CRYPTO.ioconf Fri Jan 31 18:13:01 2014
@@ -0,0 +1,8 @@
+# $NetBSD: CRYPTO.ioconf,v 1.1 2014/01/31 18:13:01 pgoyette Exp $
+#
+
+ioconf crypto
+
+include conf/files
+
+pseudo-device crypto
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src
Committed By: pgoyette
Date: Thu Jan 16 14:12:09 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libopencrypto: Makefile
Log Message:
Don't bring in the zlib stuff at build time. This will get resolved
when the user starts the rump_server process.
OK pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libopencrypto/Makefile
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/lib/libopencrypto/Makefile
diff -u src/sys/rump/dev/lib/libopencrypto/Makefile:1.3 src/sys/rump/dev/lib/libopencrypto/Makefile:1.4
--- src/sys/rump/dev/lib/libopencrypto/Makefile:1.3 Thu Jan 16 02:38:20 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Thu Jan 16 14:12:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/16 02:38:20 pgoyette Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/16 14:12:09 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../opencrypto
@@ -26,10 +26,6 @@ SRCS+= cryptosoft.c
SRCS+= deflate.c
SRCS+= gmac.c
-# deflate.c also requires zlib, so include the appropriate library
-
-LDADD+= -lrumpkern_z
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src
Committed By: pgoyette
Date: Thu Jan 16 02:21:24 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libopencrypto: Makefile
Log Message:
Remove explicit definition of COMPAT_50. As pointed out by pooka@,
this is already defined in Makefile.rump
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libopencrypto/Makefile
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/lib/libopencrypto/Makefile
diff -u src/sys/rump/dev/lib/libopencrypto/Makefile:1.1 src/sys/rump/dev/lib/libopencrypto/Makefile:1.2
--- src/sys/rump/dev/lib/libopencrypto/Makefile:1.1 Tue Jan 14 17:15:09 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Thu Jan 16 02:21:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/01/14 17:15:09 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/16 02:21:24 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../opencrypto
@@ -31,7 +31,6 @@ SRCS+= gmac.c
SRCS+= zlib.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
-CPPFLAGS+= -DCOMPAT_50
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src
Committed By: pgoyette
Date: Thu Jan 16 02:38:21 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libopencrypto: Makefile
Log Message:
Use existing rumpkern_z library rather than including another copy of
zlib.c
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libopencrypto/Makefile
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/lib/libopencrypto/Makefile
diff -u src/sys/rump/dev/lib/libopencrypto/Makefile:1.2 src/sys/rump/dev/lib/libopencrypto/Makefile:1.3
--- src/sys/rump/dev/lib/libopencrypto/Makefile:1.2 Thu Jan 16 02:21:24 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Thu Jan 16 02:38:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/16 02:21:24 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/16 02:38:20 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../opencrypto
@@ -26,9 +26,9 @@ SRCS+= cryptosoft.c
SRCS+= deflate.c
SRCS+= gmac.c
-.PATH: ${.CURDIR}/../../../../net
+# deflate.c also requires zlib, so include the appropriate library
-SRCS+= zlib.c
+LDADD+= -lrumpkern_z
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
CVS commit: src/sys/rump/dev/lib/libopencrypto
Module Name:src
Committed By: pgoyette
Date: Tue Jan 14 17:15:09 UTC 2014
Added Files:
src/sys/rump/dev/lib/libopencrypto: Makefile component.c shlib_version
Log Message:
Add new rump library for opencrypto framework
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libopencrypto/Makefile \
src/sys/rump/dev/lib/libopencrypto/component.c \
src/sys/rump/dev/lib/libopencrypto/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/dev/lib/libopencrypto/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libopencrypto/Makefile:1.1
--- /dev/null Tue Jan 14 17:15:09 2014
+++ src/sys/rump/dev/lib/libopencrypto/Makefile Tue Jan 14 17:15:09 2014
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2014/01/14 17:15:09 pgoyette Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../opencrypto
+
+LIB= rumpdev_opencrypto
+
+SRCS= component.c
+
+# Sources for crypto framework
+
+SRCS+= criov.c
+SRCS+= crypto.c
+SRCS+= xform.c
+
+# Sources for crypto device, for userland access
+
+SRCS+= cryptodev.c
+SRCS+= ocryptodev.c
+
+# Sources for swcrypto device to access opencrypto software algorithms
+# (Other algorithms are in rumpkern_crypto)
+
+SRCS+= aesxcbcmac.c
+SRCS+= cryptosoft.c
+SRCS+= deflate.c
+SRCS+= gmac.c
+
+.PATH: ${.CURDIR}/../../../../net
+
+SRCS+= zlib.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+= -DCOMPAT_50
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libopencrypto/component.c
diff -u /dev/null src/sys/rump/dev/lib/libopencrypto/component.c:1.1
--- /dev/null Tue Jan 14 17:15:09 2014
+++ src/sys/rump/dev/lib/libopencrypto/component.c Tue Jan 14 17:15:09 2014
@@ -0,0 +1,69 @@
+/* $NetBSD: component.c,v 1.1 2014/01/14 17:15:09 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2009 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.1 2014/01/14 17:15:09 pgoyette Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/rnd.h
+#include sys/stat.h
+#include sys/module.h
+
+#include rump_private.h
+#include rump_dev_private.h
+#include rump_vfs_private.h
+
+void cryptoattach(int);
+void swcryptoattach(int);
+void crypto_init(void);
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct cdevsw crypto_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach(crypto, NULL, bmaj,
+ crypto_cdevsw, cmaj)) != 0)
+ panic(cannot attach crypto: %d, error);
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/crypto,
+ cmaj, 0)) != 0)
+ panic(cannot create /dev/crypto: %d, error);
+
+ /*
+ * Initialize OpenCrypto and its pseudo-devices here
+ */
+ crypto_init();
+ rump_pdev_add(cryptoattach, 1);
+ rump_pdev_add(swcryptoattach, 0);
+}
Index: src/sys/rump/dev/lib/libopencrypto/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libopencrypto/shlib_version:1.1
--- /dev/null Tue Jan 14 17:15:09 2014
+++ src/sys/rump/dev/lib/libopencrypto/shlib_version Tue Jan 14 17:15:09 2014
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2014/01/14 17:15:09 pgoyette Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: joerg
Date: Fri Sep 13 20:38:39 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
Log Message:
GC rumpusb_device_intr_methods.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/dev/lib/libugenhc/ugenhc.c
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/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.15 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.16
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.15 Tue Apr 30 00:03:52 2013
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Fri Sep 13 20:38:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.15 2013/04/30 00:03:52 pooka Exp $ */
+/* $NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.15 2013/04/30 00:03:52 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $);
#include sys/param.h
#include sys/bus.h
@@ -913,15 +913,6 @@ static const struct usbd_pipe_methods ru
.done = rumpusb_device_bulk_done,
};
-static const struct usbd_pipe_methods rumpusb_device_intr_methods = {
- .transfer = rumpusb_root_intr_transfer,
- .start = rumpusb_root_intr_start,
- .abort = rumpusb_root_intr_abort,
- .close = rumpusb_root_intr_close,
- .cleartoggle = rumpusb_root_intr_cleartoggle,
- .done = rumpusb_root_intr_done,
-};
-
static usbd_status
ugenhc_open(struct usbd_pipe *pipe)
{
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src Committed By: pooka Date: Thu Jul 4 10:09:55 UTC 2013 Modified Files: src/sys/rump/dev/lib/libugenhc: rumpcomp_user.c Log Message: Some systems provide ioctl() via unistd.h (not that this is going to work there, but at least we don't get unnecessary compiler warnings) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c 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/lib/libugenhc/rumpcomp_user.c diff -u src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.5 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.6 --- src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.5 Tue Apr 30 12:39:21 2013 +++ src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c Thu Jul 4 10:09:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpcomp_user.c,v 1.5 2013/04/30 12:39:21 pooka Exp $ */ +/* $NetBSD: rumpcomp_user.c,v 1.6 2013/07/04 10:09:55 pooka Exp $ */ /* * Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved. @@ -29,6 +29,7 @@ #include sys/ioctl.h #include errno.h +#include unistd.h #include rump/rumpuser_component.h
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src Committed By: christos Date: Mon Apr 29 18:06:59 UTC 2013 Modified Files: src/sys/rump/dev/lib/libugenhc: rumpcomp_user.c Log Message: don't compile the for kernel To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c 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/lib/libugenhc/rumpcomp_user.c diff -u src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.2 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.3 --- src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.2 Sun Apr 28 06:23:36 2013 +++ src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c Mon Apr 29 14:06:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpcomp_user.c,v 1.2 2013/04/28 10:23:36 pooka Exp $ */ +/* $NetBSD: rumpcomp_user.c,v 1.3 2013/04/29 18:06:59 christos Exp $ */ /* * Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved. @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - +#ifndef _KERNEL #include sys/types.h #include sys/ioctl.h @@ -50,3 +50,4 @@ rumpcomp_ugenhc_ioctl(int fd, u_long cmd return rv; } +#endif
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Sun Apr 28 10:06:16 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libugenhc: Makefile
Log Message:
typo
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libugenhc/Makefile
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/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.3 src/sys/rump/dev/lib/libugenhc/Makefile:1.4
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.3 Sun Apr 28 09:58:11 2013
+++ src/sys/rump/dev/lib/libugenhc/Makefile Sun Apr 28 10:06:16 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/04/28 09:58:11 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2013/04/28 10:06:16 pooka Exp $
#
LIB= rumpdev_ugenhc
@@ -8,7 +8,7 @@ SRCS= ugenhc.c ugenhc_at_mainbus.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
-RUMPUSER_COMP= ioctl
+RUMPCOMP_USER= ioctl
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Sun Apr 28 10:16:52 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libugenhc: Makefile
Log Message:
duh, the untypoed version doesn't work with bsd.ioconf.mk. comment it
out while i figure it out
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libugenhc/Makefile
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/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.4 src/sys/rump/dev/lib/libugenhc/Makefile:1.5
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.4 Sun Apr 28 10:06:16 2013
+++ src/sys/rump/dev/lib/libugenhc/Makefile Sun Apr 28 10:16:52 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/04/28 10:06:16 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2013/04/28 10:16:52 pooka Exp $
#
LIB= rumpdev_ugenhc
@@ -8,7 +8,7 @@ SRCS= ugenhc.c ugenhc_at_mainbus.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
-RUMPCOMP_USER= ioctl
+#RUMPCOMP_USER= #ioctl
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src Committed By: pooka Date: Sun Apr 28 10:23:36 UTC 2013 Modified Files: src/sys/rump/dev/lib/libugenhc: rumpcomp_user.c Log Message: need errno To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c 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/lib/libugenhc/rumpcomp_user.c diff -u src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.1 src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.2 --- src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c:1.1 Sun Apr 28 09:58:11 2013 +++ src/sys/rump/dev/lib/libugenhc/rumpcomp_user.c Sun Apr 28 10:23:36 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpcomp_user.c,v 1.1 2013/04/28 09:58:11 pooka Exp $ */ +/* $NetBSD: rumpcomp_user.c,v 1.2 2013/04/28 10:23:36 pooka Exp $ */ /* * Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved. @@ -28,6 +28,8 @@ #include sys/types.h #include sys/ioctl.h +#include errno.h + #include rump/rumpuser_component.h #include rumpcomp_user.h
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: pooka
Date: Sun Apr 28 10:25:41 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libugenhc: Makefile
Log Message:
problem with ioconf.c solved, reenable
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libugenhc/Makefile
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/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.5 src/sys/rump/dev/lib/libugenhc/Makefile:1.6
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.5 Sun Apr 28 10:16:52 2013
+++ src/sys/rump/dev/lib/libugenhc/Makefile Sun Apr 28 10:25:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/04/28 10:16:52 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/28 10:25:41 pooka Exp $
#
LIB= rumpdev_ugenhc
@@ -8,7 +8,7 @@ SRCS= ugenhc.c ugenhc_at_mainbus.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
-#RUMPCOMP_USER= #ioctl
+RUMPCOMP_USER= #ioctl
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump/dev/lib/libpad
Module Name:src
Committed By: pooka
Date: Thu Apr 4 11:28:02 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libpad: component.c
Log Message:
create /dev/pad[0-3] instead of just /dev/pad
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpad/component.c
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/lib/libpad/component.c
diff -u src/sys/rump/dev/lib/libpad/component.c:1.1 src/sys/rump/dev/lib/libpad/component.c:1.2
--- src/sys/rump/dev/lib/libpad/component.c:1.1 Thu Apr 4 01:41:51 2013
+++ src/sys/rump/dev/lib/libpad/component.c Thu Apr 4 11:28:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.1 2013/04/04 01:41:51 pooka Exp $ */
+/* $NetBSD: component.c,v 1.2 2013/04/04 11:28:02 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: component.c,v 1.1 2013/04/04 01:41:51 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.2 2013/04/04 11:28:02 pooka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -40,6 +40,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
int error;
- if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/pad, 189, 0)) != 0)
+if ((error = rump_vfs_makedevnodes(S_IFCHR,
+ /dev/pad, '0', 189, 0, 4)) != 0)
panic(cannot create pad device: %d, error);
}
CVS commit: src/sys/rump/dev/lib/libputter
Module Name:src
Committed By: pooka
Date: Thu Apr 4 01:33:53 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libputter: Makefile
Added Files:
src/sys/rump/dev/lib/libputter: component.c
Log Message:
create /dev/putter device node in component attach
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libputter/Makefile
cvs rdiff -u -r0 -r1.3 src/sys/rump/dev/lib/libputter/component.c
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/lib/libputter/Makefile
diff -u src/sys/rump/dev/lib/libputter/Makefile:1.3 src/sys/rump/dev/lib/libputter/Makefile:1.4
--- src/sys/rump/dev/lib/libputter/Makefile:1.3 Thu Mar 31 08:36:25 2011
+++ src/sys/rump/dev/lib/libputter/Makefile Thu Apr 4 01:33:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/03/31 08:36:25 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2013/04/04 01:33:53 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/putter
@@ -6,6 +6,7 @@
LIB= rumpdev_putter
SRCS= putter.c
+SRCS+= component.c
.include bsd.lib.mk
.include bsd.klinks.mk
Added files:
Index: src/sys/rump/dev/lib/libputter/component.c
diff -u /dev/null src/sys/rump/dev/lib/libputter/component.c:1.3
--- /dev/null Thu Apr 4 01:33:53 2013
+++ src/sys/rump/dev/lib/libputter/component.c Thu Apr 4 01:33:53 2013
@@ -0,0 +1,46 @@
+/* $NetBSD: component.c,v 1.3 2013/04/04 01:33:53 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2009 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.3 2013/04/04 01:33:53 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ int error;
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR,
+ /dev/putter, 178, 0)) != 0)
+ panic(cannot create /dev/putter: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libmd
Module Name:src Committed By: pooka Date: Thu Apr 4 01:38:47 UTC 2013 Modified Files: src/sys/rump/dev/lib/libmd: component.c Log Message: create device nodes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libmd/component.c 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/lib/libmd/component.c diff -u src/sys/rump/dev/lib/libmd/component.c:1.2 src/sys/rump/dev/lib/libmd/component.c:1.3 --- src/sys/rump/dev/lib/libmd/component.c:1.2 Tue Apr 10 13:45:08 2012 +++ src/sys/rump/dev/lib/libmd/component.c Thu Apr 4 01:38:47 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: component.c,v 1.2 2012/04/10 13:45:08 gson Exp $ */ +/* $NetBSD: component.c,v 1.3 2013/04/04 01:38:47 pooka Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: component.c,v 1.2 2012/04/10 13:45:08 gson Exp $); +__KERNEL_RCSID(0, $NetBSD: component.c,v 1.3 2013/04/04 01:38:47 pooka Exp $); #include sys/param.h #include sys/conf.h @@ -57,5 +57,12 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV) md_cdevsw, cmaj)) != 0) panic(md devsw attach failed: %d, error); +if ((error = rump_vfs_makedevnodes(S_IFBLK, /dev/md0, 'a', +bmaj, 0, 7)) != 0) +panic(cannot create cooked md dev nodes: %d, error); +if ((error = rump_vfs_makedevnodes(S_IFCHR, /dev/rmd0, 'a', +cmaj, 0, 7)) != 0) +panic(cannot create raw md dev nodes: %d, error); + rump_pdev_add(mdattach, 0); }
CVS commit: src/sys/rump/dev/lib/libpad
Module Name:src
Committed By: pooka
Date: Thu Apr 4 01:41:51 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libpad: Makefile
Added Files:
src/sys/rump/dev/lib/libpad: component.c
Log Message:
create device nodes
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpad/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpad/component.c
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/lib/libpad/Makefile
diff -u src/sys/rump/dev/lib/libpad/Makefile:1.1 src/sys/rump/dev/lib/libpad/Makefile:1.2
--- src/sys/rump/dev/lib/libpad/Makefile:1.1 Sat May 1 23:21:24 2010
+++ src/sys/rump/dev/lib/libpad/Makefile Thu Apr 4 01:41:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/05/01 23:21:24 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/04 01:41:51 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/pad
@@ -6,6 +6,7 @@
LIB= rumpdev_pad
SRCS= pad.c padvol.c
+SRCS+= component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libpad/component.c
diff -u /dev/null src/sys/rump/dev/lib/libpad/component.c:1.1
--- /dev/null Thu Apr 4 01:41:51 2013
+++ src/sys/rump/dev/lib/libpad/component.c Thu Apr 4 01:41:51 2013
@@ -0,0 +1,45 @@
+/* $NetBSD: component.c,v 1.1 2013/04/04 01:41:51 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: component.c,v 1.1 2013/04/04 01:41:51 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ int error;
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/pad, 189, 0)) != 0)
+ panic(cannot create pad device: %d, error);
+}
CVS commit: src/sys/rump/dev/lib/libputter
Module Name:src
Committed By: pooka
Date: Thu Apr 4 01:48:20 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libputter: Makefile
Log Message:
set correct include path
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libputter/Makefile
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/lib/libputter/Makefile
diff -u src/sys/rump/dev/lib/libputter/Makefile:1.4 src/sys/rump/dev/lib/libputter/Makefile:1.5
--- src/sys/rump/dev/lib/libputter/Makefile:1.4 Thu Apr 4 01:33:53 2013
+++ src/sys/rump/dev/lib/libputter/Makefile Thu Apr 4 01:48:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/04/04 01:33:53 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2013/04/04 01:48:19 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/putter
@@ -8,5 +8,7 @@ LIB= rumpdev_putter
SRCS= putter.c
SRCS+= component.c
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
+
.include bsd.lib.mk
.include bsd.klinks.mk
CVS commit: src/sys/rump/dev/lib/libscsitest
Module Name:src
Committed By: martin
Date: Fri Mar 15 16:14:13 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libscsitest: scsitest.c
Log Message:
For the MMC GET_CONFIGURATION command, return a nulled feature header.
Fixes PR kern/47646.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsitest/scsitest.c
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/lib/libscsitest/scsitest.c
diff -u src/sys/rump/dev/lib/libscsitest/scsitest.c:1.5 src/sys/rump/dev/lib/libscsitest/scsitest.c:1.6
--- src/sys/rump/dev/lib/libscsitest/scsitest.c:1.5 Sat Oct 27 17:18:40 2012
+++ src/sys/rump/dev/lib/libscsitest/scsitest.c Fri Mar 15 16:14:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scsitest.c,v 1.5 2012/10/27 17:18:40 chs Exp $ */
+/* $NetBSD: scsitest.c,v 1.6 2013/03/15 16:14:12 martin Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.5 2012/10/27 17:18:40 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsitest.c,v 1.6 2013/03/15 16:14:12 martin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -176,7 +176,7 @@ scsitest_request(struct scsipi_channel *
break;
}
case GET_CONFIGURATION: {
-
+ memset(xs-data, 0, sizeof(struct scsipi_get_conf_data));
break;
}
case SCSI_READ_6_COMMAND: {
