# HG changeset patch
# User drencor-xeen
# Date 1359400334 21600
# Node ID be0c9c15f08abd6ac03d1f50fbd484335e4756eb
# Parent  fb494c32bd683b47b55e3ef9a58843d9c6b2e7ea
Updated ddiskdesc.asm and rb1773desc.asm so would work with lwtools.

Updated level1/modules/ddiskdesc.asm so that if default
values are not given by assembler define command statement
then definitions are set to a default value.

Updated level1/modules/rb1773desc.asm so that if default
values are not given by assembler define command statement
then definitions are set to a default value.

diff -r fb494c32bd68 -r be0c9c15f08a ChangeLog
--- a/ChangeLog	Mon Jan 28 02:25:28 2013 -0600
+++ b/ChangeLog	Mon Jan 28 13:12:14 2013 -0600
@@ -3,6 +3,22 @@
 ----------------------------------------------------------
 2013/01/28 David Ladd
 M ChangeLog
+M level1/modules/ddiskdesc.asm
+M level1/modules/dwdesc.asm
+M level1/modules/rb1773desc.asm
+M level1/modules/scdwvdesc.asm
+
+Updated level1/modules/ddiskdesc.asm so that if default
+values are not given by assembler define command statement
+then definitions are set to a default value.
+
+Updated level1/modules/rb1773desc.asm so that if default
+values are not given by assembler define command statement
+then definitions are set to a default value.
+
+----------------------------------------------------------
+2013/01/28 David Ladd
+M ChangeLog
 M level2/coco3/bootfiles/makefile
 M level2/coco3/makefile
 
diff -r fb494c32bd68 -r be0c9c15f08a level1/modules/ddiskdesc.asm
--- a/level1/modules/ddiskdesc.asm	Mon Jan 28 02:25:28 2013 -0600
+++ b/level1/modules/ddiskdesc.asm	Mon Jan 28 13:12:14 2013 -0600
@@ -7,52 +7,70 @@
 * Comment
 * Converted rb1773 to ddisk for Dragon disks.
 * ------------------------------------------------------------------
-* 
+*
 * 2005-06-20, P.Harvey-Smith.
 *	Added DragonAlpha define to correctly define the I/O port on the
 *	Dragon ALpha/Professional
-* 
+*
 *
 		nam   ddiskdesc
 		ttl   ddisk Device Descriptor Template
 
 * Disassembled 98/08/23 17:09:41 by Disasm v1.6 (C) 1988 by RML
 
-		ifp1  
+		ifp1
 		use   defsfile
-		endc  
+		endc
 
 tylg    	set   	Devic+Objct
 atrv    	set   	ReEnt+rev
 rev     	set   	$00
 
+		IFNDEF	DNum
 DNum    	set   	0
+		ENDC
 		IFNE  	D35
 Type    	set   	TYP.CCF+TYP.3
 		ELSE
 Type    	set   	TYP.CCF+TYP.5
 		ENDC
+		IFNDEF	Density
 Density 	set   	DNS.MFM
+		ENDC
+		IFNDEF	Step
 Step    	set   	STP.6ms
+		ENDC
+		IFNDEF	Cyls
 Cyls    	set   	40
+		ENDC
+		IFNDEF	Sides
 Sides   	set   	1
+		ENDC
 Verify  	set   	1
+		IFNDEF	SectTrk
 SectTrk 	set   	18
+		ENDC
+		IFNDEF	SectTrk0
 SectTrk0	set   	18
+		ENDC
+		IFNDEF	Interlv
 Interlv 	set   	2
+		ENDC
+		IFNDEF	SAS
 SAS     	set   	8
+		ENDC
 
 		mod   	eom,name,tylg,atrv,mgrnam,drvnam
 
 		fcb   	DIR.!SHARE.!PEXEC.!PWRIT.!PREAD.!EXEC.!UPDAT. mode byte
 		fcb   	HW.Page    	extended controller address
