diff options
| -rw-r--r-- | core/bootsect.inc | 6 | ||||
| -rw-r--r-- | core/comboot.inc | 6 | ||||
| -rw-r--r-- | core/macros.inc | 5 | ||||
| -rw-r--r-- | core/ui.inc | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/core/bootsect.inc b/core/bootsect.inc index 373c649d..e7c2903b 100644 --- a/core/bootsect.inc +++ b/core/bootsect.inc @@ -25,7 +25,7 @@ ; Load a boot sector ; is_bootsector: -%if IS_SYSLINUX || IS_MDSLINUX +%if IS_SYSLINUX ; Transfer zero bytes push word 0 jmp short load_bootsec @@ -48,7 +48,7 @@ load_bootsec: mov eax,7C00h ; Entry point mov [trackbuf],eax ; Copy to this address -%if IS_SYSLINUX || IS_MDSLINUX +%if IS_SYSLINUX xor ecx,ecx pop cx @@ -61,7 +61,7 @@ load_bootsec: xor edx,edx xor esi,esi -%if IS_SYSLINUX || IS_MDSLINUX || IS_EXTLINUX +%if IS_SYSLINUX || IS_EXTLINUX ; Restore original FDC table mov eax,[OrigFDCTabPtr] mov [fdctab],eax diff --git a/core/comboot.inc b/core/comboot.inc index c169414f..4db0b3e0 100644 --- a/core/comboot.inc +++ b/core/comboot.inc @@ -599,7 +599,7 @@ comapi_derinfo: mov P_DL,al mov P_FS,cs mov P_SI,OrigESDI -%if IS_SYSLINUX || IS_MDSLINUX || IS_EXTLINUX +%if IS_SYSLINUX || IS_EXTLINUX mov P_ES,cs mov P_BX,PartInfo %elif IS_ISOLINUX @@ -645,7 +645,7 @@ comapi_cleanup: sub bp,sp ; unload_pxe may move the stack around call unload_pxe add bp,sp ; restore frame pointer... -%elif IS_SYSLINUX || IS_MDSLINUX || IS_EXTLINUX +%elif IS_SYSLINUX || IS_EXTLINUX ; Restore original FDC table mov eax,[OrigFDCTabPtr] mov [fdctab],eax @@ -850,7 +850,7 @@ comapi_userfont: ; ; INT 22h AX=0019h Read disk ; -%if IS_SYSLINUX || IS_MDSLINUX || IS_ISOLINUX || IS_EXTLINUX +%if IS_SYSLINUX || IS_ISOLINUX || IS_EXTLINUX comapi_readdisk: mov esi,P_ESI ; Enforce ESI == EDI == 0, these or esi,P_EDI ; are reserved for future expansion diff --git a/core/macros.inc b/core/macros.inc index 1c300583..1aa2b2ce 100644 --- a/core/macros.inc +++ b/core/macros.inc @@ -29,11 +29,6 @@ %else %define IS_SYSLINUX 0 %endif -%ifdef IS_MDSLINUX - %define MY_NAME 'MDSLINUX' -%else - %define IS_MDSLINUX 0 -%endif %ifdef IS_PXELINUX %define MY_NAME 'PXELINUX' %else diff --git a/core/ui.inc b/core/ui.inc index 4c6e04a0..aa86c569 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -678,7 +678,7 @@ is_bad_image: call writestr jmp enter_command -%if IS_SYSLINUX || IS_MDSLINUX +%if IS_SYSLINUX ; ok %else is_bss_sector equ is_bad_image |