aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-08-04 06:16:53 +0000
committerhpa <hpa>2004-08-04 06:16:53 +0000
commit090ff3d4015be69e5f24e1483d298b53c14a2e57 (patch)
treee00f136479429e5e8b69fedfccf420d42065494c
parentda900b66fdec8f6c4609df2ce72881bd3f6987a8 (diff)
downloadsyslinux-elf-syslinux-2.11-pre2.tar.gz
syslinux-elf-syslinux-2.11-pre2.tar.xz
syslinux-elf-syslinux-2.11-pre2.zip
Move ASCII macros to macros.incsyslinux-2.11-pre2
-rw-r--r--isolinux.asm5
-rw-r--r--ldlinux.asm5
-rw-r--r--macros.inc6
-rw-r--r--pxelinux.asm5
4 files changed, 4 insertions, 17 deletions
diff --git a/isolinux.asm b/isolinux.asm
index 203d5ea9..150f9cbd 100644
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -1566,11 +1566,6 @@ getfssec:
; Begin data section
; -----------------------------------------------------------------------------
-CR equ 13 ; Carriage Return
-LF equ 10 ; Line Feed
-FF equ 12 ; Form Feed
-BS equ 8 ; Backspace
-
boot_prompt db 'boot: ', 0
wipe_char db BS, ' ', BS, 0
err_notfound db 'Could not find kernel image: ',0
diff --git a/ldlinux.asm b/ldlinux.asm
index 366ed18e..98e09f46 100644
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -1362,11 +1362,6 @@ lc_ret: ret
; Begin data section
; -----------------------------------------------------------------------------
-CR equ 13 ; Carriage Return
-LF equ 10 ; Line Feed
-FF equ 12 ; Form Feed
-BS equ 8 ; Backspace
-
;
; Lower-case table for codepage 865
;
diff --git a/macros.inc b/macros.inc
index f8d622fa..02aecd01 100644
--- a/macros.inc
+++ b/macros.inc
@@ -103,7 +103,9 @@
;
; ASCII
;
-CR equ 13
-LF equ 10
+CR equ 13 ; Carriage Return
+LF equ 10 ; Line Feed
+FF equ 12 ; Form Feed
+BS equ 8 ; Backspace
%endif ; _MACROS_INC
diff --git a/pxelinux.asm b/pxelinux.asm
index 6885cd99..ccad9fb6 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -2302,11 +2302,6 @@ writestr equ cwritestr
; Begin data section
; -----------------------------------------------------------------------------
-CR equ 13 ; Carriage Return
-LF equ 10 ; Line Feed
-FF equ 12 ; Form Feed
-BS equ 8 ; Backspace
-
hextbl_lower db '0123456789abcdef'
copyright_str db ' Copyright (C) 1994-', year, ' H. Peter Anvin'
db CR, LF, 0