From 090ff3d4015be69e5f24e1483d298b53c14a2e57 Mon Sep 17 00:00:00 2001
From: hpa <hpa>
Date: Wed, 4 Aug 2004 06:16:53 +0000
Subject: [PATCH] Move ASCII macros to macros.inc

---
 isolinux.asm | 5 -----
 ldlinux.asm  | 5 -----
 macros.inc   | 6 ++++--
 pxelinux.asm | 5 -----
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/isolinux.asm b/isolinux.asm
index 203d5ea..150f9cb 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 366ed18..98e09f4 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 f8d622f..02aecd0 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 6885cd9..ccad9fb 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
-- 
2.7.4