Mercurial > hg > Members > kono > nitros9-code

changeset 2798:b70d93f8d7ce lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated coco1/modules/makefile and coco3/modules/makefile to help resolve issues with i(x) and s(x) descriptors. Updated level1/coco1/modules/makefile & level2/coco3/modules/makefile so that correct values would be sent to assembler when building superdesc.asm for s(x).dd and i(x).dd descriptors.
author drencor-xeen
date Mon, 28 Jan 2013 16:13:05 -0600
parents be0c9c15f08a
children 5a3acdd1c7d6
files ChangeLog level1/coco1/modules/makefile level1/modules/rb1773desc.asm level1/modules/rbdesc.asm level1/modules/rfmdesc.asm level1/modules/superdesc.asm level2/coco3/modules/makefile
diffstat 7 files changed, 128 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 28 13:12:14 2013 -0600
+++ b/ChangeLog	Mon Jan 28 16:13:05 2013 -0600
@@ -3,6 +3,21 @@
 ----------------------------------------------------------
 2013/01/28 David Ladd
 M ChangeLog
+M level1/coco1/modules/makefile
+M level1/modules/rb1773desc.asm
+M level1/modules/rbdesc.asm
+M level1/modules/rfmdesc.asm
+M level1/modules/superdesc.asm
+M level2/coco3/modules/makefile
+
+Updated level1/coco1/modules/makefile & level2/coco3/modules/makefile
+so that correct values would be sent to assembler when
+building superdesc.asm for s(x).dd and i(x).dd descripters.
+
+
+----------------------------------------------------------
+2013/01/28 David Ladd
+M ChangeLog
 M level1/modules/ddiskdesc.asm
 M level1/modules/dwdesc.asm
 M level1/modules/rb1773desc.asm
--- a/level1/coco1/modules/makefile	Mon Jan 28 13:12:14 2013 -0600
+++ b/level1/coco1/modules/makefile	Mon Jan 28 16:13:05 2013 -0600
@@ -271,31 +271,31 @@
 
 # TC^3 SCSI Descriptors
 dds0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1 -DITDRV=0
 
 s0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD) -DITDRV=0
 
 s1_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD) -DITDRV=1
 
 s2_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD) -DITDRV=2
 
 s3_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD) -DITDRV=3
 
 s4_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD) -DITDRV=4
 
 s5_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD) -DITDRV=5
 
 s6_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD) -DITDRV=6
 
 sh_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS) -DITDRV=0 -DITDNS=8
 
 # IDE Descriptors
 ddi0_ide.dd: superdesc.asm
@@ -305,10 +305,10 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER)
 
 i1_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE)
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE) -DITDNS=1 -DITDRV=1
 
 ih_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS)
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS) -DITDNS=8
 
 # RFM descriptors
 ddy0.dd: rfmdesc.asm
--- a/level1/modules/rb1773desc.asm	Mon Jan 28 13:12:14 2013 -0600
+++ b/level1/modules/rb1773desc.asm	Mon Jan 28 16:13:05 2013 -0600
@@ -80,7 +80,6 @@
 mgrnam   fcs   /RBF/
 drvnam   fcs   /rb1773/
 
-         emod  
+         emod
 eom      equ   *
-         end   
-
+         end
--- a/level1/modules/rbdesc.asm	Mon Jan 28 13:12:14 2013 -0600
+++ b/level1/modules/rbdesc.asm	Mon Jan 28 16:13:05 2013 -0600
@@ -12,29 +12,47 @@
 
 * 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   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
 
@@ -65,7 +83,7 @@
 mgrnam   fcs   /RBF/
 drvnam   fcs   /rbtest/
 
-         emod  
+         emod
 eom      equ   *
-         end   
+         end
 
--- a/level1/modules/rfmdesc.asm	Mon Jan 28 13:12:14 2013 -0600
+++ b/level1/modules/rfmdesc.asm	Mon Jan 28 16:13:05 2013 -0600
@@ -21,7 +21,9 @@
 atrv     set   ReEnt+rev
 rev      set   $00
 
+	IFNDEF	DNum
 DNum     set   0
