Mercurial > hg > Members > kono > nitros9-code

changeset 2799:5a3acdd1c7d6 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated level1/coco1/modules/makefile , level2/coco3/modules/makefile , & rules.mak for missing values for drive descriptors. Updated rules.mak to include values that should have been set for use in the level1/coco1/modules/makefile & level2/coco3/modules/makefile. Removed added values that aren't needed as those are now set in the rules.mak file.
author drencor-xeen
date Tue, 29 Jan 2013 01:08:53 -0600
parents b70d93f8d7ce
children dedf1ca5dc0a
files ChangeLog level1/coco1/modules/makefile level2/coco3/modules/makefile rules.mak
diffstat 4 files changed, 50 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 28 16:13:05 2013 -0600
+++ b/ChangeLog	Tue Jan 29 01:08:53 2013 -0600
@@ -1,6 +1,20 @@
 NitrOS-9 V3.2.9:
 
 ----------------------------------------------------------
+2013/01/29 David Ladd
+M ChangeLog
+M level1/coco1/modules/makefile
+M level2/coco3/modules/makefile
+M rules.mak
+
+Updated rules.mak to include values that should have been set
+for use in the level1/coco1/modules/makefile &
+level2/coco3/modules/makefile.
+
+Removed added values that aren't needed as those are now set
+in the rules.mak file.
+
+----------------------------------------------------------
 2013/01/28 David Ladd
 M ChangeLog
 M level1/coco1/modules/makefile
--- a/level1/coco1/modules/makefile	Mon Jan 28 16:13:05 2013 -0600
+++ b/level1/coco1/modules/makefile	Tue Jan 29 01:08:53 2013 -0600
@@ -139,7 +139,7 @@
 		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
 # HDB-DOS for SuperDriver
-HDBDOS                  = -DHB $(SSDD35)
+HDBDOS                  = -DHB $(SSDD35) -DITDNS=8 $(ID0)
 
 ddd0_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
@@ -271,31 +271,31 @@
 
 # TC^3 SCSI Descriptors
 dds0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1 -DITDRV=0
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1
 
 s0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD) -DITDRV=0
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD)
 
 s1_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD) -DITDRV=1
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD)
 
 s2_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD) -DITDRV=2
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD)
 
 s3_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD) -DITDRV=3
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD)
 
 s4_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD) -DITDRV=4
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD)
 
 s5_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD) -DITDRV=5
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD)
 
 s6_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD) -DITDRV=6
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD)
 
 sh_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS) -DITDRV=0 -DITDNS=8
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS)
 
 # IDE Descriptors
 ddi0_ide.dd: superdesc.asm
@@ -305,10 +305,10 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER)
 
 i1_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE) -DITDNS=1 -DITDRV=1
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE)
 
 ih_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS) -DITDNS=8
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS)
 
 # RFM descriptors
 ddy0.dd: rfmdesc.asm
--- a/level2/coco3/modules/makefile	Mon Jan 28 16:13:05 2013 -0600
+++ b/level2/coco3/modules/makefile	Tue Jan 29 01:08:53 2013 -0600
@@ -188,7 +188,7 @@
 		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
 # HDB-DOS for SuperDriver
-HDBDOS                  = -DHB $(SSDD35)
+HDBDOS                  = -DHB $(SSDD35) $(ID0) -DITDNS=8
 
 ddd0_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
@@ -348,25 +348,25 @@
 	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD)
 
 s1_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD) -DITDRV=1
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD)
 
 s2_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD) -DITDRV=2
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD)
 
 s3_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD) -DITDRV=3
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD)
 
 s4_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD) -DITDRV=4
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD)
 
 s5_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD) -DITDRV=5
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD)
 
 s6_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD) -DITDRV=6
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD)
 
 sh_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS) -DITDRV=0 -ITDNS=8
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS)
 
 # IDE Descriptors
 ddi0_ide.dd: superdesc.asm
@@ -376,10 +376,10 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER)
 
 i1_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE) -DITDNS=1 -DITDRV=1
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE)
 
 ih_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS) -DITDNS=8
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS)
 
 # RFM descriptors
 ddy0.dd: rfmdesc.asm
--- a/rules.mak	Mon Jan 28 16:13:05 2013 -0600
+++ b/rules.mak	Tue Jan 29 01:08:53 2013 -0600
@@ -97,11 +97,24 @@
 LEVEL2		= $(NITROS9DIR)/level2
 LEVEL3		= $(NITROS9DIR)/level3
 NOSLIB		= $(NITROS9DIR)/lib
-CC68L1          = $(LEVEL1)/coco
+CC68L1          = $(LEVEL1)/coco1
 CC368L2         = $(LEVEL2)/coco3
 CC363L2         = $(LEVEL2)/coco3_6309
 CC363L3         = $(LEVEL3)/coco3_6309
 
+# HDD Drive ID's
+ID0 = -DITDRV=0
+ID1 = -DITDRV=1
+ID2 = -DITDRV=2
+ID3 = -DITDRV=3
+ID4 = -DITDRV=4
+ID5 = -DITDRV=5
+ID6 = -DITDRV=6
+ID7 = -DITDRV=7
+SLAVE = -DITDNS=1
+MASTER = -DITDNS=0
+
+
 # C-Cubed Rules
 %.o: %.c
 	$(CC) $(CFLAGS) $< -r