changeset 2805:dedf1ca5dc0a lwtools-port

Merge with drencor's changes
author Boisy Pitre <boisy.pitre@nuance.com>
date Fri, 01 Feb 2013 19:47:39 -0600
parents eee10f550b6b (current diff) 5a3acdd1c7d6 (diff)
children 2eefe79fafe4
files
diffstat 13 files changed, 390 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 01 19:45:19 2013 -0600
+++ b/ChangeLog	Fri Feb 01 19:47:39 2013 -0600
@@ -1,6 +1,71 @@
 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
+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
+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
+
+Updated level2/coco3/bootfiles/makefile to create bootfiles
+for headless becker and headless arduino.
+
+Updated level2/coco3/makefile to create boot disk images
+for headless becker and headless arduino.
+
+----------------------------------------------------------
+2013/01/28 David Ladd
+M ChangeLog
+M level2/coco3/bootfiles/makefile
+
+Updated level2/coco3/bootfiles/makefile so that the becker
+os9boot file has ddx0.dd rather then ddd0.dd.
+
+----------------------------------------------------------
 2013/01/27 David Ladd
 M ChangeLog
 M level2/coco3/cmds/makefile
--- a/level1/coco1/modules/makefile	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/coco1/modules/makefile	Fri Feb 01 19:47:39 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
--- a/level1/modules/ddiskdesc.asm	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/modules/ddiskdesc.asm	Fri Feb 01 19:47:39 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
 
--- a/level1/modules/dwdesc.asm	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/modules/dwdesc.asm	Fri Feb 01 19:47:39 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
--- a/level1/modules/rb1773desc.asm	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/modules/rb1773desc.asm	Fri Feb 01 19:47:39 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
 
@@ -64,7 +80,6 @@
 mgrnam   fcs   /RBF/
 drvnam   fcs   /rb1773/
 
-         emod  
+         emod
 eom      equ   *
-         end   
-
+         end
--- a/level1/modules/rbdesc.asm	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/modules/rbdesc.asm	Fri Feb 01 19:47:39 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	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/modules/rfmdesc.asm	Fri Feb 01 19:47:39 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/scdwvdesc.asm	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/modules/scdwvdesc.asm	Fri Feb 01 19:47:39 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
 
--- a/level1/modules/superdesc.asm	Fri Feb 01 19:45:19 2013 -0600
+++ b/level1/modules/superdesc.asm	Fri Feb 01 19:47:39 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/bootfiles/makefile	Fri Feb 01 19:45:19 2013 -0600
+++ b/level2/coco3/bootfiles/makefile	Fri Feb 01 19:47:39 2013 -0600
@@ -65,8 +65,8 @@
 BOOTFILE_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(RBDWBECKER) \
+		$(MD)/ddx0.dd \
 		$(FLOPPY_40D) \
-	            $(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn \
 		$(VTIO_COGRF_80) \
 		$(MD)/scdwv.dr \
@@ -80,8 +80,8 @@
 BOOTFILE_ARDUINO	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(RBDWARDUINO) \
+                $(MD)/ddx0.dd \
 		$(FLOPPY_40D) \
-                $(MD)/ddx0.dd \
 		$(MD)/scf.mn \
 		$(VTIO_COGRF_80) \
 		$(MD)/scdwv.dr \
@@ -94,8 +94,8 @@
 BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(RBDW) \
+		$(MD)/ddx0.dd \
 		$(FLOPPY_40D) \
-                        $(MD)/ddx0.dd \
 		$(MD)/scf.mn \
 		$(VTIO_COGRF_80) \
 		$(MD)/scdwv.dr \
@@ -116,7 +116,37 @@
 BOOTFILE_DW_HEADLESS	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(RBDW) \
-          $(MD)/ddx0.dd \
+		$(MD)/ddx0.dd \
+		$(FLOPPY_40D) \
+		$(MD)/scf.mn \
+		$(MD)/scdwv.dr \
+		$(MD)/term_scdwv.dt \
+		$(SCDWV_NET) \
+		$(SCDWP) \
+		$(PIPE) \
+		$(CLOCK60HZDW)
+
+# NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
+# Headless mode Becker Port
+BOOTFILE_BECKER_HEADLESS	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(RBDWBECKER) \
+		$(MD)/ddx0.dd \
+		$(FLOPPY_40D) \
+		$(MD)/scf.mn \
+		$(MD)/scdwv.dr \
+		$(MD)/term_scdwv.dt \
+		$(SCDWV_NET) \
+		$(SCDWP) \
+		$(PIPE) \
+		$(CLOCK60HZDW)
+
+# NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
+# Headless mode Arduino
+BOOTFILE_ARDUINO_HEADLESS	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(RBDWARDUINO) \
+		$(MD)/ddx0.dd \
 		$(FLOPPY_40D) \
 		$(MD)/scf.mn \
 		$(MD)/scdwv.dr \
@@ -163,7 +193,10 @@
 		$(PIPE) \
 		$(CLOCK50HZ)
 
-BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw bootfile_dw_headless bootfile_becker bootfile_arduino
+BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d \
+		bootfile_80d_50hz bootfile_dw bootfile_dw_headless \
+		bootfile_becker bootfile_arduino bootfile_becker_headless \
+		bootfile_arduino_headless
 KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw kernel_becker kernel_arduino
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
@@ -195,6 +228,12 @@
 bootfile_dw_headless: $(BOOTFILE_DW_HEADLESS) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_DW_HEADLESS)>$@
 
