Module Name: src Committed By: jakllsch Date: Fri Dec 30 21:40:20 UTC 2022
Modified Files: src/sys/arch/x86/isa: rtc.c Log Message: Honor ACPI FADT Century byte; should fix many "unknown CMOS layout" messages. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/isa/rtc.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/x86/isa/rtc.c diff -u src/sys/arch/x86/isa/rtc.c:1.1 src/sys/arch/x86/isa/rtc.c:1.2 --- src/sys/arch/x86/isa/rtc.c:1.1 Tue Jun 16 21:05:34 2009 +++ src/sys/arch/x86/isa/rtc.c Fri Dec 30 21:40:20 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.1 2009/06/16 21:05:34 bouyer Exp $ */ +/* $NetBSD: rtc.c,v 1.2 2022/12/30 21:40:20 jakllsch 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: rtc.c,v 1.1 2009/06/16 21:05:34 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.2 2022/12/30 21:40:20 jakllsch Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -145,6 +145,11 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.1 #include <machine/mca_machdep.h> /* for MCA_system */ #endif +#include "acpica.h" +#if NACPICA > 0 +#include <dev/acpi/acpivar.h> +#endif + static void rtcinit(void); static int rtcget(mc_todregs *); static void rtcput(mc_todregs *); @@ -269,6 +274,12 @@ clock_expandyear(int clockyear) return (clockyear); s = splclock(); +#if NACPICA > 0 + if (acpi_active) + cmoscentury = mc146818_read(NULL, + (centb = AcpiGbl_FADT.Century)); + else +#endif if (cmoscheck()) cmoscentury = mc146818_read(NULL, NVRAM_CENTURY); #if NMCA > 0