+	ENDC
 
          mod   eom,name,tylg,atrv,mgrnam,drvnam
 
--- a/level1/modules/superdesc.asm	Mon Jan 28 13:12:14 2013 -0600
+++ b/level1/modules/superdesc.asm	Mon Jan 28 16:13:05 2013 -0600
@@ -9,7 +9,7 @@
 *  Bit Meaning
 *  --- ---------------------------------------------------------------
 *  7-0 HDB-DOS Drive Number (useful only if HDB-DOS bit set in IT.DNS)
-* 
+*
 * IT.TYP (offset $15)
 *  Bit Meaning
 *  --- ---------------------------------------------------------------
@@ -19,7 +19,7 @@
 *  4   Drive Size Query (1 = yes, 0 = no)
 *  2-3 Undefined
 *  0-1 Sector Size (0 = 256, 1 = 512, 2 = 1024, 3 = 2048)
-* 
+*
 * IT.DNS (offset $16) for SCSI Low Level Driver
 *  Bit Meaning
 *  --- ---------------------------------------------------------------
@@ -27,7 +27,7 @@
 *  4   Turbo Mode:  1 = use accelerated handshaking, 0 = standard
 *  3   HDB-DOS Partition Flag
 *  0-2 SCSI ID of the drive or controller (0-7)
-* 
+*
 * IT.DNS (offset $16) for IDE Low Level Driver
 *  Bit Meaning
 *  --- ---------------------------------------------------------------
@@ -52,58 +52,71 @@
                TTL       Super Driver Device Descriptor Template
 
 * Super Driver specific fields
-               IFEQ      ITDRV
+*               IFEQ      ITDRV
+		IFNDEF	ITDRV
 ITDRV          SET       $00
                ENDC
-               IFEQ      ITSTP
+*               IFEQ      ITSTP
+		IFNDEF	ITSTP
 ITSTP          SET       $00
                ENDC
-               IFEQ      ITTYP
+*               IFEQ      ITTYP
+		IFNDEF	ITTYP
 ITTYP          SET       $81
                ENDC
-               IFEQ      ITDNS
+*               IFEQ      ITDNS
+		IFNDEF	ITDNS
 ITDNS          SET       $00
                ENDC
 
-               IFEQ      ITSOFS1
+*               IFEQ      ITSOFS1
+		IFNDEF	ITSOFS1
 ITSOFS1        SET       $00
                ENDC
-               IFEQ      ITSOFS2
+*               IFEQ      ITSOFS2
+		IFNDEF	ITSOFS2
 ITSOFS2        SET       $00
                ENDC
-               IFEQ      ITSOFS3
+*               IFEQ      ITSOFS3
+		IFNDEF	ITSOFS3
 ITSOFS3        SET       $00
                ENDC
 
 * Geometry for an EZ-135
-               IFEQ      Sides
+*               IFEQ      Sides
+		IFNDEF	Sides
 Sides          SET       $40
                ENDC
-               IFEQ      Cyls
+*               IFEQ      Cyls
+		IFNDEF	Cyls
 Cyls           SET       $007f
                ENDC
-               IFEQ      SectTrk
+*               IFEQ      SectTrk
+		IFNDEF	SectTrk
 SectTrk        SET       $0020
                ENDC
-               IFEQ      SectTrk0
+*               IFEQ      SectTrk0
+		IFNDEF	SectTrk0
 SectTrk0       SET       $0020
                ENDC
-               IFEQ      Interlv
+*               IFEQ      Interlv
+		IFNDEF	Interlv
 Interlv        SET       $01
                ENDC
-               IFEQ      SAS
+*               IFEQ      SAS
+		IFNDEF	SAS
 SAS            SET       $08
                ENDC
 
-               IFP1      
+               IFP1
                USE       defsfile
                USE       rbsuper.d
                IFNE      IDE
                USE       ide.d
                ELSE
                USE       scsi.d
-               ENDC      
-               ENDC      
+               ENDC
+               ENDC
 
 tylg           SET       Devic+Objct
 atrv           SET       ReEnt+rev
