# HG changeset patch
# User Boisy Pitre <boisy.pitre@nuance.com>
# Date 1349378581 18000
# Node ID 8a4c73c4bc8c74e271b0650dcaae795e9f4c55f5
# Parent  09c66281e12a7c2d1edb978497bae9f6313e0c96
Fixed SuperDriver descriptors

diff -r 09c66281e12a -r 8a4c73c4bc8c level1/atari/TODO
--- a/level1/atari/TODO	Wed Aug 01 19:18:46 2012 -0500
+++ b/level1/atari/TODO	Thu Oct 04 14:23:01 2012 -0500
@@ -8,10 +8,10 @@
 VTIO:
 - SS.KySns needs to be implemented
 
-dw3.sb:
-- Currently branch to init serial VIRQ is commented out.  Had system reliability
+dw.sb:
+- FIXED: Currently branch to init serial VIRQ is commented out.  Had system reliability
 troubles with it uncommented.
-- NMI as clock source could be a problem for DriveWire because OP_TIME could come in
+- FIXED: NMI as clock source could be a problem for DriveWire because OP_TIME could come in
 the middle of a DriveWire read or write.
 
 Other:
diff -r 09c66281e12a -r 8a4c73c4bc8c level1/coco1/modules/makefile
--- a/level1/coco1/modules/makefile	Wed Aug 01 19:18:46 2012 -0500
+++ b/level1/coco1/modules/makefile	Thu Oct 04 14:23:01 2012 -0500
@@ -113,6 +113,9 @@
 DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
 		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
+# HDB-DOS for SuperDriver
+HDBDOS                  = -DHB $(SSDD35)
+
 ddd0_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
 
diff -r 09c66281e12a -r 8a4c73c4bc8c level1/modules/superdesc.asm
--- a/level1/modules/superdesc.asm	Wed Aug 01 19:18:46 2012 -0500
+++ b/level1/modules/superdesc.asm	Thu Oct 04 14:23:01 2012 -0500
@@ -52,22 +52,48 @@
                TTL       Super Driver Device Descriptor Template
 
 * Super Driver specific fields
+               IFEQ      ITDRV
 ITDRV          SET       $00
+               ENDC
+               IFEQ      ITSTP
 ITSTP          SET       $00
+               ENDC
+               IFEQ      ITTYP
 ITTYP          SET       $81
+               ENDC
+               IFEQ      ITDNS
 ITDNS          SET       $00
+               ENDC
 
+               IFEQ      ITSOFS1
 ITSOFS1        SET       $00
+               ENDC
+               IFEQ      ITSOFS2
 ITSOFS2        SET       $00
+               ENDC
+               IFEQ      ITSOFS3
 ITSOFS3        SET       $00
+               ENDC
 
 * Geometry for an EZ-135
+               IFEQ      Sides
 Sides          SET       $40
+               ENDC
+               IFEQ      Cyls
 Cyls           SET       $007f
+               ENDC
+               IFEQ      SectTrk
 SectTrk        SET       $0020
+               ENDC
+               IFEQ      SectTrk0
 SectTrk0       SET       $0020
+               ENDC
+               IFEQ      Interlv
 Interlv        SET       $01
+               ENDC
+               IFEQ      SAS
 SAS            SET       $08
+               ENDC
 
                IFP1      
                USE       defsfile
diff -r 09c66281e12a -r 8a4c73c4bc8c level2/coco3/bootfiles/makefile
--- a/level2/coco3/bootfiles/makefile	Wed Aug 01 19:18:46 2012 -0500
+++ b/level2/coco3/bootfiles/makefile	Thu Oct 04 14:23:01 2012 -0500
@@ -64,7 +64,7 @@
 		$(MD)/rbf.mn \
 		$(RBDWBECKER) \
 		$(FLOPPY_40D) \
-	     $(MD)/ddd0_40d.dd \
+	            $(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn \
 		$(VTIO_COGRF_80) \
 		$(MD)/scdwv.dr \
@@ -78,11 +78,12 @@
 		$(MD)/rbf.mn \
 		$(RBDW) \
 		$(FLOPPY_40D) \
-          $(MD)/ddx0.dd \
+                        $(MD)/ddx0.dd \
 		$(MD)/scf.mn \
 		$(VTIO_COGRF_80) \
 		$(MD)/scdwv.dr \
 		$(SCDWV_NET) \
+		$(SCDWV_WIN) \
 		$(SCDWP) \
 		$(PIPE) \
 		$(CLOCK60HZDW)
diff -r 09c66281e12a -r 8a4c73c4bc8c level2/coco3/modules/makefile
--- a/level2/coco3/modules/makefile	Wed Aug 01 19:18:46 2012 -0500
+++ b/level2/coco3/modules/makefile	Thu Oct 04 14:23:01 2012 -0500
@@ -65,7 +65,9 @@
 		n1_scdwv.dd n2_scdwv.dd n3_scdwv.dd \
                 n4_scdwv.dd n5_scdwv.dd n6_scdwv.dd n7_scdwv.dd \
 		n8_scdwv.dd n9_scdwv.dd n10_scdwv.dd n11_scdwv.dd \
-                n12_scdwv.dd n13_scdwv.dd midi_scdwv.dd
+                n12_scdwv.dd n13_scdwv.dd midi_scdwv.dd \
+		z1_scdwv.dd z2_scdwv.dd z3_scdwv.dd \
+                z4_scdwv.dd z5_scdwv.dd z6_scdwv.dd z7_scdwv.dd \
 
 PIPE		= pipeman.mn pipeman_named.mn \
 		piper.dr \
@@ -100,11 +102,11 @@
 boot_ide: boot_ide.asm
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
-# DriveWire 3 Becker Booter
+# DriveWire Becker Booter
 boot_dw_becker: boot_dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1
 
-# DriveWire 3 Becker Submodule
+# DriveWire Becker Submodule
 dwio_becker.sb: dwio.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1
 
@@ -177,6 +179,9 @@
 DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
 		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
+# HDB-DOS for SuperDriver
+HDBDOS                  = -DHB $(SSDD35)
+
 ddd0_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
 
@@ -241,7 +246,7 @@
 ddr0_192k.dd: r0.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192 -DDD=1
 
-# DriveWire 3 SCF descriptors
+# DriveWire SCF descriptors
 term_scdwv.dt: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
 
@@ -290,7 +295,28 @@
 midi_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14
 
-# DriveWire 3 RBF descriptors
+z1_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
+
+z2_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
+
+z3_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
+
+z4_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
+
+z5_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
+
+z6_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
+
+z7_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
+
+# DriveWire RBF descriptors
 ddx0.dd: dwdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0