Module Name: src
Committed By: thorpej
Date: Wed Jan 1 18:08:11 UTC 2020
Modified Files:
src/sys/dev: clock_subr.h
src/sys/kern: kern_todr.c
Log Message:
todr_gettime() and todr_settime() are not referenced outside of kern_todr.c,
so make them private to that file.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/clock_subr.h
cvs rdiff -u -r1.41 -r1.42 src/sys/kern/kern_todr.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/dev/clock_subr.h
diff -u src/sys/dev/clock_subr.h:1.26 src/sys/dev/clock_subr.h:1.27
--- src/sys/dev/clock_subr.h:1.26 Thu Apr 19 21:50:08 2018
+++ src/sys/dev/clock_subr.h Wed Jan 1 18:08:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_subr.h,v 1.26 2018/04/19 21:50:08 christos Exp $ */
+/* $NetBSD: clock_subr.h,v 1.27 2020/01/01 18:08:11 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -97,12 +97,6 @@ typedef struct todr_chip_handle *todr_ch
((*(ct)->todr_setwen)(ct, v))
/*
- * Probably these should evolve into internal routines in kern_todr.c.
- */
-extern int todr_gettime(todr_chip_handle_t, struct timeval *);
-extern int todr_settime(todr_chip_handle_t, struct timeval *);
-
-/*
* Machine-dependent function that machine-independent RTC drivers can
* use to register their todr_chip_handle_t with inittodr()/resettodr().
*/
Index: src/sys/kern/kern_todr.c
diff -u src/sys/kern/kern_todr.c:1.41 src/sys/kern/kern_todr.c:1.42
--- src/sys/kern/kern_todr.c:1.41 Wed Jan 1 17:28:17 2020
+++ src/sys/kern/kern_todr.c Wed Jan 1 18:08:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_todr.c,v 1.41 2020/01/01 17:28:17 thorpej Exp $ */
+/* $NetBSD: kern_todr.c,v 1.42 2020/01/01 18:08:11 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,7 +41,7 @@
#include "opt_todr.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_todr.c,v 1.41 2020/01/01 17:28:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_todr.c,v 1.42 2020/01/01 18:08:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -53,6 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: kern_todr.c,
#include <dev/clock_subr.h> /* hmm.. this should probably move to sys */
+static int todr_gettime(todr_chip_handle_t, struct timeval *);
+static int todr_settime(todr_chip_handle_t, struct timeval *);
+
static todr_chip_handle_t todr_handle = NULL;
/*
@@ -235,8 +238,7 @@ todr_debug(const char *prefix, int rv, s
#define todr_debug(prefix, rv, dt, tvp)
#endif /* TODR_DEBUG */
-
-int
+static int
todr_gettime(todr_chip_handle_t tch, struct timeval *tvp)
{
struct clock_ymdhms dt;
@@ -285,7 +287,7 @@ todr_gettime(todr_chip_handle_t tch, str
return ENXIO;
}
-int
+static int
todr_settime(todr_chip_handle_t tch, struct timeval *tvp)
{
struct clock_ymdhms dt;