+bootfile_becker_headless: $(BOOTFILE_BECKER_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_BECKER_HEADLESS)>$@
+
+bootfile_arduino_headless: $(BOOTFILE_ARDUINO_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_ARDUINO_HEADLESS)>$@
+
 # Kernels
 kernel_becker: $(KERNEL_BECKER) $(DEPENDS)
 	$(MERGE) $(KERNEL_BECKER)>$@
--- a/level2/coco3/makefile	Fri Feb 01 19:45:19 2013 -0600
+++ b/level2/coco3/makefile	Fri Feb 01 19:47:39 2013 -0600
@@ -11,6 +11,8 @@
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
 BOOTFILE_BECKER	= bootfiles/bootfile_becker
 BOOTFILE_ARDUINO	= bootfiles/bootfile_arduino
+BOOTFILE_BECKER_HEADLESS	= bootfiles/bootfile_becker_headless
+BOOTFILE_ARDUINO_HEADLESS	= bootfiles/bootfile_arduino_headless
 BOOTFILE_DW 	= bootfiles/bootfile_dw
 BOOTFILE_DWHEADLESS	= bootfiles/bootfile_dw_headless
 BOOTFILE_40D	= bootfiles/bootfile_40d
@@ -55,6 +57,8 @@
 LDSK360K_1_50HZ	= $(DISTRONAME)_40d_1_50hz.dsk
 DSKBECKER	= $(DISTROVER)_becker.dsk
 DSKARDUINO	= $(DISTROVER)_arduino.dsk
+DSKBECKERHEADLESS	= $(DISTROVER)_becker_headless.dsk
+DSKARDUINOHEADLESS	= $(DISTROVER)_arduino_headless.dsk
 DSK360K_2	= $(DISTROVER)_40d_2.dsk
 LDSK360K_2	= $(DISTRONAME)_40d_2.dsk
 DSK720K		= $(DISTROVER)_80d.dsk
@@ -63,10 +67,18 @@
 LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 LDSKBECKER	= $(DISTRONAME)_becker.dsk
 LDSKARDUINO	= $(DISTRONAME)_arduino.dsk
+LDSKBECKERHEADLESS	= $(DISTRONAME)_becker_headless.dsk
+LDSKARDUINOHEADLESS	= $(DISTRONAME)_arduino_headless.dsk
 TESTDSK		= test.dsk
 
-DSKS		= $(DSKDW) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ) $(DSKDW) $(DSKDWHEADLESS) $(DSKBECKER) $(DSKARDUINO)
-LDSKS		= $(LDSKDW) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ) $(LDSKDW) $(LDSKDWHEADLESS) $(LDSKBECKER) $(LDSKARDUINO)
+DSKS		= $(DSKDW) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) \
+		$(DSK720K) $(DSK720K_50HZ) $(DSKDW) $(DSKDWHEADLESS) \
+		$(DSKBECKER) $(DSKARDUINO) $(DSKBECKERHEADLESS) \
+		$(DSKARDUINOHEADLESS)
+LDSKS		= $(LDSKDW) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) \
+		$(LDSK720K) $(LDSK720K_50HZ) $(LDSKDW) $(LDSKDWHEADLESS) \
+		$(LDSKBECKER) $(LDSKARDUINO) $(LDSKBECKERHEADLESS) \
+		$(LDSKARDUINOHEADLESS)
 
 # Make all components
 all:
@@ -312,6 +324,114 @@
 	$(RM) $(LDSKDWHEADLESS)
 	$(SOFTLINK) $@ $(LDSKDWHEADLESS)
 
+$(DSKBECKERHEADLESS):
+	-$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9GEN) $@ -b=$(BOOTFILE_BECKER_HEADLESS) -t=$(KERNELFILE_BECKER)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(CP) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9ATTR_EXEC) $@,sysgo
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
+	$(CPL) $(STARTUP_DW) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/$(DISTRO)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSKBECKERHEADLESS)
+	$(SOFTLINK) $@ $(LDSKBECKERHEADLESS)
+
+$(DSKARDUINOHEADLESS):
+	-$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9GEN) $@ -b=$(BOOTFILE_ARDUINO_HEADLESS) -t=$(KERNELFILE_ARDUINO)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(CP) modules/$(CCBKRN) $@,$(CCBKRN)
+	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9ATTR_EXEC) $@,sysgo
+	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
+	$(CPL) $(STARTUP_DW) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/$(DISTRO)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSKARDUINOHEADLESS)
+	$(SOFTLINK) $@ $(LDSKARDUINOHEADLESS)
+
 $(DSK360K_1):
 	-$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
--- a/level2/coco3/modules/makefile	Fri Feb 01 19:45:19 2013 -0600
+++ b/level2/coco3/modules/makefile	Fri Feb 01 19:47:39 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
--- a/rules.mak	Fri Feb 01 19:45:19 2013 -0600
+++ b/rules.mak	Fri Feb 01 19:47:39 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