Module Name: src
Committed By: rin
Date: Thu Aug 22 12:47:57 UTC 2019
Modified Files:
src/sys/arch/mac68k/mac68k: clock.c
Log Message:
Adjust GMT bias automatically by using data obtained from Mac OS,
unless RTC_OFFSET is set explicitly.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mac68k/mac68k/clock.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/mac68k/mac68k/clock.c
diff -u src/sys/arch/mac68k/mac68k/clock.c:1.49 src/sys/arch/mac68k/mac68k/clock.c:1.50
--- src/sys/arch/mac68k/mac68k/clock.c:1.49 Tue Feb 8 20:20:18 2011
+++ src/sys/arch/mac68k/mac68k/clock.c Thu Aug 22 12:47:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.49 2011/02/08 20:20:18 rmind Exp $ */
+/* $NetBSD: clock.c,v 1.50 2019/08/22 12:47:57 rin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -75,7 +75,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.49 2011/02/08 20:20:18 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.50 2019/08/22 12:47:57 rin Exp $");
+
+#include "opt_rtc_offset.h"
#include <sys/param.h>
#include <sys/device.h>
@@ -391,6 +393,12 @@ mac68k_gettime(todr_chip_handle_t tch, s
mac68k_trust_pram = 0;
}
tvp->tv_sec = timbuf;
+#if !defined(RTC_OFFSET) || RTC_OFFSET == 0
+ /*
+ * Adjust GTM bias unless RTC_OFFSET is set explicitly.
+ */
+ tvp->tv_sec -= macos_gmtbias * 60;
+#endif
tvp->tv_usec = 0;
return 0;
}
