diff options
| author | njl <njl@FreeBSD.org> | 2006-06-10 08:06:16 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2006-06-10 08:06:16 +0000 |
| commit | 00c07c39910ef7f9f06adf874feb0470efa94dd6 (patch) | |
| tree | 4d1be3038b8035b8f903c1895070ecdf8156ec48 /sys/i386 | |
| parent | 0197d975de1cc76bd62725a4b572fc6a2f77fe3b (diff) | |
| download | FreeBSD-src-00c07c39910ef7f9f06adf874feb0470efa94dd6.zip FreeBSD-src-00c07c39910ef7f9f06adf874feb0470efa94dd6.tar.gz | |
Move the reset beep tunable/sysctl to debug.acpi.resume_beep. This makes
more sense than under hw.acpi. Also, document this in the man page.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/acpica/acpi_machdep.c | 12 | ||||
| -rw-r--r-- | sys/i386/acpica/acpi_wakecode.S | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c index 867c2e6..725f43f 100644 --- a/sys/i386/acpica/acpi_machdep.c +++ b/sys/i386/acpica/acpi_machdep.c @@ -52,8 +52,12 @@ __FBSDID("$FreeBSD$"); #include <i386/bios/apm.h> +SYSCTL_DECL(_debug_acpi); + uint32_t acpi_resume_beep; -TUNABLE_INT("hw.acpi.resume_beep", &acpi_resume_beep); +TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep); +SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep, + 0, "Beep the PC speaker when resuming"); uint32_t acpi_reset_video; TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); @@ -322,11 +326,7 @@ acpi_machdep_init(device_t dev) SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, - "resume_beep", CTLFLAG_RD | CTLFLAG_RW, &acpi_resume_beep, 0, - "Beep the PC speaker when resuming"); - SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, - SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, - "reset_video", CTLFLAG_RD | CTLFLAG_RW, &acpi_reset_video, 0, + "reset_video", CTLFLAG_RW, &acpi_reset_video, 0, "Call the VESA reset BIOS vector on the resume path"); return (0); diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S index ecbb4cd..e8033e8 100644 --- a/sys/i386/acpica/acpi_wakecode.S +++ b/sys/i386/acpica/acpi_wakecode.S @@ -34,7 +34,7 @@ #include "assym.s" - .align 4096 + .align 4 .code16 wakeup_16: nop |
