aboutsummaryrefslogtreecommitdiffstats
path: root/dosutil
diff options
context:
space:
mode:
Diffstat (limited to 'dosutil')
-rw-r--r--dosutil/eltorito.asm15
-rw-r--r--dosutil/mdiskchk.c11
2 files changed, 18 insertions, 8 deletions
diff --git a/dosutil/eltorito.asm b/dosutil/eltorito.asm
index 96cfd9ba..d6b6b50e 100644
--- a/dosutil/eltorito.asm
+++ b/dosutil/eltorito.asm
@@ -1029,9 +1029,11 @@ SpecGo: mov si,SpecPkt
ScanDrives: push ax ; at df3 in 1.4
push si
- mov dl, 80h ;Start at Drive 0x80
-NextDrv: mov ax,4B01h ;Get Bootable CD-ROM Status
- mov BYTE [SpecPkt],0 ;Clear 1st byte of SpecPkt
+ mov dl, 7fh ;Start at Drive 0x80
+NextDrv: inc dl
+ clc
+ mov ax,4B01h ;Get Bootable CD-ROM Status
+ mov BYTE [SpecPkt],0 ;Clear 1st byte of SpecPkt
call SpecGo
; Carry is not cleared in buggy Dell BIOSes,
; so I'm checking packet size byte
@@ -1044,10 +1046,9 @@ NextDrv: mov ax,4B01h ;Get Bootable CD-ROM Status
ja FindFail ; in 1.4 at e16
jmp short SendFound ; in 1.4 at e26
-FindFail: inc dl ;Next drive
- cmp dl, 0ffh
- jb SendFail ; Check from 80h..ffh
- jmp short NextDrv
+FindFail: cmp dl, 0ffh
+ je SendFail ; Check from 80h..ffh
+ jmp short NextDrv ;Next drive
SendFail: xor dl,dl
stc
jmp short ThingDone
diff --git a/dosutil/mdiskchk.c b/dosutil/mdiskchk.c
index ddc57632..f7bde614 100644
--- a/dosutil/mdiskchk.c
+++ b/dosutil/mdiskchk.c
@@ -200,7 +200,8 @@ static MDISKCHK_FUNC_DECL(show_usage)
"Action: --safe-hooks . . Will scan INT 13h \"safe hook\" chain\n"
" --mbfts . . . . Will scan memory for MEMDISK mBFTs\n"
" --batch-output . Will output SET command output based\n"
- " on MEMDISK kernel arguments\n");
+ " on MEMDISK kernel arguments\n"
+ " --no-sequential Suppresses probing all drive numbers\n");
}
/* Search memory for mBFTs and report them via the output method */
@@ -297,6 +298,7 @@ int main(int argc, char *argv[])
{
int d;
int found = 0;
+ int sequential_scan = 1; /* Classic behaviour */
const struct memdiskinfo *m;
/* Default behaviour */
@@ -331,6 +333,10 @@ int main(int argc, char *argv[])
case 'b':
show_memdisk = batch_output;
break;
+ case 'N':
+ case 'n':
+ sequential_scan = 0;
+ break;
default:
usage = show_usage;
} /* switch */
@@ -338,6 +344,8 @@ int main(int argc, char *argv[])
safe_hooks();
mbfts();
+ if (!sequential_scan)
+ goto skip_sequential;
for (d = 0; d <= 0xff; d++) {
m = query_memdisk(d);
if (m != NULL) {
@@ -345,6 +353,7 @@ int main(int argc, char *argv[])
show_memdisk(d, m);
}
}
+skip_sequential:
usage();
return found;