Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/x86 x86_reset: use acpi_reset instead of AcpiReset



details:   https://anonhg.NetBSD.org/src/rev/ece772e6cf1e
branches:  trunk
changeset: 767845:ece772e6cf1e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Aug 01 11:26:31 2011 +0000

description:
x86_reset: use acpi_reset instead of AcpiReset

diffstat:

 sys/arch/x86/x86/x86_machdep.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 5492d664c864 -r ece772e6cf1e sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Mon Aug 01 11:25:59 2011 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Mon Aug 01 11:26:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.52 2011/07/31 22:43:01 jmcneill Exp $        */
+/*     $NetBSD: x86_machdep.c,v 1.53 2011/08/01 11:26:31 jmcneill Exp $        */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.52 2011/07/31 22:43:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.53 2011/08/01 11:26:31 jmcneill Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -906,8 +906,9 @@
         * defined in the FADT.
         */
        if (acpi_active) {
-               if (AcpiReset() != AE_NOT_EXIST)
+               if (acpi_reset() == 0) {
                        delay(500000); /* wait 0.5 sec to see if that did it */
+               }
        }
 #endif
 



Home | Main Index | Thread Index | Old Index