cleanup

Author: tsupplis

Makefile

@@ -74,16 +74,12 @@ atinit.a86: baselib.a86 atclock.a86
 	$(CC) $(CFLAGS) $<
 	$(STRIP) $@
 
-pce/pceexit.cmd pce/pcever.cmd pce/pcemnt.cmd pce/pcetime.cmd \
-    pce/pceinit.cmd :
-	(cd pce;make all)
-
 clean:
 	$(RM) *.o *.h86 *.log *.sym *.prn *.lst *.obj $(TOOLS)
 	(cd pce;make clean)
 
 
-cdostest.img: $(TOOLS) $(PCETOOLS) Makefile test.bin test.txt
+cdostest.img: binaries Makefile test.bin test.txt
 	cp cdosbase.img cdostest.img
 	-for i in $(PCETOOLS) $(TOOLS);do \
 	    mcopy -o -i cdostest.img $$i ::`basename $$i|tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` ; \
@@ -92,7 +88,7 @@ cdostest.img: $(TOOLS) $(PCETOOLS) Makefile test.bin test.txt
 	mcopy -o -i cdostest.img test.bin ::TEST.BIN
 	mdir -w -i cdostest.img ::*.*
 
-cpmtest.img: $(TOOLS) $(PCETOOLS) Makefile test.bin test.txt
+cpmtest.img: binaries Makefile test.bin test.txt
 	cp cpmbase.img cpmtest.img
 	cpmcp -f ibmpc-514ss cpmtest.img $(PCETOOLS) 0:
 	cpmcp -f ibmpc-514ss cpmtest.img $(TOOLS) 0:

cpm86.cfg

@@ -170,7 +170,6 @@ fdc {
 
 	drive0 = 0x00
 	drive1 = 0x01
-	drive2 = 0x02
 
 	accurate = 0
 }
@@ -192,6 +191,7 @@ if (cfg.hdc) {
         irq     = 5
 
         drive0  = 0x80
+        drive1  = 0x81
 
         switches = 0x00
     }
@@ -212,11 +212,11 @@ disk {
 	optional = 0
 }
 
+
 disk {
 	drive    = 0x80
 	type     = "auto"
 	file     = "cpmhd.img"
-	optional = 0
+	optional = 1
 }
 
-