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:	${RUMPDEVLIBDIR}
+SRCS+=   component_simple.c
+CPPFLAGS.component_simple.c+= -DCOMPONENT_NAME=${COMPONENT_SIMPLE}
+.endif
+
 .include "${RUMPTOP}/Makefile.rump"

Index: src/sys/rump/dev/lib/libmiiphy/Makefile
diff -u src/sys/rump/dev/lib/libmiiphy/Makefile:1.4 src/sys/rump/dev/lib/libmiiphy/Makefile:1.5
--- src/sys/rump/dev/lib/libmiiphy/Makefile:1.4	Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libmiiphy/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2015/10/19 16:16:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.5 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB=	rumpdev_miiphy
 COMMENT=MII and PHY drivers (for networking)
 
 IOCONF=	MIIPHY.ioconf
-
-SRCS=	phy_at_mii.c
+COMPONENT_SIMPLE= phy
 
 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 \

Index: src/sys/rump/dev/lib/libpci_auich/Makefile
diff -u src/sys/rump/dev/lib/libpci_auich/Makefile:1.2 src/sys/rump/dev/lib/libpci_auich/Makefile:1.3
--- src/sys/rump/dev/lib/libpci_auich/Makefile:1.2	Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libpci_auich/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,7 +9,8 @@ LIB=	rumpdev_pci_auich
 COMMENT=AC97 Intel Audio driver
 
 IOCONF=	PCI_AUICH.ioconf
-SRCS=	auich_at_pci.c
+COMPONENT_SIMPLE= pci_auich
+
 SRCS+=	auich.c
 
 CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev

Index: src/sys/rump/dev/lib/libpci_eap/Makefile
diff -u src/sys/rump/dev/lib/libpci_eap/Makefile:1.2 src/sys/rump/dev/lib/libpci_eap/Makefile:1.3
--- src/sys/rump/dev/lib/libpci_eap/Makefile:1.2	Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libpci_eap/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,7 +9,8 @@ LIB=	rumpdev_pci_eap
 COMMENT=Ensoniq AudioPCI driver
 
 IOCONF=	PCI_EAP.ioconf
-SRCS=	eap_at_pci.c
+COMPONENT_SIMPLE= pci_eap
+
 SRCS+=	eap.c
 
 CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev

Index: src/sys/rump/dev/lib/libpci_if_iwn/Makefile
diff -u src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.2 src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.3
--- src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.2	Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libpci_if_iwn/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB=	rumpdev_pci_if_iwn
 COMMENT=Intel wireless device driver
 
 IOCONF=	PCI_IF_IWN.ioconf
-
-SRCS=	iwn_at_pci.c
+COMPONENT_SIMPLE= pci_if_iwn
 
 SRCS+=	if_iwn.c
 

Index: src/sys/rump/dev/lib/libpci_if_pcn/Makefile
diff -u src/sys/rump/dev/lib/libpci_if_pcn/Makefile:1.2 src/sys/rump/dev/lib/libpci_if_pcn/Makefile:1.3
--- src/sys/rump/dev/lib/libpci_if_pcn/Makefile:1.2	Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libpci_if_pcn/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB=	rumpdev_pci_if_pcn
 COMMENT=PCnet Ethernet device driver
 
 IOCONF=	PCI_IF_PCN.ioconf
-
-SRCS=	pcn_at_pci.c
+COMPONENT_SIMPLE= pci_if_pcn
 
 SRCS+=	if_pcn.c
 

Index: src/sys/rump/dev/lib/libpci_if_wm/Makefile
diff -u src/sys/rump/dev/lib/libpci_if_wm/Makefile:1.2 src/sys/rump/dev/lib/libpci_if_wm/Makefile:1.3
--- src/sys/rump/dev/lib/libpci_if_wm/Makefile:1.2	Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libpci_if_wm/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB=	rumpdev_pci_if_wm
 COMMENT=Intel GigE device driver
 
 IOCONF=	PCI_IF_WM.ioconf
-
-SRCS=	wm_at_pci.c
+COMPONENT_SIMPLE= pci_if_wm
 
 SRCS+=	if_wm.c
 

Index: src/sys/rump/dev/lib/libpci_usbhc/Makefile
diff -u src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.3 src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.4
--- src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.3	Mon Oct 19 16:16:33 2015
+++ src/sys/rump/dev/lib/libpci_usbhc/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2015/10/19 16:16:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB=	rumpdev_pci_usbhc
 COMMENT=PCI USB host controller drivers
 
 IOCONF=	PCI_USBHC.ioconf
-SRCS=	usbhc_at_pci.c
+COMPONENT_SIMPLE= pci_usbhc
 
 SRCS+=	ohci_pci.c ohci.c
 SRCS+=	uhci_pci.c uhci.c

Index: src/sys/rump/dev/lib/libpci_virtio/Makefile
diff -u src/sys/rump/dev/lib/libpci_virtio/Makefile:1.2 src/sys/rump/dev/lib/libpci_virtio/Makefile:1.3
--- src/sys/rump/dev/lib/libpci_virtio/Makefile:1.2	Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libpci_virtio/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:34 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB=	rumpdev_pci_virtio
 COMMENT=VirtIO bus support
 
 IOCONF=	PCI_VIRTIO.ioconf
-
-SRCS=	virtio_at_pci.c
+COMPONENT_SIMPLE= pci_virtio
 
 SRCS+=	virtio.c
 

Index: src/sys/rump/dev/lib/libubt/Makefile
diff -u src/sys/rump/dev/lib/libubt/Makefile:1.4 src/sys/rump/dev/lib/libubt/Makefile:1.5
--- src/sys/rump/dev/lib/libubt/Makefile:1.4	Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libubt/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2015/10/19 16:16:34 pooka Exp $
+#	$NetBSD: Makefile,v 1.5 2015/11/11 21:52:46 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/bluetooth
@@ -7,10 +7,9 @@ LIB=	rumpdev_ubt
 COMMENT=USB BlueTooth driver
 
 IOCONF= UBT.ioconf
