Mercurial > hg > Members > kono > nitros9-code

changeset 2575:a9a5be5114b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed up for DW4
author boisy
date Sun, 15 May 2011 23:09:17 +0000
parents 236dd2507569
children 35c61c91bc29
files dw3dos/dw3dos.asm dw3dos/hdbdosdw1.bin dw3dos/hdbdosdw3.bin dw3dos/hdbdosdw4.bin dw3dos/makefile
diffstat 5 files changed, 56 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/dw3dos/dw3dos.asm	Sun May 15 18:14:26 2011 +0000
+++ b/dw3dos/dw3dos.asm	Sun May 15 23:09:17 2011 +0000
@@ -283,6 +283,7 @@
 		 ldd   #133*1		1 second timeout
 		 bsr   DWRead
          bcs   ReadEx
+         bne   ReadEx
 * Send 2 byte checksum
 		 pshs  y
 		 leax  ,s
@@ -293,6 +294,8 @@
 		 bsr   DWRead
 		 leas  2,s
 		 bcs   ReadEx
+                 bne   ReadEx
+* Send 2 byte checksum
 		 lda   ,s
 		 beq   ReadEx
 		 cmpa  #E_CRC
@@ -303,8 +306,13 @@
 ReadErr  comb
 ReadEx	 puls  d,x,y,pc
 
+         IFEQ  DW4-1
+         use   ../level1/modules/dw4read.asm 
+         use   ../level1/modules/dw4write.asm 
+         ELSE
          use   ../level1/modules/dwread.asm 
          use   ../level1/modules/dwwrite.asm 
+         ENDC
 
          IFEQ  CoCo-3
 * MMU
Binary file dw3dos/hdbdosdw1.bin has changed
Binary file dw3dos/hdbdosdw3.bin has changed
Binary file dw3dos/hdbdosdw4.bin has changed
--- a/dw3dos/makefile	Sun May 15 18:14:26 2011 +0000
+++ b/dw3dos/makefile	Sun May 15 23:09:17 2011 +0000
@@ -10,11 +10,16 @@
 
 ROMS		= dw3dos_mb_cc3.rom dw3dos_mb_cc2.rom dw3dos_mb_cc1.rom \
 		dw3dos_dsk_cc3.rom dw3dos_dsk_cc2.rom dw3dos_dsk_cc1.rom \
-		dw3doscc3.bin dw3doscc2.bin dw3doscc1.bin
+		dw3doscc3.bin dw3doscc2.bin dw3doscc1.bin \
+		dw4dos_mb_cc3.rom dw4dos_mb_cc2.rom \
+		dw4dos_dsk_cc3.rom dw4dos_dsk_cc2.rom \
+		dw4doscc3.bin dw4doscc2.bin
 
-CASSFILES	= hdbcc1.wav hdbcc2.wav hdbcc3.wav dw3doscc1.wav dw3doscc2.wav dw3doscc3.wav
+CASSFILES	= hdbdw1.wav hdbdw3.wav hdbdw4.wav dw3doscc1.wav dw3doscc2.wav dw3doscc3.wav \
+		dw4doscc2.wav dw4doscc3.wav	
 
-TRACKS		= dw3dos_cc3.trk dw3dos_cc2.trk dw3dos_cc1.trk
+TRACKS		= dw3dos_cc3.trk dw3dos_cc2.trk dw3dos_cc1.trk \
+		dw4dos_cc3.trk dw4dos_cc2.trk
 
 ALLOBJS		= $(ROMS) $(CASSFILES) $(TRACKS)
 
@@ -23,26 +28,26 @@
 banner:
 	@$(ECHO) "**************************************************"
 	@$(ECHO) "*                                                *"
-	@$(ECHO) "*           DriveWire 3 DOS Files                *"
+	@$(ECHO) "*          DriveWire 3/4 DOS Files               *"
 	@$(ECHO) "*                                                *"
 	@$(ECHO) "**************************************************"
 
 dsk:	objs
 
 # HDB-DOS DW Cassette Files
-hdbcc1.wav: hdbdoscc1.bin
+hdbdw1.wav: hdbdosdw1.bin
 	dd if=$< bs=1 skip=5 of=hdbtmp count=8240
-	makewav hdbtmp -r -d0x4fd0 -e0x4fd0 -o$@ -nHDBDOSC1
+	makewav hdbtmp -r -d0x4fd0 -e0x4fd0 -o$@ -nHDBDW3C1
 	rm hdbtmp
 
-hdbcc2.wav: hdbdoscc2.bin
+hdbdw3.wav: hdbdosdw3.bin
 	dd if=$< bs=1 skip=5 of=hdbtmp count=8240
-	makewav hdbtmp -r -d0x4fd0 -e0x4fd0 -o$@ -nHDBDOSC2
+	makewav hdbtmp -r -d0x4fd0 -e0x4fd0 -o$@ -nHDBDW3
 	rm hdbtmp
 
-hdbcc3.wav: hdbdoscc3.bin
+hdbdw4.wav: hdbdosdw4.bin
 	dd if=$< bs=1 skip=5 of=hdbtmp count=8240
-	makewav hdbtmp -r -d0x4fd0 -e0x4fd0 -o$@ -nHDBDOSC3
+	makewav hdbtmp -r -d0x4fd0 -e0x4fd0 -o$@ -nHDBDW4
 	rm hdbtmp
 
 # DW3DOS ROMs
@@ -82,7 +87,32 @@
 dw3doscc1.wav:	dw3doscc1.bin
 	makewav $< -r -d0x2400 -e0x2400 -o$@ -nDW3DOSC1
 
-# DWDOS Tracks
+# DW4DOS ROMs
+dw4dos_mb_cc3.rom:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=3 -aDW4=1
+
+dw4dos_mb_cc2.rom:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=2 -aDW4=1
+
+dw4dos_dsk_cc3.rom:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=3 -aDISKROM=1 -aDW4=1
+
+dw4dos_dsk_cc2.rom:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=2 -aDISKROM=1 -aDW4=1
+
+dw4doscc3.bin:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=3 -aBIN=1 -mb -aDW4=1
+
+dw4doscc2.bin:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=2 -aBIN=1 -mb -aDW4=1
+
+dw4doscc3.wav:	dw3doscc3.bin
+	makewav $< -r -d0x2400 -e0x2400 -o$@ -nDW3DOSC3
+
+dw4doscc2.wav:	dw3doscc2.bin
+	makewav $< -r -d0x2400 -e0x2400 -o$@ -nDW3DOSC2
+
+# DW3DOS Tracks
 dw3dos_cc3.trk:	dw3dos.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=3 -aDOSTRACK
 
@@ -92,6 +122,13 @@
 dw3dos_cc1.trk:	dw3dos.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=1 -aDOSTRACK
 
+# DW4DOS Tracks
+dw4dos_cc3.trk:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=3 -aDOSTRACK -aDW4=1
+
+dw4dos_cc2.trk:	dw3dos.asm
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aCoCo=2 -aDOSTRACK -aDW4=1
+
 drivewire.zip: $(ALLOBJS)
 	zip $@ $(ALLOBJS)