lkml.org 
[lkml]   [2011]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] x86: give names to realmode wakeup flags
Date
Instead of using literals, use a common set of names for the
user-controlled realmode wakeup flags.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
---
arch/x86/kernel/acpi/realmode/wakemain.c | 6 +++---
arch/x86/kernel/acpi/realmode/wakeup.h | 4 ++++
arch/x86/kernel/acpi/sleep.c | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/acpi/realmode/wakemain.c b/arch/x86/kernel/acpi/realmode/wakemain.c
index 883962d..1749cde 100644
--- a/arch/x86/kernel/acpi/realmode/wakemain.c
+++ b/arch/x86/kernel/acpi/realmode/wakemain.c
@@ -67,13 +67,13 @@ void main(void)
if (wakeup_header.real_magic != 0x12345678)
while (1);

- if (wakeup_header.realmode_flags & 4)
+ if (wakeup_header.realmode_flags & WAKE_FLAG_BEEP)
send_morse("...-");

- if (wakeup_header.realmode_flags & 1)
+ if (wakeup_header.realmode_flags & WAKE_FLAG_BIOS)
asm volatile("lcallw $0xc000,$3");

- if (wakeup_header.realmode_flags & 2) {
+ if (wakeup_header.realmode_flags & WAKE_FLAG_MODE) {
/* Need to call BIOS */
probe_cards(0);
set_mode(wakeup_header.video_mode);
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.h b/arch/x86/kernel/acpi/realmode/wakeup.h
index e1828c0..88f0e6c 100644
--- a/arch/x86/kernel/acpi/realmode/wakeup.h
+++ b/arch/x86/kernel/acpi/realmode/wakeup.h
@@ -39,4 +39,8 @@ extern struct wakeup_header wakeup_header;
#define WAKEUP_HEADER_SIGNATURE 0x51ee1111
#define WAKEUP_END_SIGNATURE 0x65a22c82

+#define WAKEUP_FLAG_BIOS 1
+#define WAKEUP_FLAG_MODE 2
+#define WAKEUP_FLAG_BEEP 4
+
#endif /* ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H */
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 18a857b..cb968e5 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -104,11 +104,11 @@ static int __init acpi_sleep_setup(char *str)
{
while ((str != NULL) && (*str != '\0')) {
if (strncmp(str, "s3_bios", 7) == 0)
- acpi_realmode_flags |= 1;
+ acpi_realmode_flags |= WAKEUP_FLAG_BIOS;
if (strncmp(str, "s3_mode", 7) == 0)
- acpi_realmode_flags |= 2;
+ acpi_realmode_flags |= WAKEUP_FLAG_MODE;
if (strncmp(str, "s3_beep", 7) == 0)
- acpi_realmode_flags |= 4;
+ acpi_realmode_flags |= WAKEUP_FLAG_BEEP;
#ifdef CONFIG_HIBERNATION
if (strncmp(str, "s4_nohwsig", 10) == 0)
acpi_no_s4_hw_signature();
--
1.7.4.1


\
 
 \ /
  Last update: 2011-07-05 00:45    [W:0.046 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site