MEMDISK: get rid of the WITH_EDD variable

With the creation of wrapper assembly scripts, there is no reason for
the indirection of WITH_EDD -> EDD; we can just set the EDD variable
directly.

diff --git a/memdisk/memdisk.inc b/memdisk/memdisk.inc
index 2b5b4e0..8fa7dc0 100644 (file)
--- a/memdisk/memdisk.inc
+++ b/memdisk/memdisk.inc
@@ -6,7 +6,7 @@
 ;  A program to emulate an INT 13h disk BIOS from a "disk" in extended
 ;  memory.
 ;
-;   Copyright 2001-2008 H. Peter Anvin - All Rights Reserved
+;   Copyright 2001-2009 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
@@ -22,12 +22,6 @@
 
 ; %define DEBUG_TRACERS                        ; Uncomment to get debugging tracers
 
-%ifdef WITH_EDD
-%define EDD 1
-%else
-%define EDD 0
-%endif
-
 %ifdef DEBUG_TRACERS
 
 %macro TRACER  1

diff --git a/memdisk/memdisk_chs.asm b/memdisk/memdisk_chs.asm
index daa5c0a..4b06a85 100644 (file)
--- a/memdisk/memdisk_chs.asm
+++ b/memdisk/memdisk_chs.asm
@@ -1 +1,2 @@
+%define EDD 0
 %include "memdisk.inc"

diff --git a/memdisk/memdisk_edd.asm b/memdisk/memdisk_edd.asm
index 97d3fe9..d2e7b1c 100644 (file)
--- a/memdisk/memdisk_edd.asm
+++ b/memdisk/memdisk_edd.asm
@@ -1,2 +1,2 @@
-%define WITH_EDD
+%define EDD 1
 %include "memdisk.inc"