+COMPONENT_SIMPLE= ubt
 
 SRCS=	ubt.c bthub.c
 
-SRCS+=	ubt_at_usb.c
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>

Index: src/sys/rump/dev/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.10 src/sys/rump/dev/lib/libugenhc/Makefile:1.11
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.10	Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libugenhc/Makefile	Wed Nov 11 21:52:46 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2015/10/19 16:16:34 pooka Exp $
+#	$NetBSD: Makefile,v 1.11 2015/11/11 21:52:46 pooka Exp $
 #
 
 LIB=	rumpdev_ugenhc
@@ -6,8 +6,9 @@ COMMENT=USB host controller using /dev/u
 
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
 IOCONF= UGENHC.ioconf
+COMPONENT_SIMPLE= ugenhc
 
-SRCS=	ugenhc.c ugenhc_at_mainbus.c ugenhc_dma.c
+SRCS=	ugenhc.c ugenhc_dma.c
 
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern
 

Index: src/sys/rump/dev/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.9 src/sys/rump/dev/lib/libusb/Makefile:1.10
--- src/sys/rump/dev/lib/libusb/Makefile:1.9	Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libusb/Makefile	Wed Nov 11 21:52:47 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2015/10/19 16:16:34 pooka Exp $
+#	$NetBSD: Makefile,v 1.10 2015/11/11 21:52:47 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/usb
@@ -8,10 +8,10 @@ COMMENT=USB support
 
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
 IOCONF= USB.ioconf
+COMPONENT_SIMPLE= usb
 
 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_hc.c
 .else
 SRCS=	dummy.c
 .endif

Index: src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
diff -u src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.2 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.3
--- src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.2	Mon Oct 19 16:16:34 2015
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile	Wed Nov 11 21:52:47 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:34 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:47 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB=	rumpdev_virtio_if_vioif
 COMMENT=VirtIO network interface driver
 
 IOCONF=	VIRTIO_IF_VIOIF.ioconf
-
-SRCS=	vioif_at_virtio.c
+COMPONENT_SIMPLE= virtio_if_vioif
 
 SRCS+=	if_vioif.c
 

Index: src/sys/rump/dev/lib/libvirtio_ld/Makefile
diff -u src/sys/rump/dev/lib/libvirtio_ld/Makefile:1.2 src/sys/rump/dev/lib/libvirtio_ld/Makefile:1.3
--- src/sys/rump/dev/lib/libvirtio_ld/Makefile:1.2	Mon Oct 19 16:16:35 2015
+++ src/sys/rump/dev/lib/libvirtio_ld/Makefile	Wed Nov 11 21:52:47 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:35 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:47 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -12,7 +12,6 @@ COMMENT=VirtIO block device driver
 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

Index: src/sys/rump/dev/lib/libvirtio_viornd/Makefile
diff -u src/sys/rump/dev/lib/libvirtio_viornd/Makefile:1.2 src/sys/rump/dev/lib/libvirtio_viornd/Makefile:1.3
--- src/sys/rump/dev/lib/libvirtio_viornd/Makefile:1.2	Mon Oct 19 16:16:35 2015
+++ src/sys/rump/dev/lib/libvirtio_viornd/Makefile	Wed Nov 11 21:52:47 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/10/19 16:16:35 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/11/11 21:52:47 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB=	rumpdev_virtio_viornd
 COMMENT=VirtIO entropy driver
 
 IOCONF=	VIRTIO_VIORND.ioconf
-
-SRCS=	viornd_at_virtio.c
+COMPONENT_SIMPLE= virtio_viornd
 
 SRCS+=	viornd.c
 

Index: src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile
diff -u src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile:1.1 src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile:1.2
--- src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile:1.1	Sun Nov  1 09:03:28 2015
+++ src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile	Wed Nov 11 21:52:47 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2015/11/01 09:03:28 pooka Exp $
+#	$NetBSD: Makefile,v 1.2 2015/11/11 21:52:47 pooka Exp $
 #
 
 RUMPTOP=${TOPRUMP}
@@ -10,7 +10,7 @@ COMMENT=VirtIO SCSI driver
 
 IOCONF=	VIRTIO_VIOSCSI.ioconf
 
-SRCS=	vioscsi_at_virtio.c
+COMPONENT_SIMPLE= virtio_vioscsi
 
 SRCS+=	vioscsi.c
 

Added files:

Index: src/sys/rump/dev/lib/component_simple.c
diff -u /dev/null src/sys/rump/dev/lib/component_simple.c:1.1
--- /dev/null	Wed Nov 11 21:52:47 2015
+++ src/sys/rump/dev/lib/component_simple.c	Wed Nov 11 21:52:45 2015
@@ -0,0 +1,53 @@
+/*	$NetBSD: component_simple.c,v 1.1 2015/11/11 21:52:45 pooka Exp $	*/
+
+/*
+ * Copyright (c) 2015 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 COMPONENT_NAME
+#error Internal error: COMPONENT_NAME not defined
+#endif
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: component_simple.c,v 1.1 2015/11/11 21:52:45 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"
+
+#define CONFIG_INIT_COMPONENT(a) config_init_component(			\
+    __CONCAT(cfdriver_ioconf_,a),					\
+    __CONCAT(cfattach_ioconf_,a),					\
+    __CONCAT(cfdata_ioconf_,a));
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+	CONFIG_INIT_COMPONENT(COMPONENT_NAME);
+}

Reply via email to