Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/acpi/acpi_wakecode.S,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/acpi/acpi_wakecode.S,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- src/sys/arch/i386/acpi/acpi_wakecode.S	2006/06/20 22:36:58	1.8
+++ src/sys/arch/i386/acpi/acpi_wakecode.S	2007/04/28 14:03:00	1.9
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_wakecode.S,v 1.8 2006/06/20 22:36:58 jmcneill Exp $	*/
+/*	$NetBSD: acpi_wakecode.S,v 1.9 2007/04/28 14:03:00 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -94,7 +94,11 @@ wakeup_16:
 	pushl	$0
 	popfl
 
+	/* Only beep on reset if machdep.acpi_beep_on_reset=1 */
+	cmpb	$1,beep_on_reset
+	jne	nobeepon
 	call	beepon
+nobeepon:
 
 	/* Only reset the VBIOS if machdep.acpi_vbios_reset=1 */
 	cmpb	$1,vbios_reset
@@ -108,7 +112,11 @@ wakeup_16:
 	movw	%ax,%ss
 novbiosreset:
 
+	/* Only beep on reset if machdep.acpi_beep_on_reset=1 */
+	cmpb	$1,beep_on_reset
+	jne	nobeepoff
 	call beepoff
+nobeepoff:
 
 	/* Get physical address of the code */
 	xorl	%esi,%esi
@@ -254,3 +262,4 @@ previous_gs:		.word 0
 previous_ss:		.word 0
 where_to_recover:	.long 0
 vbios_reset:		.byte 0
+beep_on_reset:		.byte 0