Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jmcneill 2009-08-24 10:16:12 +00:00
parent 0c7b475101
commit e1f4092924
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/arch/amd64/acpi/acpi_wakecode.S
View File

@ -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>
@ -115,15 +115,6 @@ wakeup_16:
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 @@ wakeup_16:
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

20
sys/arch/i386/acpi/acpi_wakecode.S
View File

@ -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 @@ wakeup_16:
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 @@ wakeup_16:
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