Module Name: src
Committed By: pooka
Date: Mon Nov 16 23:27:08 UTC 2015
Modified Files:
src/sys/rump/dev: files.rump
src/sys/rump/dev/lib: Makefile.inc component_simple.c
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_viornd: Makefile
src/sys/rump/dev/lib/libvirtio_vioscsi: Makefile
Log Message:
Use IOCONF #define to determine component name.
Avoids having to manually retype info already in .ioconf.
Also, COMPONENT_SIMPLE -> RUMP_COMPONENT=simple. That way, we can add
other attributes where necessary. As "future directions", the "ioconf"
attribute for RUMP_COMPONENT can just be removed when a driver is
converted to modular and has a proper modcmd.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/files.rump
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/component_simple.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libmiiphy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_auich/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_eap/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_iwn/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_pcn/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_if_wm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci_usbhc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci_virtio/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libubt/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libugenhc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libvirtio_viornd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libvirtio_vioscsi/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/files.rump
diff -u src/sys/rump/dev/files.rump:1.4 src/sys/rump/dev/files.rump:1.5
--- src/sys/rump/dev/files.rump:1.4 Tue Sep 17 00:50:19 2013
+++ src/sys/rump/dev/files.rump Mon Nov 16 23:27:07 2015
@@ -1,6 +1,8 @@
-# $NetBSD: files.rump,v 1.4 2013/09/17 00:50:19 pooka Exp $
+# $NetBSD: files.rump,v 1.5 2015/11/16 23:27:07 pooka Exp $
#
+version 20151112
+
device mainbus { }: pcibus
attach mainbus at root
Index: src/sys/rump/dev/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.5 src/sys/rump/dev/lib/Makefile.inc:1.6
--- src/sys/rump/dev/lib/Makefile.inc:1.5 Wed Nov 11 21:52:45 2015
+++ src/sys/rump/dev/lib/Makefile.inc Mon Nov 16 23:27:07 2015
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.5 2015/11/11 21:52:45 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.6 2015/11/16 23:27:07 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../..
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev
RUMPDEVLIBDIR:= ${.PARSEDIR}
-.ifdef COMPONENT_SIMPLE
+
+.if defined(RUMP_COMPONENT) && !empty(${RUMP_COMPONENT:Mioconf})
.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/component_simple.c
diff -u src/sys/rump/dev/lib/component_simple.c:1.1 src/sys/rump/dev/lib/component_simple.c:1.2
--- src/sys/rump/dev/lib/component_simple.c:1.1 Wed Nov 11 21:52:45 2015
+++ src/sys/rump/dev/lib/component_simple.c Mon Nov 16 23:27:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: component_simple.c,v 1.1 2015/11/11 21:52:45 pooka Exp $ */
+/* $NetBSD: component_simple.c,v 1.2 2015/11/16 23:27:07 pooka Exp $ */
/*
* Copyright (c) 2015 Antti Kantee. All Rights Reserved.
@@ -25,12 +25,8 @@
* 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 $");
+__KERNEL_RCSID(0, "$NetBSD: component_simple.c,v 1.2 2015/11/16 23:27:07 pooka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -49,5 +45,5 @@ __KERNEL_RCSID(0, "$NetBSD: component_si
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
- CONFIG_INIT_COMPONENT(COMPONENT_NAME);
+ CONFIG_INIT_COMPONENT(IOCONF);
}
Index: src/sys/rump/dev/lib/libmiiphy/Makefile
diff -u src/sys/rump/dev/lib/libmiiphy/Makefile:1.5 src/sys/rump/dev/lib/libmiiphy/Makefile:1.6
--- src/sys/rump/dev/lib/libmiiphy/Makefile:1.5 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libmiiphy/Makefile Mon Nov 16 23:27:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/16 23:27:07 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_miiphy
COMMENT=MII and PHY drivers (for networking)
IOCONF= MIIPHY.ioconf
-COMPONENT_SIMPLE= phy
+RUMP_COMPONENT=ioconf
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.3 src/sys/rump/dev/lib/libpci_auich/Makefile:1.4
--- src/sys/rump/dev/lib/libpci_auich/Makefile:1.3 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libpci_auich/Makefile Mon Nov 16 23:27:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:07 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_pci_auich
COMMENT=AC97 Intel Audio driver
IOCONF= PCI_AUICH.ioconf
-COMPONENT_SIMPLE= pci_auich
+RUMP_COMPONENT=ioconf
SRCS+= auich.c
Index: src/sys/rump/dev/lib/libpci_eap/Makefile
diff -u src/sys/rump/dev/lib/libpci_eap/Makefile:1.3 src/sys/rump/dev/lib/libpci_eap/Makefile:1.4
--- src/sys/rump/dev/lib/libpci_eap/Makefile:1.3 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libpci_eap/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_pci_eap
COMMENT=Ensoniq AudioPCI driver
IOCONF= PCI_EAP.ioconf
-COMPONENT_SIMPLE= pci_eap
+RUMP_COMPONENT=ioconf
SRCS+= eap.c
Index: src/sys/rump/dev/lib/libpci_if_iwn/Makefile
diff -u src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.3 src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.4
--- src/sys/rump/dev/lib/libpci_if_iwn/Makefile:1.3 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libpci_if_iwn/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_pci_if_iwn
COMMENT=Intel wireless device driver
IOCONF= PCI_IF_IWN.ioconf
-COMPONENT_SIMPLE= pci_if_iwn
+RUMP_COMPONENT=ioconf
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.3 src/sys/rump/dev/lib/libpci_if_pcn/Makefile:1.4
--- src/sys/rump/dev/lib/libpci_if_pcn/Makefile:1.3 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libpci_if_pcn/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_pci_if_pcn
COMMENT=PCnet Ethernet device driver
IOCONF= PCI_IF_PCN.ioconf
-COMPONENT_SIMPLE= pci_if_pcn
+RUMP_COMPONENT=ioconf
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.3 src/sys/rump/dev/lib/libpci_if_wm/Makefile:1.4
--- src/sys/rump/dev/lib/libpci_if_wm/Makefile:1.3 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libpci_if_wm/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_pci_if_wm
COMMENT=Intel GigE device driver
IOCONF= PCI_IF_WM.ioconf
-COMPONENT_SIMPLE= pci_if_wm
+RUMP_COMPONENT=ioconf
SRCS+= if_wm.c
Index: src/sys/rump/dev/lib/libpci_usbhc/Makefile
diff -u src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.4 src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.5
--- src/sys/rump/dev/lib/libpci_usbhc/Makefile:1.4 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libpci_usbhc/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_pci_usbhc
COMMENT=PCI USB host controller drivers
IOCONF= PCI_USBHC.ioconf
-COMPONENT_SIMPLE= pci_usbhc
+RUMP_COMPONENT=ioconf
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.3 src/sys/rump/dev/lib/libpci_virtio/Makefile:1.4
--- src/sys/rump/dev/lib/libpci_virtio/Makefile:1.3 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libpci_virtio/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_pci_virtio
COMMENT=VirtIO bus support
IOCONF= PCI_VIRTIO.ioconf
-COMPONENT_SIMPLE= pci_virtio
+RUMP_COMPONENT=ioconf
SRCS+= virtio.c
Index: src/sys/rump/dev/lib/libubt/Makefile
diff -u src/sys/rump/dev/lib/libubt/Makefile:1.5 src/sys/rump/dev/lib/libubt/Makefile:1.6
--- src/sys/rump/dev/lib/libubt/Makefile:1.5 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libubt/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/16 23:27:08 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/bluetooth
@@ -7,7 +7,7 @@ LIB= rumpdev_ubt
COMMENT=USB BlueTooth driver
IOCONF= UBT.ioconf
-COMPONENT_SIMPLE= ubt
+RUMP_COMPONENT=ioconf
SRCS= ubt.c bthub.c
Index: src/sys/rump/dev/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.11 src/sys/rump/dev/lib/libugenhc/Makefile:1.12
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.11 Wed Nov 11 21:52:46 2015
+++ src/sys/rump/dev/lib/libugenhc/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/11/11 21:52:46 pooka Exp $
+# $NetBSD: Makefile,v 1.12 2015/11/16 23:27:08 pooka Exp $
#
LIB= rumpdev_ugenhc
@@ -6,7 +6,7 @@ COMMENT=USB host controller using /dev/u
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
IOCONF= UGENHC.ioconf
-COMPONENT_SIMPLE= ugenhc
+RUMP_COMPONENT=ioconf
SRCS= ugenhc.c ugenhc_dma.c
Index: src/sys/rump/dev/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.10 src/sys/rump/dev/lib/libusb/Makefile:1.11
--- src/sys/rump/dev/lib/libusb/Makefile:1.10 Wed Nov 11 21:52:47 2015
+++ src/sys/rump/dev/lib/libusb/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/11/11 21:52:47 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2015/11/16 23:27:08 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -8,7 +8,7 @@ COMMENT=USB support
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
IOCONF= USB.ioconf
-COMPONENT_SIMPLE= usb
+RUMP_COMPONENT=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
Index: src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile
diff -u src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.3 src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.4
--- src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile:1.3 Wed Nov 11 21:52:47 2015
+++ src/sys/rump/dev/lib/libvirtio_if_vioif/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:47 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_virtio_if_vioif
COMMENT=VirtIO network interface driver
IOCONF= VIRTIO_IF_VIOIF.ioconf
-COMPONENT_SIMPLE= virtio_if_vioif
+RUMP_COMPONENT=ioconf
SRCS+= if_vioif.c
Index: src/sys/rump/dev/lib/libvirtio_viornd/Makefile
diff -u src/sys/rump/dev/lib/libvirtio_viornd/Makefile:1.3 src/sys/rump/dev/lib/libvirtio_viornd/Makefile:1.4
--- src/sys/rump/dev/lib/libvirtio_viornd/Makefile:1.3 Wed Nov 11 21:52:47 2015
+++ src/sys/rump/dev/lib/libvirtio_viornd/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/11 21:52:47 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,7 +9,7 @@ LIB= rumpdev_virtio_viornd
COMMENT=VirtIO entropy driver
IOCONF= VIRTIO_VIORND.ioconf
-COMPONENT_SIMPLE= virtio_viornd
+RUMP_COMPONENT=ioconf
SRCS+= viornd.c
Index: src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile
diff -u src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile:1.2 src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile:1.3
--- src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile:1.2 Wed Nov 11 21:52:47 2015
+++ src/sys/rump/dev/lib/libvirtio_vioscsi/Makefile Mon Nov 16 23:27:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/11/11 21:52:47 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/11/16 23:27:08 pooka Exp $
#
RUMPTOP=${TOPRUMP}
@@ -9,8 +9,7 @@ LIB= rumpdev_virtio_vioscsi
COMMENT=VirtIO SCSI driver
IOCONF= VIRTIO_VIOSCSI.ioconf
-
-COMPONENT_SIMPLE= virtio_vioscsi
+RUMP_COMPONENT=ioconf
SRCS+= vioscsi.c
