summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel.inc3
-rw-r--r--macros.inc11
2 files changed, 12 insertions, 2 deletions
diff --git a/kernel.inc b/kernel.inc
index 0756c6a3..58987a6c 100644
--- a/kernel.inc
+++ b/kernel.inc
@@ -87,6 +87,7 @@ CAN_USE_HEAP equ 80h ; Boot loader reports heap size
;
syslinux_id equ 031h ; 3 = SYSLINUX family; 1 = SYSLINUX
pxelinux_id equ 032h ; 3 = SYSLINUX family; 2 = PXELINUX
-isolinux_id equ 033h ; 3 = SYSLINUX family; 3 = PXELINUX
+isolinux_id equ 033h ; 3 = SYSLINUX family; 3 = ISOLINUX
+extlinux_id equ 034h ; 3 = SYSLINUX family; 4 = EXTLINUX
%endif ; _KERNEL_INC
diff --git a/macros.inc b/macros.inc
index 263501ff..f8d622fa 100644
--- a/macros.inc
+++ b/macros.inc
@@ -1,7 +1,7 @@
;; $Id$
;; -----------------------------------------------------------------------
;;
-;; Copyright 1994-2003 H. Peter Anvin - All Rights Reserved
+;; Copyright 1994-2004 H. Peter Anvin - All Rights Reserved
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -36,6 +36,9 @@
%ifndef IS_ISOLINUX
%define IS_ISOLINUX 0
%endif
+%ifndef IS_EXTLINUX
+%define IS_EXTLINUX 0
+%endif
;
; Macros similar to res[bwd], but which works in the code segment (after
@@ -97,4 +100,10 @@
%define htonl(x) ( ( ((x) & 0FFh) << 24) + ( ((x) & 0FF00h) << 8 ) + ( ((x) & 0FF0000h) >> 8 ) + ( ((x) & 0FF000000h) >> 24) )
%define ntohl(x) htonl(x)
+;
+; ASCII
+;
+CR equ 13
+LF equ 10
+
%endif ; _MACROS_INC