[src/trunk]: src/sys/arch Ensure that the VBE mode is only restored when mach...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ad76ca6fc765
branches:  trunk
changeset: 746948:ad76ca6fc765
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Aug 24 10:16:12 2009 +0000

description:
Ensure that the VBE mode is only restored when machdep.acpi_vbios_reset=1

diffstat:

 sys/arch/amd64/acpi/acpi_wakecode.S |  20 +++++++++-----------
 sys/arch/i386/acpi/acpi_wakecode.S  |  20 +++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diffs (92 lines):

diff -r 51f7a500c4bd -r ad76ca6fc765 sys/arch/amd64/acpi/acpi_wakecode.S
--- a/sys/arch/amd64/acpi/acpi_wakecode.S       Mon Aug 24 10:15:25 2009 +0000
+++ b/sys/arch/amd64/acpi/acpi_wakecode.S       Mon Aug 24 10:16:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_wakecode.S,v 1.8 2009/08/24 02:15:46 jmcneill Exp $       */
+/*     $NetBSD: acpi_wakecode.S,v 1.9 2009/08/24 10:16:12 jmcneill Exp $       */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg%netbsd.org@localhost>
@@ -115,15 +115,6 @@
        movw    %cs,%ax
        movw    %ax,%ds
        movw    %ax,%ss
-1:
-
-       /* Disable beep again if machdep.acpi_beep_on_reset=1 */
-       cmpb    $1,WAKEUP_beep_on_reset
-       jne     1f
-       inb     $0x61,%al
-       andb    $0xfc,%al
-       outb    %al,$0x61
-1:
 
        /* If we need to restore a VESA VBE mode, do it now */
        cmpb    $0,WAKEUP_vesa_modenum
@@ -133,12 +124,19 @@
        movw    $0x4f02,%ax
        int     $0x10
 
-       /* paranoia */
        movw    %cs,%ax
        movw    %ax,%ds
        movw    %ax,%ss
 1:
 
+       /* Disable beep again if machdep.acpi_beep_on_reset=1 */
+       cmpb    $1,WAKEUP_beep_on_reset
+       jne     1f
+       inb     $0x61,%al
+       andb    $0xfc,%al
+       outb    %al,$0x61
+1:
+
        /* Load temporary 32bit GDT */
        data32 addr32 lgdt      tmp_gdt
 
diff -r 51f7a500c4bd -r ad76ca6fc765 sys/arch/i386/acpi/acpi_wakecode.S
--- a/sys/arch/i386/acpi/acpi_wakecode.S        Mon Aug 24 10:15:25 2009 +0000
+++ b/sys/arch/i386/acpi/acpi_wakecode.S        Mon Aug 24 10:16:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_wakecode.S,v 1.13 2009/08/24 02:15:46 jmcneill Exp $      */
+/*     $NetBSD: acpi_wakecode.S,v 1.14 2009/08/24 10:16:12 jmcneill Exp $      */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -111,15 +111,6 @@
        movw    %cs,%ax
        movw    %ax,%ds
        movw    %ax,%ss
-1:
-
-       /* Disable beep again if machdep.acpi_beep_on_reset=1 */
-       cmpb    $1,WAKEUP_beep_on_reset
-       jne     1f
-       inb     $0x61,%al
-       andb    $0xfc,%al
-       outb    %al,$0x61
-1:
 
        /* If we need to restore a VESA VBE mode, do it now */
        cmpb    $0,WAKEUP_vesa_modenum
@@ -129,12 +120,19 @@
        movw    $0x4f02,%ax
        int     $0x10
 
-       /* paranoia */
        movw    %cs,%ax
        movw    %ax,%ds
        movw    %ax,%ss
 1:
 
+       /* Disable beep again if machdep.acpi_beep_on_reset=1 */
+       cmpb    $1,WAKEUP_beep_on_reset
+       jne     1f
+       inb     $0x61,%al
+       andb    $0xfc,%al
+       outb    %al,$0x61
+1:
+
        /* Load GDT while non-paging */
        lgdt    tmp_gdt