Module Name:    src
Committed By:   riastradh
Date:           Wed Apr 19 00:01:38 UTC 2017

Modified Files:
        src/distrib/sets/lists/modules: mi
        src/sys/dev/usb: ualea.c
        src/sys/modules: Makefile
        src/sys/rump/dev/lib/libualea: Makefile
Added Files:
        src/sys/modules/ualea: Makefile ualea.ioconf
Removed Files:
        src/sys/rump/dev/lib/libualea: ualea_component.c

Log Message:
Modularize ualea(4).

Unclear why we have a separate xyz.ioconf for module and XYZ.ioconf
for rump component, but at least xyz_modcmd obviates the need for
xyz_component.c (though evidently the latter could have been replaced
anyway by RUMP_COMPONENT=ioconf in the rump component Makefile).


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/ualea.c
cvs rdiff -u -r1.190 -r1.191 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/ualea/Makefile \
    src/sys/modules/ualea/ualea.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libualea/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libualea/ualea_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/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.108 src/distrib/sets/lists/modules/mi:1.109
--- src/distrib/sets/lists/modules/mi:1.108	Thu Feb 16 08:12:43 2017
+++ src/distrib/sets/lists/modules/mi	Wed Apr 19 00:01:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.108 2017/02/16 08:12:43 knakahara Exp $
+# $NetBSD: mi,v 1.109 2017/04/19 00:01:38 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -358,6 +358,8 @@
 ./@MODULEDIR@/twe/twe.kmod			base-obsolete		obsolete
 ./@MODULEDIR@/uatp				base-kernel-modules	kmod
 ./@MODULEDIR@/uatp/uatp.kmod			base-kernel-modules	kmod
+./@MODULEDIR@/ualea				base-kernel-modules	kmod
+./@MODULEDIR@/ualea/ualea.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/udf				base-kernel-modules	kmod
 ./@MODULEDIR@/udf/udf.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/umap				base-kernel-modules	kmod

Index: src/sys/dev/usb/ualea.c
diff -u src/sys/dev/usb/ualea.c:1.5 src/sys/dev/usb/ualea.c:1.6
--- src/sys/dev/usb/ualea.c:1.5	Tue Apr 18 19:09:12 2017
+++ src/sys/dev/usb/ualea.c	Wed Apr 19 00:01:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ualea.c,v 1.5 2017/04/18 19:09:12 riastradh Exp $	*/
+/*	$NetBSD: ualea.c,v 1.6 2017/04/19 00:01:38 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,12 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ualea.c,v 1.5 2017/04/18 19:09:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ualea.c,v 1.6 2017/04/19 00:01:38 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/device_if.h>
 #include <sys/kmem.h>
+#include <sys/module.h>
 #include <sys/rndpool.h>
 #include <sys/rndsource.h>
 
@@ -230,3 +231,32 @@ out:
 	sc->sc_inflight = false;
 	mutex_exit(&sc->sc_lock);
 }
+
+MODULE(MODULE_CLASS_DRIVER, ualea, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+ualea_modcmd(modcmd_t cmd, void *aux)
+{
+	int error = 0;
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+#ifdef _MODULE
+		error = config_init_component(cfdriver_ioconf_ualea,
+		    cfattach_ioconf_ualea, cfdata_ioconf_ualea);
+#endif
+		return error;
+	case MODULE_CMD_FINI:
+#ifdef _MODULE
+		error = config_fini_component(cfdriver_ioconf_ualea,
+		    cfattach_ioconf_ualea, cfdata_ioconf_ualea);
+#endif
+		return error;
+	default:
+		return ENOTTY;
+	}
+}

Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.190 src/sys/modules/Makefile:1.191
--- src/sys/modules/Makefile:1.190	Sat Mar 25 23:17:07 2017
+++ src/sys/modules/Makefile	Wed Apr 19 00:01:38 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.190 2017/03/25 23:17:07 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.191 2017/04/19 00:01:38 riastradh Exp $
 
 .include <bsd.own.mk>
 
@@ -131,6 +131,7 @@ SUBDIR+=	swcrypto
 SUBDIR+=	swsensor
 SUBDIR+=	swwdog
 SUBDIR+=	tmpfs
+SUBDIR+=	ualea
 SUBDIR+=	uatp
 SUBDIR+=	udf
 SUBDIR+=	umap

Index: src/sys/rump/dev/lib/libualea/Makefile
diff -u src/sys/rump/dev/lib/libualea/Makefile:1.1 src/sys/rump/dev/lib/libualea/Makefile:1.2
--- src/sys/rump/dev/lib/libualea/Makefile:1.1	Mon Apr 17 08:59:37 2017
+++ src/sys/rump/dev/lib/libualea/Makefile	Wed Apr 19 00:01:38 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2017/04/17 08:59:37 riastradh Exp $
+#	$NetBSD: Makefile,v 1.2 2017/04/19 00:01:38 riastradh Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/usb
@@ -9,8 +9,6 @@ COMMENT=USB Araneus Alea II TRNG
 IOCONF=	UALEA.ioconf
 
 SRCS+=	ualea.c
-SRCS+=	ualea_component.c
-
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>

Added files:

Index: src/sys/modules/ualea/Makefile
diff -u /dev/null src/sys/modules/ualea/Makefile:1.1
--- /dev/null	Wed Apr 19 00:01:38 2017
+++ src/sys/modules/ualea/Makefile	Wed Apr 19 00:01:38 2017
@@ -0,0 +1,12 @@
+#	$NetBSD: Makefile,v 1.1 2017/04/19 00:01:38 riastradh Exp $
+
+.include "../Makefile.inc"
+
+.PATH:	${S}/dev/usb
+
+KMOD=	ualea
+IOCONF=	ualea.ioconf
+
+SRCS+=	ualea.c
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/ualea/ualea.ioconf
diff -u /dev/null src/sys/modules/ualea/ualea.ioconf:1.1
--- /dev/null	Wed Apr 19 00:01:38 2017
+++ src/sys/modules/ualea/ualea.ioconf	Wed Apr 19 00:01:38 2017
@@ -0,0 +1,12 @@
+#	$NetBSD: ualea.ioconf,v 1.1 2017/04/19 00:01:38 riastradh Exp $
+#
+
+ioconf ualea
+
+include "conf/files"
+include "dev/usb/files.usb"
+
+pseudo-root uhub*
+
+# Araneus Alea I/II TRNG
+ualea* at uhub? port ? configuration ? interface ?

Reply via email to