Module Name: src
Committed By: kardel
Date: Sun Aug 27 13:20:10 UTC 2023
Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/dev/onewire: owtemp.c
src/sys/modules: Makefile
Added Files:
src/sys/modules/owtemp: Makefile owtemp.ioconf
Log Message:
make owtemp a module
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/onewire/owtemp.c
cvs rdiff -u -r1.279 -r1.280 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/owtemp/Makefile \
src/sys/modules/owtemp/owtemp.ioconf
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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.24 src/distrib/sets/lists/debug/module.mi:1.25
--- src/distrib/sets/lists/debug/module.mi:1.24 Tue Dec 20 00:31:55 2022
+++ src/distrib/sets/lists/debug/module.mi Sun Aug 27 13:20:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.24 2022/12/20 00:31:55 jakllsch Exp $
+# $NetBSD: module.mi,v 1.25 2023/08/27 13:20:09 kardel Exp $
./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug
@@ -308,6 +308,8 @@
./usr/libdata/debug/@MODULEDIR@/opencrypto/opencrypto.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/overlay modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/overlay/overlay.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/owtemp modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/owtemp/owtemp.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/pad modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/pad/pad.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/pciverbose modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.158 src/distrib/sets/lists/modules/mi:1.159
--- src/distrib/sets/lists/modules/mi:1.158 Tue Dec 20 00:31:56 2022
+++ src/distrib/sets/lists/modules/mi Sun Aug 27 13:20:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.158 2022/12/20 00:31:56 jakllsch Exp $
+# $NetBSD: mi,v 1.159 2023/08/27 13:20:09 kardel Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -367,6 +367,8 @@
./@MODULEDIR@/opencrypto/opencrypto.kmod modules-base-kernel kmod
./@MODULEDIR@/overlay modules-base-kernel kmod
./@MODULEDIR@/overlay/overlay.kmod modules-base-kernel kmod
+./@MODULEDIR@/owtemp modules-base-kernel kmod
+./@MODULEDIR@/owtemp/owtemp.kmod modules-base-kernel kmod
./@MODULEDIR@/pad modules-base-kernel kmod
./@MODULEDIR@/pad/pad.kmod modules-base-kernel kmod
./@MODULEDIR@/pciverbose modules-base-kernel kmod
Index: src/sys/dev/onewire/owtemp.c
diff -u src/sys/dev/onewire/owtemp.c:1.19 src/sys/dev/onewire/owtemp.c:1.20
--- src/sys/dev/onewire/owtemp.c:1.19 Sat Nov 30 23:06:52 2019
+++ src/sys/dev/onewire/owtemp.c Sun Aug 27 13:20:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: owtemp.c,v 1.19 2019/11/30 23:06:52 ad Exp $ */
+/* $NetBSD: owtemp.c,v 1.20 2023/08/27 13:20:09 kardel Exp $ */
/* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*-
@@ -51,13 +51,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.19 2019/11/30 23:06:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.20 2023/08/27 13:20:09 kardel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/proc.h>
+#include <sys/module.h>
#include <dev/sysmon/sysmonvar.h>
@@ -316,3 +317,37 @@ owtemp_decode_ds1920(const uint8_t *buf)
/* convert to uK */
return (temp + 273150000);
}
+
+MODULE(MODULE_CLASS_DRIVER, owtemp, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+owtemp_modcmd(modcmd_t cmd, void *opaque)
+{
+ int error;
+
+ error = 0;
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ error = config_init_component(cfdriver_ioconf_owtemp,
+ cfattach_ioconf_owtemp, cfdata_ioconf_owtemp);
+ if (error)
+ aprint_error("%s: unable to init component\n",
+ owtemp_cd.cd_name);
+#endif
+ break;
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ config_fini_component(cfdriver_ioconf_owtemp,
+ cfattach_ioconf_owtemp, cfdata_ioconf_owtemp);
+#endif
+ break;
+ default:
+ error = ENOTTY;
+ }
+ return error;
+}
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.279 src/sys/modules/Makefile:1.280
--- src/sys/modules/Makefile:1.279 Wed Aug 9 09:36:26 2023
+++ src/sys/modules/Makefile Sun Aug 27 13:20:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.279 2023/08/09 09:36:26 andvar Exp $
+# $NetBSD: Makefile,v 1.280 2023/08/27 13:20:09 kardel Exp $
.include <bsd.own.mk>
@@ -138,6 +138,7 @@ SUBDIR+= null
SUBDIR+= onewire
SUBDIR+= opencrypto
SUBDIR+= overlay
+SUBDIR+= owtemp
SUBDIR+= pad
SUBDIR+= pciverbose
SUBDIR+= pf
Added files:
Index: src/sys/modules/owtemp/Makefile
diff -u /dev/null src/sys/modules/owtemp/Makefile:1.1
--- /dev/null Sun Aug 27 13:20:10 2023
+++ src/sys/modules/owtemp/Makefile Sun Aug 27 13:20:09 2023
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2023/08/27 13:20:09 kardel Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/onewire
+
+KMOD= owtemp
+IOCONF= owtemp.ioconf
+SRCS= owtemp.c
+
+CPPFLAGS+= -I${S}/onewire
+
+WARNS= 3
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/owtemp/owtemp.ioconf
diff -u /dev/null src/sys/modules/owtemp/owtemp.ioconf:1.1
--- /dev/null Sun Aug 27 13:20:10 2023
+++ src/sys/modules/owtemp/owtemp.ioconf Sun Aug 27 13:20:09 2023
@@ -0,0 +1,8 @@
+# $NetBSD: owtemp.ioconf,v 1.1 2023/08/27 13:20:09 kardel Exp $
+
+ioconf owtemp
+
+include "conf/files"
+
+pseudo-root onewire*
+owtemp* at onewire?
