From df1421b163879461824bcf07e97038fb671ae1ee Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Sat, 9 May 2020 16:48:30 -0700
Subject: [PATCH] Small Cleanup

---
 Makefile                | 2 +-
 Source/HBIOS/hdsk.asm   | 2 ++
 Source/Images/Build.cmd | 6 +++---
 Source/Images/Makefile  | 8 +++++---
 Source/Makefile         | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 65560c7d..741e5ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -14,5 +14,5 @@ clobber:
 	rm -f typescript
 
 diff:
-	$(MAKE) --directory diff
+	$(MAKE) --directory Source diff
 
diff --git a/Source/HBIOS/hdsk.asm b/Source/HBIOS/hdsk.asm
index a5d3b0ff..e6643dd1 100644
--- a/Source/HBIOS/hdsk.asm
+++ b/Source/HBIOS/hdsk.asm
@@ -27,10 +27,12 @@ HDSK_CFGTBL:
 	.DB	0			; DRIVER DEVICE NUMBER
 	.DB	0			; DEVICE STATUS
 	.DW	0,0			; CURRENT LBA
+#IF (HDSK_DEVCNT >= 2)
 	; DEVICE 1
 	.DB	1			; DEVICE NUMBER
 	.DB	0			; DEVICE STATUS
 	.DW	0,0			; CURRENT LBA
+#ENDIF
 ;
 #IF ($ - HDSK_CFGTBL) != (HDSK_DEVCNT * HDSK_CFGSIZ)
 	.ECHO	"*** INVALID HDSK CONFIG TABLE ***\n"
diff --git a/Source/Images/Build.cmd b/Source/Images/Build.cmd
index 01e52351..c24948a3 100644
--- a/Source/Images/Build.cmd
+++ b/Source/Images/Build.cmd
@@ -21,7 +21,7 @@ call BuildDisk.cmd cpm3 wbw_hd ..\cpm3\cpmldr.sys
 call BuildDisk.cmd zpm3 wbw_hd ..\cpm3\cpmldr.sys
 call BuildDisk.cmd ws4 wbw_hd
 
-if exist ..\BPBIOS\bpbio-ww.rel call BuildHD.cmd bp wbw_hd
+if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hd
 
 echo.
 echo Building Combo Disk (legacy format) Image...
@@ -37,9 +37,9 @@ call BuildDisk.cmd cpm3 wbw_hdnew ..\cpm3\cpmldr.sys
 call BuildDisk.cmd zpm3 wbw_hdnew ..\cpm3\cpmldr.sys
 call BuildDisk.cmd ws4 wbw_hdnew
 
-if exist ..\BPBIOS\bpbio-ww.rel call BuildHD.cmd bp wbw_hdnew
+if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hdnew
 
-copy hd_prefix.dat ..\..\Binary\
+copy hdnew_prefix.bin ..\..\Binary\
 
 echo.
 echo Building Combo Disk (new format) Image...
diff --git a/Source/Images/Makefile b/Source/Images/Makefile
index ea5a4e63..72fc2bf4 100644
--- a/Source/Images/Makefile
+++ b/Source/Images/Makefile
@@ -15,7 +15,9 @@ HDNEWIMGS = hdnew_cpm22.img hdnew_zsdos.img hdnew_nzcom.img \
 HDPREFIX =
 HDNEWPREFIX = hdnew_prefix.bin
 
-OBJECTS = $(FDIMGS) $(HDIMGS) hd_combo.img $(HDNEWIMGS) hdnew_combo.img
+OBJECTS = $(FDIMGS)
+OBJECTS += $(HDIMGS) hd_combo.img $(HDPREFIX)
+OBJECTS += $(HDNEWIMGS) hdnew_combo.img $(HDNEWPREFIX)
 
 OTHERS = blank144 blankhd blankhdnew
 
@@ -26,10 +28,10 @@ include $(TOOLS)/Makefile.inc
 
 DIFFPATH = $(DIFFTO)/Binary
 
-hd_combo.img:	$(HDPREFIX) $(HDIMGS)
+hd_combo.img: $(HDPREFIX) $(HDIMGS)
 	cat $^ > $@
 
-hdnew_combo.img:	$(HDNEWPREFIX) $(HDNEWIMGS)
+hdnew_combo.img: $(HDNEWPREFIX) $(HDNEWIMGS)
 	cat $^ > $@
 
 #
diff --git a/Source/Makefile b/Source/Makefile
index 63c4204f..3df2bab5 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -9,7 +9,7 @@ SUBDIRS += Fonts
 SUBDIRS += CPM22 ZCPR ZCPR-DJ ZSDOS
 SUBDIRS += HBIOS CPM3
 SUBDIRS += ZPM3
-SUBDIRS += BPBIOS
+#SUBDIRS += BPBIOS
 SUBDIRS += Images
 TOOLS = ../Tools
 include $(TOOLS)/Makefile.inc