@@ -113,9 +126,9 @@
 
                IFNE      CDROM
                FCB       DIR.+SHARE.+PEXEC.+PREAD.+EXEC.+READ.
-               ELSE      
+               ELSE
                FCB       DIR.+SHARE.+PEXEC.+PREAD.+PWRIT.+EXEC.+UPDAT.
-               ENDC      
+               ENDC
                FCB       HW.PAGE             extended controller address
                FDB       SDAddr              physical controller address
                FCB       initsize-*-1        initilization table size
@@ -149,45 +162,45 @@
                IFNE      NULL
 name           FCC       /NULL/
                FCB       ITDRV+$B0
-               ELSE      
+               ELSE
                IFNE      DD
 name           FCS       /DD/
-               ELSE      
+               ELSE
                IFNE      DRIVEWIRE
 name           FCC       /X/
                IFNE      HB
                FCS       /H/
-               ELSE      
+               ELSE
                FCB       ITDRV+$B0
-               ENDC      
-               ELSE      
+               ENDC
+               ELSE
                IFNE      IDE
 name           FCC       /I/
                IFNE      HB
                FCS       /H/
-               ELSE      
+               ELSE
                FCB       ITDRV+$B0
-               ENDC      
-               ELSE      
+               ENDC
+               ELSE
                IFNE      SD
 name           FCC       /SD/
                IFNE      HB
                FCS       /H/
-               ELSE      
+               ELSE
                FCB       ITDRV+$B0
-               ENDC      
-               ELSE      
+               ENDC
+               ELSE
 name           FCC       /S/
                IFNE      HB
                FCS       /H/
-               ELSE      
+               ELSE
                FCB       ITDRV+$B0
-               ENDC      
-               ENDC      
-               ENDC      
-               ENDC      
-               ENDC      
-               ENDC      
+               ENDC
+               ENDC
+               ENDC
+               ENDC
+               ENDC
+               ENDC
 
 mgrnam         FCS       /RBF/
 drvnam         FCS       /rbsuper/
@@ -195,38 +208,38 @@
                IFNE      NULL
                FCS       /llnull/
                FCB       0
-               ELSE      
+               ELSE
                IFNE      DRIVEWIRE
                FCS       /lldw/
                FCB       0,0,0
-               ELSE      
+               ELSE
                IFNE      TC3+SB
                FCS       /lltc3/
                FCB       0,0
-               ELSE      
+               ELSE
                IFNE      KTLR
                FCS       /llktlr/
                FCB       0
-               ELSE      
+               ELSE
                IFNE      HDII+D4N1
                FCS       /lldisto/
-               ELSE      
+               ELSE
                IFNE      IDE
                FCS       /llide/
                FCB       0,0
-               ELSE      
+               ELSE
                IFNE      SD
                FCS       /llsd/
                FCB       0,0,0
-               ENDC      
-               ENDC      
-               ENDC      
-               ENDC      
-               ENDC      
-               ENDC      
-               ENDC      
+               ENDC
+               ENDC
+               ENDC
+               ENDC
+               ENDC
+               ENDC
+               ENDC
 
 
-               EMOD      
+               EMOD
 eom            EQU       *
-               END       
+               END
--- a/level2/coco3/modules/makefile	Mon Jan 28 13:12:14 2013 -0600
+++ b/level2/coco3/modules/makefile	Mon Jan 28 16:13:05 2013 -0600
@@ -348,25 +348,25 @@
 	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD)
 
 s1_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD) -DITDRV=1
 
 s2_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD) -DITDRV=2
 
 s3_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD) -DITDRV=3
 
 s4_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD) -DITDRV=4
 
 s5_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD) -DITDRV=5
 
 s6_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD) -DITDRV=6
 
 sh_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS)
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS) -DITDRV=0 -ITDNS=8
 
 # IDE Descriptors
 ddi0_ide.dd: superdesc.asm
@@ -376,10 +376,10 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER)
 
 i1_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE)
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE) -DITDNS=1 -DITDRV=1
 
 ih_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS)
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS) -DITDNS=8
 
 # RFM descriptors
 ddy0.dd: rfmdesc.asm