Module Name: src Committed By: rin Date: Fri May 29 12:30:41 UTC 2020
Modified Files: src/sys/arch/arm/at91: at91tctmr.c src/sys/arch/arm/ep93xx: epclk.c src/sys/arch/arm/imx: imxclock.c src/sys/arch/arm/iomd: iomd_clock.c src/sys/arch/arm/ixp12x0: ixp12x0_clk.c src/sys/arch/arm/marvell: mvsoctmr.c src/sys/arch/arm/mpcore: mpcore_clock.c src/sys/arch/arm/omap: omap_mputmr.c src/sys/arch/arm/s3c2xx0: s3c24x0_clk.c s3c2800_clk.c src/sys/arch/arm/xscale: becc_timer.c ixp425_timer.c src/sys/arch/atari/dev: clock.c src/sys/arch/evbarm/ifpga: ifpga_clock.c src/sys/arch/evbarm/iq80310: iq80310_timer.c src/sys/arch/evbmips/ingenic: clock.c src/sys/arch/evbmips/loongson: loongson_clock.c src/sys/arch/hp300/hp300: clock.c src/sys/arch/ia64/ia64: clock.c src/sys/arch/mips/mips: mips3_clock.c src/sys/arch/powerpc/booke: e500_timer.c src/sys/arch/powerpc/ibm4xx: clock.c src/sys/arch/sgimips/dev: int.c src/sys/arch/sparc64/sparc64: clock.c src/sys/arch/usermode/dev: clock.c src/sys/arch/vax/vax: clock.c src/sys/arch/x86/isa: clock.c src/sys/arch/x86/x86: lapic.c src/sys/dev/acpi: acpi_timer.c src/sys/dev/pci/voyager: pwmclock.c Log Message: For struct timecounter, use C99 initializers. Compile tested. No functional changes intended. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/at91/at91tctmr.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/ep93xx/epclk.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imxclock.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/iomd/iomd_clock.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/ixp12x0/ixp12x0_clk.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/marvell/mvsoctmr.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/mpcore/mpcore_clock.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/omap/omap_mputmr.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/s3c2xx0/s3c2800_clk.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/xscale/becc_timer.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/xscale/ixp425_timer.c cvs rdiff -u -r1.60 -r1.61 src/sys/arch/atari/dev/clock.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/ifpga/ifpga_clock.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/iq80310/iq80310_timer.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/ingenic/clock.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/loongson_clock.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hp300/hp300/clock.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/ia64/clock.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/mips/mips3_clock.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/e500_timer.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/ibm4xx/clock.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sgimips/dev/int.c cvs rdiff -u -r1.122 -r1.123 src/sys/arch/sparc64/sparc64/clock.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/usermode/dev/clock.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/vax/vax/clock.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/isa/clock.c cvs rdiff -u -r1.82 -r1.83 src/sys/arch/x86/x86/lapic.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/acpi_timer.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/voyager/pwmclock.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/arch/arm/at91/at91tctmr.c diff -u src/sys/arch/arm/at91/at91tctmr.c:1.7 src/sys/arch/arm/at91/at91tctmr.c:1.8 --- src/sys/arch/arm/at91/at91tctmr.c:1.7 Mon Nov 12 18:00:36 2012 +++ src/sys/arch/arm/at91/at91tctmr.c Fri May 29 12:30:38 2020 @@ -1,4 +1,4 @@ -/*$NetBSD: at91tctmr.c,v 1.7 2012/11/12 18:00:36 skrll Exp $*/ +/*$NetBSD: at91tctmr.c,v 1.8 2020/05/29 12:30:38 rin Exp $*/ /* * AT91 Timer Counter (TC) based clock functions @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at91tctmr.c,v 1.7 2012/11/12 18:00:36 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91tctmr.c,v 1.8 2020/05/29 12:30:38 rin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -157,14 +157,11 @@ CFATTACH_DECL_NEW(at91tctmr, sizeof(stru static u_int at91tctmr_get_timecount(struct timecounter *); static struct timecounter at91tctmr_timecounter = { - at91tctmr_get_timecount,/* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - COUNTS_PER_SEC, /* frequency */ - "at91tctmr", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = at91tctmr_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_frequency = COUNTS_PER_SEC, + .tc_name = "at91tctmr", + .tc_quality = 100, }; #endif Index: src/sys/arch/arm/ep93xx/epclk.c diff -u src/sys/arch/arm/ep93xx/epclk.c:1.21 src/sys/arch/arm/ep93xx/epclk.c:1.22 --- src/sys/arch/arm/ep93xx/epclk.c:1.21 Thu Mar 6 19:46:27 2014 +++ src/sys/arch/arm/ep93xx/epclk.c Fri May 29 12:30:38 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: epclk.c,v 1.21 2014/03/06 19:46:27 maxv Exp $ */ +/* $NetBSD: epclk.c,v 1.22 2020/05/29 12:30:38 rin Exp $ */ /* * Copyright (c) 2004 Jesse Off @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.21 2014/03/06 19:46:27 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.22 2020/05/29 12:30:38 rin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -85,14 +85,11 @@ struct epclk_softc { }; static struct timecounter epclk_timecounter = { - epclk_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - TIMER_FREQ, /* frequency */ - "epclk", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = epclk_get_timecount, + .tc_counter_mask = ~0u, + .tc_frequency = TIMER_FREQ, + .tc_name = "epclk", + .tc_quality = 100, }; static struct epclk_softc *epclk_sc = NULL; Index: src/sys/arch/arm/imx/imxclock.c diff -u src/sys/arch/arm/imx/imxclock.c:1.8 src/sys/arch/arm/imx/imxclock.c:1.9 --- src/sys/arch/arm/imx/imxclock.c:1.8 Wed Jul 24 12:35:26 2019 +++ src/sys/arch/arm/imx/imxclock.c Fri May 29 12:30:38 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: imxclock.c,v 1.8 2019/07/24 12:35:26 hkenken Exp $ */ +/* $NetBSD: imxclock.c,v 1.9 2020/05/29 12:30:38 rin Exp $ */ /* * Copyright (c) 2009, 2010 Genetec corp. All rights reserved. * Written by Hashimoto Kenichi for Genetec corp. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imxclock.c,v 1.8 2019/07/24 12:35:26 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imxclock.c,v 1.9 2020/05/29 12:30:38 rin Exp $"); #include "opt_imx.h" @@ -59,14 +59,10 @@ static u_int imx_epit_get_timecount(stru static int imxclock_intr(void *); static struct timecounter imx_epit_timecounter = { - imx_epit_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - 0, /* frequency */ - "epit", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = imx_epit_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "epit", + .tc_quality = 100, }; static volatile uint32_t imxclock_base; Index: src/sys/arch/arm/iomd/iomd_clock.c diff -u src/sys/arch/arm/iomd/iomd_clock.c:1.29 src/sys/arch/arm/iomd/iomd_clock.c:1.30 --- src/sys/arch/arm/iomd/iomd_clock.c:1.29 Fri May 18 21:09:50 2012 +++ src/sys/arch/arm/iomd/iomd_clock.c Fri May 29 12:30:38 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: iomd_clock.c,v 1.29 2012/05/18 21:09:50 skrll Exp $ */ +/* $NetBSD: iomd_clock.c,v 1.30 2020/05/29 12:30:38 rin Exp $ */ /* * Copyright (c) 1994-1997 Mark Brinicombe. @@ -47,7 +47,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: iomd_clock.c,v 1.29 2012/05/18 21:09:50 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iomd_clock.c,v 1.30 2020/05/29 12:30:38 rin Exp $"); #include <sys/systm.h> #include <sys/types.h> @@ -94,12 +94,11 @@ static volatile int timer0_ticked; static kmutex_t tmr_lock; static struct timecounter iomd_timecounter = { - iomd_timecounter0_get, - 0, /* No poll_pps */ - ~0, /* 32bit accuracy */ - TIMER_FREQUENCY, - "iomd_timer0", - 100 + .tc_get_timecount = iomd_timecounter0_get, + .tc_counter_mask = ~0, + .tc_frequency = TIMER_FREQUENCY, + .tc_name = "iomd_timer0", + .tc_quality = 100, }; int clockhandler(void *); Index: src/sys/arch/arm/ixp12x0/ixp12x0_clk.c diff -u src/sys/arch/arm/ixp12x0/ixp12x0_clk.c:1.17 src/sys/arch/arm/ixp12x0/ixp12x0_clk.c:1.18 --- src/sys/arch/arm/ixp12x0/ixp12x0_clk.c:1.17 Mon Nov 12 18:00:37 2012 +++ src/sys/arch/arm/ixp12x0/ixp12x0_clk.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp12x0_clk.c,v 1.17 2012/11/12 18:00:37 skrll Exp $ */ +/* $NetBSD: ixp12x0_clk.c,v 1.18 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.17 2012/11/12 18:00:37 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.18 2020/05/29 12:30:39 rin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -123,14 +123,10 @@ static uint32_t ccf_to_coreclock[MAX_CCF static struct ixpclk_softc *ixpclk_sc = NULL; static struct timecounter ixpclk_timecounter = { - ixpclk_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - 0, /* frequency */ - "ixpclk", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = ixpclk_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "ixpclk", + .tc_quality = 100, }; static volatile uint32_t ixpclk_base; Index: src/sys/arch/arm/marvell/mvsoctmr.c diff -u src/sys/arch/arm/marvell/mvsoctmr.c:1.14 src/sys/arch/arm/marvell/mvsoctmr.c:1.15 --- src/sys/arch/arm/marvell/mvsoctmr.c:1.14 Sat Jan 7 15:14:20 2017 +++ src/sys/arch/arm/marvell/mvsoctmr.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoctmr.c,v 1.14 2017/01/07 15:14:20 kiyohara Exp $ */ +/* $NetBSD: mvsoctmr.c,v 1.15 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.14 2017/01/07 15:14:20 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.15 2020/05/29 12:30:39 rin Exp $"); #include "opt_ddb.h" #include "opt_mvsoc.h" @@ -100,14 +100,10 @@ static int mvsoctmr_freq; static struct mvsoctmr_softc *mvsoctmr_sc; static struct timecounter mvsoctmr_timecounter = { - mvsoctmr_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency (set by cpu_initclocks()) */ - "mvsoctmr", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = mvsoctmr_get_timecount, + .tc_counter_mask = ~0u, + .tc_name = "mvsoctmr", + .tc_quality = 100, }; CFATTACH_DECL_NEW(mvsoctmr, sizeof(struct mvsoctmr_softc), Index: src/sys/arch/arm/mpcore/mpcore_clock.c diff -u src/sys/arch/arm/mpcore/mpcore_clock.c:1.2 src/sys/arch/arm/mpcore/mpcore_clock.c:1.3 --- src/sys/arch/arm/mpcore/mpcore_clock.c:1.2 Fri Jul 1 20:30:21 2011 +++ src/sys/arch/arm/mpcore/mpcore_clock.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: mpcore_clock.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */ +/* $NetBSD: mpcore_clock.c,v 1.3 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Genetec corp. All rights reserved. * Written by Hashimoto Kenichi for Genetec corp. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpcore_clock.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpcore_clock.c,v 1.3 2020/05/29 12:30:39 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,14 +60,10 @@ static u_int mpcore_get_timecount(struct static int mpcoreclk_intr(void *); static struct timecounter mpcore_timecounter = { - mpcore_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - 0, /* frequency */ - "cpuclock", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = mpcore_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "cpuclock", + .tc_quality = 100, }; struct mpcoreclk_softc { Index: src/sys/arch/arm/omap/omap_mputmr.c diff -u src/sys/arch/arm/omap/omap_mputmr.c:1.6 src/sys/arch/arm/omap/omap_mputmr.c:1.7 --- src/sys/arch/arm/omap/omap_mputmr.c:1.6 Fri Jul 1 20:30:21 2011 +++ src/sys/arch/arm/omap/omap_mputmr.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: omap_mputmr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $ */ +/* $NetBSD: omap_mputmr.c,v 1.7 2020/05/29 12:30:39 rin Exp $ */ /* * Based on i80321_timer.c and arch/arm/sa11x0/sa11x0_ost.c @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.7 2020/05/29 12:30:39 rin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -313,14 +313,10 @@ mpu_get_timecount(struct timecounter *tc } static struct timecounter mpu_timecounter = { - mpu_get_timecount, - NULL, - 0xffffffff, - 0, - "mpu", - 100, - NULL, - NULL, + .tc_get_timecount = mpu_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "mpu", + .tc_quality = 100, }; void Index: src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.14 src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.15 --- src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.14 Fri Feb 10 09:17:49 2012 +++ src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: s3c24x0_clk.c,v 1.14 2012/02/10 09:17:49 nisimura Exp $ */ +/* $NetBSD: s3c24x0_clk.c,v 1.15 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 2003 Genetec corporation. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.14 2012/02/10 09:17:49 nisimura Exp $"); +__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.15 2020/05/29 12:30:39 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,14 +66,10 @@ static uint32_t timer4_mseccount; static u_int s3c24x0_get_timecount(struct timecounter *); static struct timecounter s3c24x0_timecounter = { - s3c24x0_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - 0, /* frequency */ - "s3c24x0", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = s3c24x0_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "s3c24x0", + .tc_quality = 100, }; static volatile uint32_t s3c24x0_base; Index: src/sys/arch/arm/s3c2xx0/s3c2800_clk.c diff -u src/sys/arch/arm/s3c2xx0/s3c2800_clk.c:1.17 src/sys/arch/arm/s3c2xx0/s3c2800_clk.c:1.18 --- src/sys/arch/arm/s3c2xx0/s3c2800_clk.c:1.17 Tue Feb 7 09:06:05 2012 +++ src/sys/arch/arm/s3c2xx0/s3c2800_clk.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: s3c2800_clk.c,v 1.17 2012/02/07 09:06:05 nisimura Exp $ */ +/* $NetBSD: s3c2800_clk.c,v 1.18 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 2002 Fujitsu Component Limited @@ -34,7 +34,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.c,v 1.17 2012/02/07 09:06:05 nisimura Exp $"); +__KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.c,v 1.18 2020/05/29 12:30:39 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,14 +70,10 @@ static unsigned int timer0_mseccount; static u_int s3c2800_get_timecount(struct timecounter *); static struct timecounter s3c2800_timecounter = { - s3c2800_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - 0, /* frequency */ - "s3c2800", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = s3c2800_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "s3c2800", + .tc_quality = 100, }; static volatile uint32_t s3c2800_base; Index: src/sys/arch/arm/xscale/becc_timer.c diff -u src/sys/arch/arm/xscale/becc_timer.c:1.15 src/sys/arch/arm/xscale/becc_timer.c:1.16 --- src/sys/arch/arm/xscale/becc_timer.c:1.15 Fri Jul 1 20:32:51 2011 +++ src/sys/arch/arm/xscale/becc_timer.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: becc_timer.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $ */ +/* $NetBSD: becc_timer.c,v 1.16 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: becc_timer.c,v 1.15 2011/07/01 20:32:51 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: becc_timer.c,v 1.16 2020/05/29 12:30:39 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,14 +70,11 @@ static void *clock_ih; static u_int becc_get_timecount(struct timecounter *); static struct timecounter becc_timecounter = { - becc_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - COUNTS_PER_SEC, /* frequency */ - "becc", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = becc_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_frequency = COUNTS_PER_SEC, + .tc_name = "becc", + .tc_quality = 100, }; static volatile uint32_t becc_base; Index: src/sys/arch/arm/xscale/ixp425_timer.c diff -u src/sys/arch/arm/xscale/ixp425_timer.c:1.19 src/sys/arch/arm/xscale/ixp425_timer.c:1.20 --- src/sys/arch/arm/xscale/ixp425_timer.c:1.19 Thu Jul 12 10:46:42 2018 +++ src/sys/arch/arm/xscale/ixp425_timer.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_timer.c,v 1.19 2018/07/12 10:46:42 maxv Exp $ */ +/* $NetBSD: ixp425_timer.c,v 1.20 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 2003 @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixp425_timer.c,v 1.19 2018/07/12 10:46:42 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_timer.c,v 1.20 2020/05/29 12:30:39 rin Exp $"); #include "opt_ixp425.h" @@ -79,14 +79,11 @@ struct ixpclk_softc { static struct ixpclk_softc *ixpclk_sc; static struct timecounter ixpclk_timecounter = { - ixpclk_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - COUNTS_PER_SEC, /* frequency */ - "ixpclk", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = ixpclk_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_frequency = COUNTS_PER_SEC, + .tc_name = "ixpclk", + .tc_quality = 100, }; static volatile uint32_t ixpclk_base; Index: src/sys/arch/atari/dev/clock.c diff -u src/sys/arch/atari/dev/clock.c:1.60 src/sys/arch/atari/dev/clock.c:1.61 --- src/sys/arch/atari/dev/clock.c:1.60 Sat Jun 29 16:37:49 2019 +++ src/sys/arch/atari/dev/clock.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.60 2019/06/29 16:37:49 tsutsui Exp $ */ +/* $NetBSD: clock.c,v 1.61 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.60 2019/06/29 16:37:49 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.61 2020/05/29 12:30:39 rin Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -80,14 +80,11 @@ static int atari_rtc_set(todr_chip_handl static u_int clk_getcounter(struct timecounter *); static struct timecounter clk_timecounter = { - clk_getcounter, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - CLOCK_HZ, /* frequency */ - "clock", /* name, overriden later */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = clk_getcounter, + .tc_counter_mask = ~0u, + .tc_frequency = CLOCK_HZ, + .tc_name = "clock", + .tc_quality = 100, }; /* Index: src/sys/arch/evbarm/ifpga/ifpga_clock.c diff -u src/sys/arch/evbarm/ifpga/ifpga_clock.c:1.15 src/sys/arch/evbarm/ifpga/ifpga_clock.c:1.16 --- src/sys/arch/evbarm/ifpga/ifpga_clock.c:1.15 Tue Feb 19 10:57:10 2013 +++ src/sys/arch/evbarm/ifpga/ifpga_clock.c Fri May 29 12:30:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ifpga_clock.c,v 1.15 2013/02/19 10:57:10 skrll Exp $ */ +/* $NetBSD: ifpga_clock.c,v 1.16 2020/05/29 12:30:39 rin Exp $ */ /* * Copyright (c) 2001 ARM Ltd @@ -40,7 +40,7 @@ /* Include header files */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ifpga_clock.c,v 1.15 2013/02/19 10:57:10 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ifpga_clock.c,v 1.16 2020/05/29 12:30:39 rin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -87,14 +87,11 @@ static int statprev; /* previous value static u_int ifpga_get_timecount(struct timecounter *); static struct timecounter ifpga_timecounter = { - ifpga_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - COUNTS_PER_SEC, /* frequency */ - "ifpga", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = ifpga_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_frequency = COUNTS_PER_SEC, + .tc_name = "ifpga", + .tc_quality = 100, }; static volatile uint32_t ifpga_base; Index: src/sys/arch/evbarm/iq80310/iq80310_timer.c diff -u src/sys/arch/evbarm/iq80310/iq80310_timer.c:1.22 src/sys/arch/evbarm/iq80310/iq80310_timer.c:1.23 --- src/sys/arch/evbarm/iq80310/iq80310_timer.c:1.22 Fri Jul 1 20:41:16 2011 +++ src/sys/arch/evbarm/iq80310/iq80310_timer.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: iq80310_timer.c,v 1.22 2011/07/01 20:41:16 dyoung Exp $ */ +/* $NetBSD: iq80310_timer.c,v 1.23 2020/05/29 12:30:40 rin Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iq80310_timer.c,v 1.22 2011/07/01 20:41:16 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iq80310_timer.c,v 1.23 2020/05/29 12:30:40 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -85,14 +85,11 @@ static uint32_t counts_per_hz; static u_int iq80310_get_timecount(struct timecounter *); static struct timecounter iq80310_timecounter = { - iq80310_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - COUNTS_PER_SEC, /* frequency */ - "iq80310", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = iq80310_get_timecount, + .tc_counter_mask = 0xffffffff, + .tc_frequency = COUNTS_PER_SEC, + .tc_name = "iq80310", + .tc_quality = 100, }; static volatile uint32_t iq80310_base; Index: src/sys/arch/evbmips/ingenic/clock.c diff -u src/sys/arch/evbmips/ingenic/clock.c:1.10 src/sys/arch/evbmips/ingenic/clock.c:1.11 --- src/sys/arch/evbmips/ingenic/clock.c:1.10 Sun May 21 06:49:12 2017 +++ src/sys/arch/evbmips/ingenic/clock.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.10 2017/05/21 06:49:12 skrll Exp $ */ +/* $NetBSD: clock.c,v 1.11 2020/05/29 12:30:40 rin Exp $ */ /*- * Copyright (c) 2014 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.10 2017/05/21 06:49:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.11 2020/05/29 12:30:40 rin Exp $"); #include "opt_multiprocessor.h" @@ -60,12 +60,11 @@ cpu_initclocks(void) uint32_t cnt; static struct timecounter tc = { - ingenic_count_read, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 12000000, /* frequency */ - "Ingenic OS timer", /* name */ - 100, /* quality */ + .tc_get_timecount = ingenic_count_read, + .tc_counter_mask = ~0u, + .tc_frequency = 12000000, + .tc_name = "Ingenic OS timer", + .tc_quality = 100, }; curcpu()->ci_cctr_freq = tc.tc_frequency; Index: src/sys/arch/evbmips/loongson/loongson_clock.c diff -u src/sys/arch/evbmips/loongson/loongson_clock.c:1.1 src/sys/arch/evbmips/loongson/loongson_clock.c:1.2 --- src/sys/arch/evbmips/loongson/loongson_clock.c:1.1 Fri Jun 24 21:41:37 2016 +++ src/sys/arch/evbmips/loongson/loongson_clock.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: loongson_clock.c,v 1.1 2016/06/24 21:41:37 macallan Exp $ */ +/* $NetBSD: loongson_clock.c,v 1.2 2020/05/29 12:30:40 rin Exp $ */ /* * Copyright (c) 2011, 2016 Michael Lorenz @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: loongson_clock.c,v 1.1 2016/06/24 21:41:37 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: loongson_clock.c,v 1.2 2020/05/29 12:30:40 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,14 +74,10 @@ void loongson_setstatclockrate(int); void loongson_initclocks(void); static struct timecounter loongson_timecounter = { - get_loongson_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - 0, /* frequency */ - "loongson", /* name */ - 100, /* quality */ - NULL, /* tc_priv */ - NULL /* tc_next */ + .tc_get_timecount = get_loongson_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "loongson", + .tc_quality = 100, }; void @@ -388,4 +384,4 @@ loongson_setstatclockrate(int newhz) __weak_alias(setstatclockrate, loongson_setstatclockrate); __weak_alias(cpu_initclocks, loongson_initclocks); -__weak_alias(delay, loongson_delay); \ No newline at end of file +__weak_alias(delay, loongson_delay); Index: src/sys/arch/hp300/hp300/clock.c diff -u src/sys/arch/hp300/hp300/clock.c:1.40 src/sys/arch/hp300/hp300/clock.c:1.41 --- src/sys/arch/hp300/hp300/clock.c:1.40 Tue Feb 8 20:20:13 2011 +++ src/sys/arch/hp300/hp300/clock.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.40 2011/02/08 20:20:13 rmind Exp $ */ +/* $NetBSD: clock.c,v 1.41 2020/05/29 12:30:40 rin Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.40 2011/02/08 20:20:13 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41 2020/05/29 12:30:40 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -189,12 +189,11 @@ cpu_initclocks(void) volatile struct clkreg *clk; int intvl, statint, profint, minint; static struct timecounter tc = { - mc6840_counter, /* get_timecount */ - NULL, /* no poll_pps */ - ~0, /* counter mask */ - COUNTS_PER_SEC, /* frequency */ - "mc6840", /* name */ - 100 /* quality */ + .tc_get_timecount = mc6840_counter, + .tc_counter_mask = ~0, + .tc_frequency = COUNTS_PER_SEC, + .tc_name = "mc6840", + .tc_quality = 100, }; clkstd[0] = IIOV(0x5F8000); /* XXX grot */ Index: src/sys/arch/ia64/ia64/clock.c diff -u src/sys/arch/ia64/ia64/clock.c:1.6 src/sys/arch/ia64/ia64/clock.c:1.7 --- src/sys/arch/ia64/ia64/clock.c:1.6 Mon Jul 20 04:41:36 2009 +++ src/sys/arch/ia64/ia64/clock.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.6 2009/07/20 04:41:36 kiyohara Exp $ */ +/* $NetBSD: clock.c,v 1.7 2020/05/29 12:30:40 rin Exp $ */ /* * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -78,12 +78,10 @@ cpu_initclocks(void) { #if !defined(MULTIPROCESSOR) static struct timecounter tc = { - (timecounter_get_t *)ia64_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency */ - "ia64_timecounter", /* name */ - 100, /* quality */ + .tc_get_timecount = ia64_get_timecount, + .tc_counter_mask = ~0u, + .tc_name = "ia64_timecounter", + .tc_quality = 100, }; #endif Index: src/sys/arch/mips/mips/mips3_clock.c diff -u src/sys/arch/mips/mips/mips3_clock.c:1.14 src/sys/arch/mips/mips/mips3_clock.c:1.15 --- src/sys/arch/mips/mips/mips3_clock.c:1.14 Sun May 7 05:45:07 2017 +++ src/sys/arch/mips/mips/mips3_clock.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: mips3_clock.c,v 1.14 2017/05/07 05:45:07 skrll Exp $ */ +/* $NetBSD: mips3_clock.c,v 1.15 2020/05/29 12:30:40 rin Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -42,7 +42,7 @@ #include "opt_multiprocessor.h" -__KERNEL_RCSID(0, "$NetBSD: mips3_clock.c,v 1.14 2017/05/07 05:45:07 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mips3_clock.c,v 1.15 2020/05/29 12:30:40 rin Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -109,12 +109,10 @@ mips3_init_tc(void) { #if !defined(MULTIPROCESSOR) static struct timecounter tc = { - (timecounter_get_t *)mips3_cp0_count_read, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency */ - "mips3_cp0_counter", /* name */ - 100, /* quality */ + .tc_get_timecount = (timecounter_get_t *)mips3_cp0_count_read, + .tc_counter_mask = ~0u, + .tc_name = "mips3_cp0_counter", + .tc_quality = 100, }; tc.tc_frequency = curcpu()->ci_cpu_freq; Index: src/sys/arch/powerpc/booke/e500_timer.c diff -u src/sys/arch/powerpc/booke/e500_timer.c:1.6 src/sys/arch/powerpc/booke/e500_timer.c:1.7 --- src/sys/arch/powerpc/booke/e500_timer.c:1.6 Wed Jan 21 06:11:39 2015 +++ src/sys/arch/powerpc/booke/e500_timer.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: e500_timer.c,v 1.6 2015/01/21 06:11:39 nonaka Exp $ */ +/* $NetBSD: e500_timer.c,v 1.7 2020/05/29 12:30:40 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: e500_timer.c,v 1.6 2015/01/21 06:11:39 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: e500_timer.c,v 1.7 2020/05/29 12:30:40 rin Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -60,14 +60,10 @@ static void init_ppcbooke_tc(void); static u_int get_ppcbooke_timecount(struct timecounter *); static struct timecounter ppcbooke_timecounter = { - get_ppcbooke_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency */ - "ppc_timebase", /* name */ - 100, /* quality */ - NULL, /* tc_priv */ - NULL /* tc_next */ + .tc_get_timecount = get_ppcbooke_timecount, + .tc_counter_mask = ~0u, + .tc_name = "ppc_timebase", + .tc_quality = 100, }; static inline void Index: src/sys/arch/powerpc/ibm4xx/clock.c diff -u src/sys/arch/powerpc/ibm4xx/clock.c:1.27 src/sys/arch/powerpc/ibm4xx/clock.c:1.28 --- src/sys/arch/powerpc/ibm4xx/clock.c:1.27 Mon Jan 9 06:25:55 2012 +++ src/sys/arch/powerpc/ibm4xx/clock.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.27 2012/01/09 06:25:55 kiyohara Exp $ */ +/* $NetBSD: clock.c,v 1.28 2020/05/29 12:30:40 rin Exp $ */ /* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */ /* @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.27 2012/01/09 06:25:55 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.28 2020/05/29 12:30:40 rin Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -63,14 +63,10 @@ static void init_ppc4xx_tc(void); static u_int get_ppc4xx_timecount(struct timecounter *); static struct timecounter ppc4xx_timecounter = { - get_ppc4xx_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency */ - "ppc_timebase", /* name */ - 100, /* quality */ - NULL, /* tc_priv */ - NULL /* tc_next */ + .tc_get_timecount = get_ppc4xx_timecount, + .tc_counter_mask = ~0u, + .tc_name = "ppc_timebase", + .tc_quality = 100, }; void decr_intr(struct clockframe *); /* called from trap_subr.S */ Index: src/sys/arch/sgimips/dev/int.c diff -u src/sys/arch/sgimips/dev/int.c:1.30 src/sys/arch/sgimips/dev/int.c:1.31 --- src/sys/arch/sgimips/dev/int.c:1.30 Sun Nov 10 21:16:32 2019 +++ src/sys/arch/sgimips/dev/int.c Fri May 29 12:30:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: int.c,v 1.30 2019/11/10 21:16:32 chs Exp $ */ +/* $NetBSD: int.c,v 1.31 2020/05/29 12:30:40 rin Exp $ */ /* * Copyright (c) 2009 Stephen M. Rumble @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.30 2019/11/10 21:16:32 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.31 2020/05/29 12:30:40 rin Exp $"); #define __INTR_PRIVATE #include "opt_cputype.h" @@ -80,14 +80,10 @@ static u_long int2_cal_timer(void); #endif static struct timecounter int_8254_timecounter = { - int_8254_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency; set in int_8254_cal */ - "int i8254", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = int_8254_get_timecount, + .tc_counter_mask = ~0u, + .tc_name = "int i8254", + .tc_quality = 100, }; static u_long int_8254_tc_count; Index: src/sys/arch/sparc64/sparc64/clock.c diff -u src/sys/arch/sparc64/sparc64/clock.c:1.122 src/sys/arch/sparc64/sparc64/clock.c:1.123 --- src/sys/arch/sparc64/sparc64/clock.c:1.122 Sun Dec 1 15:34:46 2019 +++ src/sys/arch/sparc64/sparc64/clock.c Fri May 29 12:30:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.122 2019/12/01 15:34:46 ad Exp $ */ +/* $NetBSD: clock.c,v 1.123 2020/05/29 12:30:41 rin Exp $ */ /* * Copyright (c) 1992, 1993 @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.122 2019/12/01 15:34:46 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.123 2020/05/29 12:30:41 rin Exp $"); #include "opt_multiprocessor.h" @@ -155,40 +155,28 @@ static u_int stick2e_get_timecount(struc */ static struct timecounter tick_timecounter = { - tick_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency - set at initialisation */ - "tick-counter", /* name */ - 100, /* quality */ - 0, /* private reference - UNUSED */ - NULL /* next timecounter */ + .tc_get_timecount = tick_get_timecount, + .tc_counter_mask = ~0u, + .tc_name = "tick-counter", + .tc_quality = 100, }; /* US-III %stick */ static struct timecounter stick_timecounter = { - stick_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency - set at initialisation */ - "stick-counter", /* name */ - 200, /* quality */ - 0, /* private reference - UNUSED */ - NULL /* next timecounter */ + .tc_get_timecount = stick_get_timecount, + .tc_counter_mask = ~0u, + .tc_name = "stick-counter", + .tc_quality = 200, }; /* US-IIe STICK counter */ #if NPSYCHO > 0 static struct timecounter stick2e_timecounter = { - stick2e_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 0, /* frequency - set at initialisation */ - "stick-counter", /* name */ - 200, /* quality */ - 0, /* private reference - UNUSED */ - NULL /* next timecounter */ + .tc_get_timecount = stick2e_get_timecount, + .tc_counter_mask = ~0u, + .tc_name = "stick-counter", + .tc_quality = 200, }; #endif Index: src/sys/arch/usermode/dev/clock.c diff -u src/sys/arch/usermode/dev/clock.c:1.26 src/sys/arch/usermode/dev/clock.c:1.27 --- src/sys/arch/usermode/dev/clock.c:1.26 Sat Jan 21 22:09:56 2012 +++ src/sys/arch/usermode/dev/clock.c Fri May 29 12:30:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.26 2012/01/21 22:09:56 reinoud Exp $ */ +/* $NetBSD: clock.c,v 1.27 2020/05/29 12:30:41 rin Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_hz.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.26 2012/01/21 22:09:56 reinoud Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.27 2020/05/29 12:30:41 rin Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -64,14 +64,11 @@ struct clock_softc { }; static struct timecounter clock_timecounter = { - clock_getcounter, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 1000000000ULL, /* frequency */ - "CLOCK_MONOTONIC", /* name */ - -100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = clock_getcounter, + .tc_counter_mask = ~0u, + .tc_frequency = 1000000000ULL, + .tc_name = "CLOCK_MONOTONIC", + .tc_quality = -100, }; timer_t clock_timerid; Index: src/sys/arch/vax/vax/clock.c diff -u src/sys/arch/vax/vax/clock.c:1.58 src/sys/arch/vax/vax/clock.c:1.59 --- src/sys/arch/vax/vax/clock.c:1.58 Mon May 22 16:39:40 2017 +++ src/sys/arch/vax/vax/clock.c Fri May 29 12:30:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.58 2017/05/22 16:39:40 ragge Exp $ */ +/* $NetBSD: clock.c,v 1.59 2020/05/29 12:30:41 rin Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.58 2017/05/22 16:39:40 ragge Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.59 2020/05/29 12:30:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,26 +110,20 @@ vax_mfpr_get_counter(struct timecounter #if VAX46 || VAXANY static struct timecounter vax_diag_tc = { - vax_diag_get_counter, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 1000000, /* frequency */ - "diagtimer", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = vax_diag_get_counter, + .tc_counter_mask = ~0u, + .tc_frequency = 1000000, + .tc_name = "diagtimer", + .tc_quality = 100, }; #endif static struct timecounter vax_mfpr_tc = { - vax_mfpr_get_counter, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - 1000000, /* frequency */ - "mfpr", /* name */ - 100, /* quality */ - NULL, /* prev */ - NULL, /* next */ + .tc_get_timecount = vax_mfpr_get_counter, + .tc_counter_mask = ~0u, + .tc_frequency = 1000000, + .tc_name = "mfpr", + .tc_quality = 100, }; /* Index: src/sys/arch/x86/isa/clock.c diff -u src/sys/arch/x86/isa/clock.c:1.38 src/sys/arch/x86/isa/clock.c:1.39 --- src/sys/arch/x86/isa/clock.c:1.38 Sat May 2 16:44:35 2020 +++ src/sys/arch/x86/isa/clock.c Fri May 29 12:30:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.38 2020/05/02 16:44:35 bouyer Exp $ */ +/* $NetBSD: clock.c,v 1.39 2020/05/29 12:30:41 rin Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -121,7 +121,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.38 2020/05/02 16:44:35 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.39 2020/05/29 12:30:41 rin Exp $"); /* #define CLOCKDEBUG */ /* #define CLOCK_PARANOIA */ @@ -204,14 +204,11 @@ static __cpu_simple_lock_t tmr_lock = __ u_int i8254_get_timecount(struct timecounter *); static struct timecounter i8254_timecounter = { - i8254_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - ~0u, /* counter_mask */ - TIMER_FREQ, /* frequency */ - "i8254", /* name */ - 100, /* quality */ - NULL, /* private data */ - NULL, /* next */ + .tc_get_timecount = i8254_get_timecount, + .tc_counter_mask = ~0u, + .tc_frequency = TIMER_FREQ, + .tc_name = "i8254", + .tc_quality = 100, }; u_long x86_rtclock_tval; /* i8254 reload value for countdown */ Index: src/sys/arch/x86/x86/lapic.c diff -u src/sys/arch/x86/x86/lapic.c:1.82 src/sys/arch/x86/x86/lapic.c:1.83 --- src/sys/arch/x86/x86/lapic.c:1.82 Thu May 21 22:01:42 2020 +++ src/sys/arch/x86/x86/lapic.c Fri May 29 12:30:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: lapic.c,v 1.82 2020/05/21 22:01:42 ad Exp $ */ +/* $NetBSD: lapic.c,v 1.83 2020/05/29 12:30:41 rin Exp $ */ /*- * Copyright (c) 2000, 2008, 2020 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.82 2020/05/21 22:01:42 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.83 2020/05/29 12:30:41 rin Exp $"); #include "acpica.h" #include "ioapic.h" @@ -553,18 +553,15 @@ lapic_get_timecount(struct timecounter * } static struct timecounter lapic_timecounter = { - lapic_get_timecount, - NULL, - ~0u, - 0, - "lapic", + .tc_get_timecount = lapic_get_timecount, + .tc_counter_mask = ~0u, + .tc_name = "lapic", + .tc_quality = #ifndef MULTIPROCESSOR - 2100, + 2100, #else - -100, /* per CPU state */ + -100, /* per CPU state */ #endif - NULL, - NULL, }; extern u_int i8254_get_timecount(struct timecounter *); Index: src/sys/dev/acpi/acpi_timer.c diff -u src/sys/dev/acpi/acpi_timer.c:1.25 src/sys/dev/acpi/acpi_timer.c:1.26 --- src/sys/dev/acpi/acpi_timer.c:1.25 Tue Oct 16 10:25:33 2018 +++ src/sys/dev/acpi/acpi_timer.c Fri May 29 12:30:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_timer.c,v 1.25 2018/10/16 10:25:33 jmcneill Exp $ */ +/* $NetBSD: acpi_timer.c,v 1.26 2020/05/29 12:30:41 rin Exp $ */ /*- * Copyright (c) 2006 Matthias Drochner <droch...@netbsd.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.25 2018/10/16 10:25:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.26 2020/05/29 12:30:41 rin Exp $"); #include <sys/types.h> #include <sys/systm.h> @@ -43,14 +43,11 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_timer.c static int acpitimer_test(void); static struct timecounter acpi_timecounter = { - acpitimer_read_safe, - 0, - 0x00ffffff, - ACPI_PM_TIMER_FREQUENCY, - "ACPI-Safe", - 900, - NULL, - NULL, + .tc_get_timecount = acpitimer_read_safe, + .tc_counter_mask = 0x00ffffff, + .tc_frequency = ACPI_PM_TIMER_FREQUENCY, + .tc_name = "ACPI-Safe", + .tc_quality = 900, }; static bool Index: src/sys/dev/pci/voyager/pwmclock.c diff -u src/sys/dev/pci/voyager/pwmclock.c:1.11 src/sys/dev/pci/voyager/pwmclock.c:1.12 --- src/sys/dev/pci/voyager/pwmclock.c:1.11 Fri Aug 26 15:45:48 2016 +++ src/sys/dev/pci/voyager/pwmclock.c Fri May 29 12:30:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pwmclock.c,v 1.11 2016/08/26 15:45:48 skrll Exp $ */ +/* $NetBSD: pwmclock.c,v 1.12 2020/05/29 12:30:41 rin Exp $ */ /* * Copyright (c) 2011 Michael Lorenz @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.11 2016/08/26 15:45:48 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.12 2020/05/29 12:30:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,14 +92,10 @@ static int pwmclock_cpuspeed_available( static void pwmclock_shutdown(void *); static struct timecounter pwmclock_timecounter = { - get_pwmclock_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffffff, /* counter_mask */ - 0, /* frequency */ - "pwm", /* name */ - 100, /* quality */ - NULL, /* tc_priv */ - NULL /* tc_next */ + .tc_get_timecount = get_pwmclock_timecount, + .tc_counter_mask = 0xffffffff, + .tc_name = "pwm", + .tc_quality = 100, }; static int