From 95de014554d4fc84ea86a7b4d803ef702ad851f7 Mon Sep 17 00:00:00 2001 From: Greg Haerr Date: Tue, 15 Oct 2024 20:46:43 -0600 Subject: [PATCH 1/2] [directfd] Fix typo --- elks/arch/i86/drivers/block/directfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elks/arch/i86/drivers/block/directfd.c b/elks/arch/i86/drivers/block/directfd.c index cbd6be5de..ae8ae729b 100644 --- a/elks/arch/i86/drivers/block/directfd.c +++ b/elks/arch/i86/drivers/block/directfd.c @@ -774,7 +774,7 @@ static void DFPROC setup_rw_floppy(void) { DEBUG("setup_rw-"); #if IODELAY - int num_sectors = read_track? floppy->sect + (floppy->sect & 1 && !head); + int num_sectors = read_track? floppy->sect + (floppy->sect & 1 && !head) : CURRENT->rq_nr_sectors; DEBUG("[%ur%u]", current_drive, num_sectors); static unsigned lasttrack; From d927dc223d9846eefe41bdb5c0d0c33133711ac7 Mon Sep 17 00:00:00 2001 From: Greg Haerr Date: Tue, 15 Oct 2024 21:19:12 -0600 Subject: [PATCH 2/2] Turn mfs optimization off by default --- image/Make.image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Make.image b/image/Make.image index f16a957bd..72f3595fa 100644 --- a/image/Make.image +++ b/image/Make.image @@ -78,7 +78,7 @@ endif minixfs: rm -f $(TARGET_FILE) mfs $(VERBOSE) $(TARGET_FILE) mkfs $(MINIX_MKFSOPTS) - mfs -v $(VERBOSE) $(TARGET_FILE) addfs Image.all $(DESTDIR) +# mfs -v $(VERBOSE) $(TARGET_FILE) addfs Image.all $(DESTDIR) # rm -f Filelist # for f in $$(cd $(DESTDIR); find * -name '*'); do \ # echo $$f >> FileList; \