aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShao Miller <shao.miller@yrdsb.edu.on.ca>2009-03-10 01:13:25 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-03-10 15:02:04 -0700
commit7e8ae6da382eb345cb07a836d4230fe9064726c5 (patch)
treee687b3a3512eb9d51d02f5f965318b6afe5fcd5a
parentd53c3f6140f108ce7fad0eaa5a69708082416d41 (diff)
downloadsyslinux.git-7e8ae6da382eb345cb07a836d4230fe9064726c5.tar.gz
syslinux.git-7e8ae6da382eb345cb07a836d4230fe9064726c5.tar.xz
syslinux.git-7e8ae6da382eb345cb07a836d4230fe9064726c5.zip
memdisk-cd: Kill off Int13MaxFunc slot for installer handling EDD case
The memdisk install code previously controlled EDD features by controlling how many INT 13 functions were available. Since we have EDD and non-EDD versions of the memdisk hooking code now, this is no longer needed.
-rw-r--r--memdisk/memdisk.inc6
-rw-r--r--memdisk/setup.c4
2 files changed, 1 insertions, 9 deletions
diff --git a/memdisk/memdisk.inc b/memdisk/memdisk.inc
index eae5e191..1e2076bd 100644
--- a/memdisk/memdisk.inc
+++ b/memdisk/memdisk.inc
@@ -148,7 +148,7 @@ Int13Start:
mov bp,sp ; Point BP to the entry stack frame
TRACER 'F'
; Note: AH == P_AH here
- cmp ah,[Int13MaxFunc]
+ cmp ah,[Int13FuncsCnt-1]
ja Invalid_jump
xor al,al ; AL = 0 is standard entry condition
mov di,ax
@@ -929,10 +929,6 @@ DPT_ptr dw 0 ; If nonzero, pointer to DPT
MDI_Len equ $-MemDisk_Info
; ---- MDI structure ends here ---
-Int13MaxFunc db Int13FuncsCnt-1 ; Max INT 13h function (to disable EDD)
- db 0 ; pad
-
- dw 0 ; pad
MemInt1588 dw 0 ; 1MB-65MB memory amount (1K)
Cylinders dw 0 ; Cylinder count
diff --git a/memdisk/setup.c b/memdisk/setup.c
index 1cd5e116..bdc60868 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -96,10 +96,6 @@ struct patch_area {
uint16_t dpt_ptr;
/* End of the official MemDisk_Info */
- uint8_t maxint13func;
- uint8_t _pad2;
-
- uint16_t _pad3;
uint16_t memint1588;
uint16_t cylinders;