Module Name: src Committed By: snj Date: Sat Mar 21 17:11:35 UTC 2015
Modified Files: src/distrib/sets/lists/modules [netbsd-7]: md.amd64 md.evbppc.powerpc md.i386 mi src/sys/dev/i2c [netbsd-7]: au8522.c cx24227.c dbcool.c hytp14.c i2c_exec.c lg3303.c mt2131.c nxt2k.c sdtemp.c spdmem_i2c.c tvpll.c xc3028.c xc5k.c zl10353.c src/sys/modules [netbsd-7]: Makefile Added Files: src/sys/modules/i2cexec [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by jmcneill in ticket #634): distrib/sets/lists/modules/md.amd64: revision 1.51 distrib/sets/lists/modules/md.evbppc.powerpc: revision 1.5 distrib/sets/lists/modules/md.i386: revision 1.55 distrib/sets/lists/modules/mi: revision 1.71 sys/dev/i2c/au8522.c: revision 1.7 sys/dev/i2c/cx24227.c: revision 1.7 sys/dev/i2c/dbcool.c: revision 1.42 sys/dev/i2c/hytp14.c: revision 1.3 sys/dev/i2c/i2c_exec.c: revision 1.10 sys/dev/i2c/lg3303.c: revision 1.9 sys/dev/i2c/mt2131.c: revision 1.5 sys/dev/i2c/nxt2k.c: revision 1.4 sys/dev/i2c/sdtemp.c: revision 1.24 sys/dev/i2c/spdmem_i2c.c: revision 1.10 sys/dev/i2c/tvpll.c: revision 1.6 sys/dev/i2c/xc3028.c: revision 1.7 sys/dev/i2c/xc5k.c: revision 1.6 sys/dev/i2c/zl10353.c: revision 1.4 sys/modules/Makefile: revision 1.143 sys/modules/i2cexec/Makefile: revision 1.1 i2c devices don't actually have a dependency on "iic" (the bus driver) but on "i2cexec". Create an i2cexec module (i2c_exec.c) to mirror the dependencies in files.i2c and switch device drivers to depend on "i2cexec" module instead. A kernel with a USB stack and no I2C controller / bus attachment would spit out a bunch of "WARNING: module error: can't find builtin dependency `iic'" messages at boot. This change solves that problem. To generate a diff of this commit: cvs rdiff -u -r1.41.2.2 -r1.41.2.3 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.3 -r1.3.4.1 src/distrib/sets/lists/modules/md.evbppc.powerpc cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.69 -r1.69.2.1 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.6 -r1.6.28.1 src/sys/dev/i2c/au8522.c cvs rdiff -u -r1.6 -r1.6.14.1 src/sys/dev/i2c/cx24227.c cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/dev/i2c/dbcool.c cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/dev/i2c/hytp14.c cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/dev/i2c/i2c_exec.c cvs rdiff -u -r1.8 -r1.8.28.1 src/sys/dev/i2c/lg3303.c cvs rdiff -u -r1.4 -r1.4.28.1 src/sys/dev/i2c/mt2131.c src/sys/dev/i2c/xc5k.c cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/dev/i2c/nxt2k.c \ src/sys/dev/i2c/zl10353.c cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/dev/i2c/sdtemp.c cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/dev/i2c/spdmem_i2c.c cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/dev/i2c/tvpll.c cvs rdiff -u -r1.5 -r1.5.28.1 src/sys/dev/i2c/xc3028.c cvs rdiff -u -r1.140.2.1 -r1.140.2.2 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/i2cexec/Makefile 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/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.41.2.2 src/distrib/sets/lists/modules/md.amd64:1.41.2.3 --- src/distrib/sets/lists/modules/md.amd64:1.41.2.2 Sun Jan 11 05:59:16 2015 +++ src/distrib/sets/lists/modules/md.amd64 Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.41.2.2 2015/01/11 05:59:16 snj Exp $ +# $NetBSD: md.amd64,v 1.41.2.3 2015/03/21 17:11:35 snj Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -330,6 +330,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/i915drm/i915drm.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/i915drmkms base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/i915drmkms/i915drmkms.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/i2cexec base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/i2cexec/i2cexec.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/if_axen base-kernel-modules kmod,compatmodules Index: src/distrib/sets/lists/modules/md.evbppc.powerpc diff -u src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3 src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3.4.1 --- src/distrib/sets/lists/modules/md.evbppc.powerpc:1.3 Sun May 18 18:28:48 2014 +++ src/distrib/sets/lists/modules/md.evbppc.powerpc Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc.powerpc,v 1.3 2014/05/18 18:28:48 jakllsch Exp $ +# $NetBSD: md.evbppc.powerpc,v 1.3.4.1 2015/03/21 17:11:35 snj Exp $ ./stand/powerpc-4xx base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod,compatmodules @@ -92,6 +92,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/hythygtemp base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/i2cexec base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/i2cexec/i2cexec.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/if_axen base-kernel-modules kmod,compatmodules @@ -327,6 +329,8 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/hythygtemp base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/i2cexec base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/i2cexec/i2cexec.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/if_axen base-kernel-modules kmod,compatmodules Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.46.2.1 src/distrib/sets/lists/modules/md.i386:1.46.2.2 --- src/distrib/sets/lists/modules/md.i386:1.46.2.1 Sun Jan 11 05:59:16 2015 +++ src/distrib/sets/lists/modules/md.i386 Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.46.2.1 2015/01/11 05:59:16 snj Exp $ +# $NetBSD: md.i386,v 1.46.2.2 2015/03/21 17:11:35 snj Exp $ # # NOTE that there are three sets of files here: # @MODULEDIR@, i386-xen, and i386pae-xen @@ -350,6 +350,8 @@ ./stand/i386-xen/@OSRELEASE@/modules/hpqlb/hpqlb.kmod base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/hythygtemp base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules +./stand/i386-xen/@OSRELEASE@/modules/i2cexec base-kernel-modules kmod,compatmodules +./stand/i386-xen/@OSRELEASE@/modules/i2cexec/i2cexec.kmod base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/i915drm base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/i915drm/i915drm.kmod base-kernel-modules kmod,compatmodules ./stand/i386-xen/@OSRELEASE@/modules/i915drmkms base-kernel-modules kmod,compatmodules @@ -737,6 +739,8 @@ ./stand/i386pae-xen/@OSRELEASE@/modules/hpqlb/hpqlb.kmod base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/hythygtemp base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/hythygtemp/hythygtemp.kmod base-kernel-modules kmod,compatmodules +./stand/i386pae-xen/@OSRELEASE@/modules/i2cexec base-kernel-modules kmod,compatmodules +./stand/i386pae-xen/@OSRELEASE@/modules/i2cexec/i2cexec.kmod base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/i915drm base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/i915drm/i915drm.kmod base-kernel-modules kmod,compatmodules ./stand/i386pae-xen/@OSRELEASE@/modules/i915drmkms base-kernel-modules kmod,compatmodules Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.69 src/distrib/sets/lists/modules/mi:1.69.2.1 --- src/distrib/sets/lists/modules/mi:1.69 Sun May 18 18:28:49 2014 +++ src/distrib/sets/lists/modules/mi Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.69 2014/05/18 18:28:49 jakllsch Exp $ +# $NetBSD: mi,v 1.69.2.1 2015/03/21 17:11:35 snj Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -94,6 +94,8 @@ ./@MODULEDIR@/hfs/hfs.kmod base-kernel-modules kmod ./@MODULEDIR@/hythygtemp base-kernel-modules kmod ./@MODULEDIR@/hythygtemp/hythygtemp.kmod base-kernel-modules kmod +./@MODULEDIR@/i2cexec base-kernel-modules kmod +./@MODULEDIR@/i2cexec/i2cexec.kmod base-kernel-modules kmod ./@MODULEDIR@/if_axe base-kernel-modules kmod ./@MODULEDIR@/if_axe/if_axe.kmod base-kernel-modules kmod ./@MODULEDIR@/if_axen base-kernel-modules kmod Index: src/sys/dev/i2c/au8522.c diff -u src/sys/dev/i2c/au8522.c:1.6 src/sys/dev/i2c/au8522.c:1.6.28.1 --- src/sys/dev/i2c/au8522.c:1.6 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/au8522.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: au8522.c,v 1.6 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: au8522.c,v 1.6.28.1 2015/03/21 17:11:35 snj Exp $ */ /*- * Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: au8522.c,v 1.6 2011/10/02 19:03:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: au8522.c,v 1.6.28.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -419,7 +419,7 @@ au8522_get_snr(struct au8522 *au) return 0; } -MODULE(MODULE_CLASS_DRIVER, au8522, "iic"); +MODULE(MODULE_CLASS_DRIVER, au8522, "i2cexec"); static int au8522_modcmd(modcmd_t cmd, void *opaque) Index: src/sys/dev/i2c/cx24227.c diff -u src/sys/dev/i2c/cx24227.c:1.6 src/sys/dev/i2c/cx24227.c:1.6.14.1 --- src/sys/dev/i2c/cx24227.c:1.6 Thu Mar 15 16:20:36 2012 +++ src/sys/dev/i2c/cx24227.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cx24227.c,v 1.6 2012/03/15 16:20:36 bouyer Exp $ */ +/* $NetBSD: cx24227.c,v 1.6.14.1 2015/03/21 17:11:35 snj Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cx24227.c,v 1.6 2012/03/15 16:20:36 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cx24227.c,v 1.6.14.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -328,7 +328,7 @@ cx24227_init(struct cx24227 *sc) return 0; } -MODULE(MODULE_CLASS_DRIVER, cx24227, "iic"); +MODULE(MODULE_CLASS_DRIVER, cx24227, "i2cexec"); static int cx24227_modcmd(modcmd_t cmd, void *priv) Index: src/sys/dev/i2c/dbcool.c diff -u src/sys/dev/i2c/dbcool.c:1.41 src/sys/dev/i2c/dbcool.c:1.41.2.1 --- src/sys/dev/i2c/dbcool.c:1.41 Sun Aug 10 16:44:35 2014 +++ src/sys/dev/i2c/dbcool.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dbcool.c,v 1.41 2014/08/10 16:44:35 tls Exp $ */ +/* $NetBSD: dbcool.c,v 1.41.2.1 2015/03/21 17:11:35 snj Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.41 2014/08/10 16:44:35 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.41.2.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2161,7 +2161,7 @@ dbcool_set_fan_limits(struct dbcool_soft } } -MODULE(MODULE_CLASS_DRIVER, dbcool, "iic"); +MODULE(MODULE_CLASS_DRIVER, dbcool, "i2cexec"); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/i2c/hytp14.c diff -u src/sys/dev/i2c/hytp14.c:1.2 src/sys/dev/i2c/hytp14.c:1.2.4.1 --- src/sys/dev/i2c/hytp14.c:1.2 Sun Jun 29 09:52:43 2014 +++ src/sys/dev/i2c/hytp14.c Sat Mar 21 17:11:35 2015 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.2 2014/06/29 09:52:43 kardel Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.2.4.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -283,7 +283,7 @@ hytp14_refresh(struct sysmon_envsys *sme } -MODULE(MODULE_CLASS_DRIVER, hythygtemp, "iic"); +MODULE(MODULE_CLASS_DRIVER, hythygtemp, "i2cexec"); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/i2c/i2c_exec.c diff -u src/sys/dev/i2c/i2c_exec.c:1.9 src/sys/dev/i2c/i2c_exec.c:1.9.4.1 --- src/sys/dev/i2c/i2c_exec.c:1.9 Thu Sep 12 20:30:58 2013 +++ src/sys/dev/i2c/i2c_exec.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: i2c_exec.c,v 1.9 2013/09/12 20:30:58 martin Exp $ */ +/* $NetBSD: i2c_exec.c,v 1.9.4.1 2015/03/21 17:11:35 snj Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,11 +36,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i2c_exec.c,v 1.9 2013/09/12 20:30:58 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i2c_exec.c,v 1.9.4.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> +#include <sys/module.h> #include <sys/event.h> #include <sys/conf.h> @@ -50,6 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: i2c_exec.c,v static uint8_t iic_smbus_crc8(uint16_t); static uint8_t iic_smbus_pec(int, uint8_t *, uint8_t *); +static int i2cexec_modcmd(modcmd_t, void *); + /* * iic_exec: * @@ -342,3 +345,18 @@ iic_smbus_pec(int count, uint8_t *s, uin return crc; } + +MODULE(MODULE_CLASS_MISC, i2cexec, NULL); + +static int +i2cexec_modcmd(modcmd_t cmd, void *opaque) +{ + switch (cmd) { + case MODULE_CMD_INIT: + case MODULE_CMD_FINI: + return 0; + break; + default: + return ENOTTY; + } +} Index: src/sys/dev/i2c/lg3303.c diff -u src/sys/dev/i2c/lg3303.c:1.8 src/sys/dev/i2c/lg3303.c:1.8.28.1 --- src/sys/dev/i2c/lg3303.c:1.8 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/lg3303.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: lg3303.c,v 1.8 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: lg3303.c,v 1.8.28.1 2015/03/21 17:11:35 snj Exp $ */ /*- * Copyright 2007 Jason Harmening @@ -28,7 +28,7 @@ */ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: lg3303.c,v 1.8 2011/10/02 19:03:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lg3303.c,v 1.8.28.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/types.h> #include <sys/kmem.h> @@ -351,7 +351,7 @@ lg3303_get_ucblocks(struct lg3303 *lg) return (buffer[0] << 8) | buffer[1]; } -MODULE(MODULE_CLASS_DRIVER, lg3303, "iic,dtv_math"); +MODULE(MODULE_CLASS_DRIVER, lg3303, "i2cexec,dtv_math"); static int lg3303_modcmd(modcmd_t cmd, void *opaque) Index: src/sys/dev/i2c/mt2131.c diff -u src/sys/dev/i2c/mt2131.c:1.4 src/sys/dev/i2c/mt2131.c:1.4.28.1 --- src/sys/dev/i2c/mt2131.c:1.4 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/mt2131.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mt2131.c,v 1.4 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: mt2131.c,v 1.4.28.1 2015/03/21 17:11:35 snj Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mt2131.c,v 1.4 2011/10/02 19:03:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mt2131.c,v 1.4.28.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -255,7 +255,7 @@ mt2131_write(struct mt2131_softc *sc, ui return ret; } -MODULE(MODULE_CLASS_DRIVER, mt2131, "iic"); +MODULE(MODULE_CLASS_DRIVER, mt2131, "i2cexec"); static int mt2131_modcmd(modcmd_t cmd, void *priv) Index: src/sys/dev/i2c/xc5k.c diff -u src/sys/dev/i2c/xc5k.c:1.4 src/sys/dev/i2c/xc5k.c:1.4.28.1 --- src/sys/dev/i2c/xc5k.c:1.4 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/xc5k.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xc5k.c,v 1.4 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: xc5k.c,v 1.4.28.1 2015/03/21 17:11:35 snj Exp $ */ /*- * Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xc5k.c,v 1.4 2011/10/02 19:03:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xc5k.c,v 1.4.28.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -434,7 +434,7 @@ xc5k_get_status(struct xc5k *xc) return festatus; } -MODULE(MODULE_CLASS_DRIVER, xc5k, "iic"); +MODULE(MODULE_CLASS_DRIVER, xc5k, "i2cexec"); static int xc5k_modcmd(modcmd_t cmd, void *opaque) Index: src/sys/dev/i2c/nxt2k.c diff -u src/sys/dev/i2c/nxt2k.c:1.3 src/sys/dev/i2c/nxt2k.c:1.3.28.1 --- src/sys/dev/i2c/nxt2k.c:1.3 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/nxt2k.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nxt2k.c,v 1.3 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: nxt2k.c,v 1.3.28.1 2015/03/21 17:11:35 snj Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nxt2k.c,v 1.3 2011/10/02 19:03:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nxt2k.c,v 1.3.28.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -830,7 +830,7 @@ nxt2k_set_modulation(struct nxt2k *nxt, return nxt2k_fe_set_frontend(nxt, modulation); } -MODULE(MODULE_CLASS_DRIVER, nxt2k, "iic"); +MODULE(MODULE_CLASS_DRIVER, nxt2k, "i2cexec"); static int nxt2k_modcmd(modcmd_t cmd, void *opaque) Index: src/sys/dev/i2c/zl10353.c diff -u src/sys/dev/i2c/zl10353.c:1.3 src/sys/dev/i2c/zl10353.c:1.3.28.1 --- src/sys/dev/i2c/zl10353.c:1.3 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/zl10353.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: zl10353.c,v 1.3 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: zl10353.c,v 1.3.28.1 2015/03/21 17:11:35 snj Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zl10353.c,v 1.3 2011/10/02 19:03:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zl10353.c,v 1.3.28.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/kmem.h> @@ -650,7 +650,7 @@ zl10353_get_snr(struct zl10353 *zl) return (val << 8) | val; } -MODULE(MODULE_CLASS_DRIVER, zl10353, "iic"); +MODULE(MODULE_CLASS_DRIVER, zl10353, "i2cexec"); static int zl10353_modcmd(modcmd_t cmd, void *aux) Index: src/sys/dev/i2c/sdtemp.c diff -u src/sys/dev/i2c/sdtemp.c:1.23 src/sys/dev/i2c/sdtemp.c:1.23.4.1 --- src/sys/dev/i2c/sdtemp.c:1.23 Thu Jan 9 16:51:05 2014 +++ src/sys/dev/i2c/sdtemp.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sdtemp.c,v 1.23 2014/01/09 16:51:05 mlelstv Exp $ */ +/* $NetBSD: sdtemp.c,v 1.23.4.1 2015/03/21 17:11:35 snj Exp $ */ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23 2014/01/09 16:51:05 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.23.4.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -553,7 +553,7 @@ sdtemp_pmf_resume(device_t dev, const pm return (error == 0); } -MODULE(MODULE_CLASS_DRIVER, sdtemp, "iic"); +MODULE(MODULE_CLASS_DRIVER, sdtemp, "i2cexec"); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/i2c/spdmem_i2c.c diff -u src/sys/dev/i2c/spdmem_i2c.c:1.9 src/sys/dev/i2c/spdmem_i2c.c:1.9.2.1 --- src/sys/dev/i2c/spdmem_i2c.c:1.9 Mon Apr 14 14:30:24 2014 +++ src/sys/dev/i2c/spdmem_i2c.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: spdmem_i2c.c,v 1.9 2014/04/14 14:30:24 pooka Exp $ */ +/* $NetBSD: spdmem_i2c.c,v 1.9.2.1 2015/03/21 17:11:35 snj Exp $ */ /* * Copyright (c) 2007 Nicolas Joly @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.9 2014/04/14 14:30:24 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.9.2.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -133,7 +133,7 @@ spdmem_i2c_read(struct spdmem_softc *sof return val; } -MODULE(MODULE_CLASS_DRIVER, spdmem, "iic"); +MODULE(MODULE_CLASS_DRIVER, spdmem, "i2cexec"); #ifdef _MODULE #include "ioconf.c" Index: src/sys/dev/i2c/tvpll.c diff -u src/sys/dev/i2c/tvpll.c:1.5 src/sys/dev/i2c/tvpll.c:1.5.4.1 --- src/sys/dev/i2c/tvpll.c:1.5 Thu Oct 17 21:18:43 2013 +++ src/sys/dev/i2c/tvpll.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tvpll.c,v 1.5 2013/10/17 21:18:43 christos Exp $ */ +/* $NetBSD: tvpll.c,v 1.5.4.1 2015/03/21 17:11:35 snj Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tvpll.c,v 1.5 2013/10/17 21:18:43 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tvpll.c,v 1.5.4.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -153,7 +153,7 @@ tvpll_tune_dtv(struct tvpll *tvpll, return rv; } -MODULE(MODULE_CLASS_DRIVER, tvpll, "iic"); +MODULE(MODULE_CLASS_DRIVER, tvpll, "i2cexec"); static int tvpll_modcmd(modcmd_t cmd, void *opaque) Index: src/sys/dev/i2c/xc3028.c diff -u src/sys/dev/i2c/xc3028.c:1.5 src/sys/dev/i2c/xc3028.c:1.5.28.1 --- src/sys/dev/i2c/xc3028.c:1.5 Sun Oct 2 19:03:56 2011 +++ src/sys/dev/i2c/xc3028.c Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xc3028.c,v 1.5 2011/10/02 19:03:56 jmcneill Exp $ */ +/* $NetBSD: xc3028.c,v 1.5.28.1 2015/03/21 17:11:35 snj Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xc3028.c,v 1.5 2011/10/02 19:03:56 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xc3028.c,v 1.5.28.1 2015/03/21 17:11:35 snj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -564,7 +564,7 @@ xc3028_tune_dtv(struct xc3028 *xc, const return 0; } -MODULE(MODULE_CLASS_DRIVER, xc3028, "iic"); +MODULE(MODULE_CLASS_DRIVER, xc3028, "i2cexec"); static int xc3028_modcmd(modcmd_t cmd, void *opaque) Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.140.2.1 src/sys/modules/Makefile:1.140.2.2 --- src/sys/modules/Makefile:1.140.2.1 Sun Jan 11 05:59:18 2015 +++ src/sys/modules/Makefile Sat Mar 21 17:11:35 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.140.2.1 2015/01/11 05:59:18 snj Exp $ +# $NetBSD: Makefile,v 1.140.2.2 2015/03/21 17:11:35 snj Exp $ .include <bsd.own.mk> @@ -40,6 +40,7 @@ SUBDIR+= gpioow SUBDIR+= gpiosim SUBDIR+= hfs SUBDIR+= hythygtemp +SUBDIR+= i2cexec SUBDIR+= if_axe SUBDIR+= if_axen SUBDIR+= if_npflog Added files: Index: src/sys/modules/i2cexec/Makefile diff -u /dev/null src/sys/modules/i2cexec/Makefile:1.1.2.2 --- /dev/null Sat Mar 21 17:11:35 2015 +++ src/sys/modules/i2cexec/Makefile Sat Mar 21 17:11:35 2015 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.1.2.2 2015/03/21 17:11:35 snj Exp $ + +.include "../Makefile.inc" + +.PATH: ${S}/dev/i2c + +KMOD= i2cexec +SRCS= i2c_exec.c + +.include <bsd.kmodule.mk>