-		
+
 		IFEQ	DragonAlpha-1
 		fdb   	$FF2C      	physical controller address
 		ELSE
 		fdb   	$FF40      	physical controller address
 		ENDC
-		
+
 		fcb   	initsize-*-1 	initalization table size
 		fcb   	DT.RBF     	device type:0=scf,1=rbf,2=pipe,3=scf
 		fcb   	DNum       	drive number
@@ -76,7 +94,7 @@
 mgrnam  	fcs   	/RBF/
 drvnam  	fcs   	/DDisk/
 
-		emod  
+		emod
 eom     	equ   *
-		end   
+		end
 
diff -r fb494c32bd68 -r be0c9c15f08a level1/modules/dwdesc.asm
--- a/level1/modules/dwdesc.asm	Mon Jan 28 02:25:28 2013 -0600
+++ b/level1/modules/dwdesc.asm	Mon Jan 28 13:12:14 2013 -0600
@@ -12,9 +12,9 @@
          nam   DWDesc
          ttl   DriveWire Device Descriptor Template
 
-         ifp1  
+         ifp1
          use   defsfile
-         endc  
+         endc
 
 tylg     set   Devic+Objct
 atrv     set   ReEnt+rev
@@ -23,7 +23,7 @@
          IFNDEF  DNum
 DNum     set   0
          ENDC
-         
+
 Type     set   TYP.HARD
 Density  set   0
 Step     set   0
diff -r fb494c32bd68 -r be0c9c15f08a level1/modules/rb1773desc.asm
--- a/level1/modules/rb1773desc.asm	Mon Jan 28 02:25:28 2013 -0600
+++ b/level1/modules/rb1773desc.asm	Mon Jan 28 13:12:14 2013 -0600
@@ -20,21 +20,37 @@
 atrv     set   ReEnt+rev
 rev      set   $00
 
+	IFNDEF	DNum
 DNum     set   0
+	ENDC
          IFNE  D35
 Type     set   TYP.CCF+TYP.3
          ELSE
 Type     set   TYP.CCF+TYP.5
          ENDC
+	IFNDEF	Density
 Density  set   DNS.MFM
+	ENDC
 Step     set   STP.6ms
+	IFNDEF	Cyls
 Cyls     set   35
+	ENDC
+	IFNDEF	Sides
 Sides    set   1
+	ENDC
 Verify   set   1
+	IFNDEF	SectTrk
 SectTrk  set   18
+	ENDC
+	IFNDEF	SectTrk0
 SectTrk0 set   18
+	ENDC
+	IFNDEF	Interlv
 Interlv  set   3
+	ENDC
+	IFNDEF	SAS
 SAS      set   8
+	ENDC
 
          mod   eom,name,tylg,atrv,mgrnam,drvnam
 
diff -r fb494c32bd68 -r be0c9c15f08a level1/modules/scdwvdesc.asm
--- a/level1/modules/scdwvdesc.asm	Mon Jan 28 02:25:28 2013 -0600
+++ b/level1/modules/scdwvdesc.asm	Mon Jan 28 13:12:14 2013 -0600
@@ -16,7 +16,7 @@
 * Made U and T descriptor templates. Backspace is now $7F for
 * telnet clients which are likely to access the T ports.
 *
-* This descriptor has slightly different defaults, intended to be used as 
+* This descriptor has slightly different defaults, intended to be used as
 * the channel for the DriveWire utilities
 *
 *   0.6    2010/01/12  Boisy G. Pitre
@@ -31,9 +31,9 @@
          nam   scdwdesc
          ttl   DriveWire Virtual Device Descriptor
 
-         ifp1  
+         ifp1
          use   defsfile
-         endc  
+         endc
 
 tylg     set   Devic+Objct
 atrv     set   ReEnt+rev
@@ -130,7 +130,7 @@
 mgrnam   fcs   /SCF/
 drvnam   fcs   /scdwv/
 
-         emod  
+         emod
 eom      equ   *
-         end   
+         end