aboutsummaryrefslogtreecommitdiffstats
path: root/mbr
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-03-30 17:53:09 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2009-03-30 17:53:09 -0700
commita1e66d80179262be63c43bb33046bd41069b803d (patch)
treed93cd6ee1490540ff655069e8faa74ef623c4a3a /mbr
parent4f964b57c29db85515b68a3f59a791804aae8aae (diff)
downloadlwip-a1e66d80179262be63c43bb33046bd41069b803d.tar.gz
lwip-a1e66d80179262be63c43bb33046bd41069b803d.tar.xz
lwip-a1e66d80179262be63c43bb33046bd41069b803d.zip
mbr/*.S: use a symbolic constant for BIOS_kbdflags
Impact: cleanup Use a symbolic constant for BIOS_kbdflags instead of open-coding the address. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mbr')
-rw-r--r--mbr/gptmbr.S3
-rw-r--r--mbr/isohdpfx.S5
-rw-r--r--mbr/mbr.S7
3 files changed, 9 insertions, 6 deletions
diff --git a/mbr/gptmbr.S b/mbr/gptmbr.S
index 0a547b85..d6a9a96a 100644
--- a/mbr/gptmbr.S
+++ b/mbr/gptmbr.S
@@ -42,6 +42,7 @@ bootguid = _start + 0x1a8
/* Where we put DS:SI */
dssi_out = _start + 0x1be
+BIOS_kbdflags = 0x417
BIOS_page = 0x462
/* gas/ld has issues with doing this as absolute addresses... */
@@ -73,7 +74,7 @@ _start:
ljmpw $0, $next
next:
/* Escape for the user: if Ctrl is pressed, assume drive hd0 */
- testb $0x04, 0x417 /* keyboard control flags: Ctrl pressed */
+ testb $0x04, BIOS_kbdflags /* Ctrl pressed */
jz 1f
movb $0x80, %dl
1:
diff --git a/mbr/isohdpfx.S b/mbr/isohdpfx.S
index 0e15b11a..0c5b95e6 100644
--- a/mbr/isohdpfx.S
+++ b/mbr/isohdpfx.S
@@ -49,7 +49,8 @@ sectors = (stack-10)
heads = (stack-12)
secpercyl = (stack-16)
-BIOS_page = 0x462
+BIOS_kbdflags = 0x417
+BIOS_page = 0x462
/* gas/ld has issues with doing this as absolute addresses... */
.section ".bootsec", "a", @nobits
@@ -82,7 +83,7 @@ _start:
next:
/* Escape for the user: if Ctrl is pressed, assume drive hd0 */
- testb $0x04, 0x417 /* keyboard control flags: Ctrl pressed */
+ testb $0x04, BIOS_kbdflags /* Ctrl pressed */
jz 1f
movb $0x80, %dl
1:
diff --git a/mbr/mbr.S b/mbr/mbr.S
index 70572d59..2c3e65ac 100644
--- a/mbr/mbr.S
+++ b/mbr/mbr.S
@@ -34,8 +34,9 @@ driveno = (stack-6)
sectors = (stack-8)
secpercyl = (stack-12)
-BIOS_page = 0x462
-
+BIOS_kbdflags = 0x417
+BIOS_page = 0x462
+
/* gas/ld has issues with doing this as absolute addresses... */
.section ".bootsec", "a", @nobits
.globl bootsec
@@ -66,7 +67,7 @@ _start:
next:
/* Escape for the user: if Ctrl is pressed, assume drive hd0 */
- testb $0x04, 0x417 /* keyboard control flags: Ctrl pressed */
+ testb $0x04, BIOS_kbdflags /* Ctrl pressed */
jz 1f
movb $0x80, %dl
1: