Mercurial > hg > Members > kono > nitros9-code

changeset 2059:46aa4db8204e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More changes
author boisy
date Mon, 24 Apr 2006 18:02:14 +0000
parents 27b36e424a4d
children 1a29c44561b3
files defs/os9defs level1/dalpha/bootfiles/makefile level1/dalpha/cmds/makefile level1/dalpha/modules/kernel/makefile level1/dalpha/modules/makefile level1/dalpha/sys/makefile level1/makefile level1/modules/init.asm level1/modules/sysgo.asm level2/makefile
diffstat 10 files changed, 182 insertions(+), 424 deletions(-) [+]
line wrap: on
line diff
--- a/defs/os9defs	Mon Apr 24 12:59:17 2006 +0000
+++ b/defs/os9defs	Mon Apr 24 18:02:14 2006 +0000
@@ -707,7 +707,9 @@
 OSMinor        RMB       1                   OS minor
 Feature1       RMB       1                   feature byte 1
 Feature2       RMB       1                   feature byte 2
-               RMB       8                   reserved for future use
+OSName         RMB       2                   OS name string
+MachineName    RMB       2                   machine name string
+               RMB       6                   reserved for future use
 
                IFGT      Level-1
 * -- VTIO area -- (NitrOS-9 Level 2 and above) *
@@ -720,6 +722,8 @@
 * Feature1 byte definitions
 CRCOn          EQU       %00000001           CRC checking on
 CRCOff         EQU       %00000000           CRC checking off
+Proc6809       EQU       %00000000           6809 procesor
+Proc6309       EQU       %00000010           6309 procesor
 
                PAG       
 **************************
--- a/level1/dalpha/bootfiles/makefile	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/dalpha/bootfiles/makefile	Mon Apr 24 18:02:14 2006 +0000
@@ -27,267 +27,88 @@
 
 DEPENDS		= ./makefile
 
-KERNEL_D64	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		  $(MD)/boot_d64
-
-KERNEL_D64TANO	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		  $(MD)/boot_1773_tano
-
-KERNEL_DALPHA	= $(MD)/rel_dalpha $(MD)/krn $(MD)/krnp2 $(MD)/init \
+KERNEL	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		  $(MD)/boot_dalpha
 
-IDE	= $(3PD)/ide
-SCSI	= $(3PD)/scsisys
-
+#Dragon Alpha Bootfiles
 
-#Dragon 32+/64 bootfiles.
-
-BOOTFILE_D64_DS40_32 = $(MD)/ioman \
+BOOTFILE_COVDG_SS80 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40d_d64.dd \
-		$(MD)/d0_40d_d64.dd $(MD)/d1_40d_d64.dd \
-		$(MD)/d2_40d_d64.dd $(MD)/d3_40d_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_DS40_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40d_d64.dd \
-		$(MD)/d0_40d_d64.dd $(MD)/d1_40d_d64.dd \
-		$(MD)/d2_40d_d64.dd $(MD)/d3_40d_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/rbf.mn $(MD)/adisk.dr \
+		$(MD)/ddd0_80s.dd\
+                $(MD)/d0_80s.dd $(MD)/d1_80s.dd \
+                $(MD)/d2_80s.dd $(MD)/d3_80s.dd \
+                $(MD)/scf.mn \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_D64_SS40_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40s_d64.dd \
-		$(MD)/d0_40s_d64.dd $(MD)/d1_40s_d64.dd \
-		$(MD)/d2_40s_d64.dd $(MD)/d3_40s_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_SS40_51 = $(MD)/ioman \
+BOOTFILE_COHR_SS80 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_40s_d64.dd \
-		$(MD)/d0_40s_d64.dd $(MD)/d1_40s_d64.dd \
-		$(MD)/d2_40s_d64.dd $(MD)/d3_40s_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_DS80_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64_DS80_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/ddisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/rbf.mn $(MD)/adisk.dr \
+		$(MD)/ddd0_80s.dd\
+                $(MD)/d0_80s.dd $(MD)/d1_80s.dd \
+                $(MD)/d2_80s.dd $(MD)/d3_80s.dd \
+                $(MD)/scf.mn \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-#Tano Dragon 64, using RS-Dos cartrage and 60Hz clock (NTSC)
-
-BOOTFILE_D64TANO_DS40_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d_d64tano.dd \
-		$(MD)/d0_40d_d64tano.dd $(MD)/d1_40d_d64tano.dd \
-		$(MD)/d2_40d_d64tano.dd $(MD)/d3_40d_d64tano.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64TANO_DS40_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d_d64tano.dd \
-		$(MD)/d0_40d_d64tano.dd $(MD)/d1_40d_d64tano.dd \
-		$(MD)/d2_40d_d64tano.dd $(MD)/d3_40d_d64tano.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-
-BOOTFILE_D64TANO_DS80_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80_d64tano.dd \
-		$(MD)/d0_80_d64tano.dd $(MD)/d1_80_d64tano.dd \
-		$(MD)/d2_80_d64tano.dd $(MD)/d3_80_d64tano.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_D64TANO_DS80_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80_d64tano.dd \
-		$(MD)/d0_80_d64tano.dd $(MD)/d1_80_d64tano.dd \
-		$(MD)/d2_80_d64tano.dd $(MD)/d3_80_d64tano.dd \
-		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-#Dragon Alpha Bootfiles
-
-BOOTFILE_DALPHA_SS80_32 = $(MD)/ioman \
+BOOTFILE_COVDG_DS80 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
 		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_dalpha.dd\
-                $(MD)/d0_dalpha.dd $(MD)/d1_dalpha.dd \
-                $(MD)/d2_dalpha.dd $(MD)/d3_dalpha.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
+		$(MD)/d2_80d.dd $(MD)/d3_80d.dd \
                 $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_DALPHA_SS80_51 = $(MD)/ioman \
+BOOTFILE_COHR_DS80 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
 		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_dalpha.dd\
-                $(MD)/d0_dalpha.dd $(MD)/d1_dalpha.dd \
-                $(MD)/d2_dalpha.dd $(MD)/d3_dalpha.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
+		$(MD)/d2_80d.dd $(MD)/d3_80d.dd \
                 $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_DALPHA_DS80_32 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
-                $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILE_DALPHA_DS80_51 = $(MD)/ioman \
-		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/rbf.mn $(MD)/adisk.dr \
-		$(MD)/ddd0_80_d64.dd \
-		$(MD)/d0_80_d64.dd $(MD)/d1_80_d64.dd \
-		$(MD)/d2_80_d64.dd $(MD)/d3_80_d64.dd \
-                $(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_50hz $(MD)/clock2_soft \
-		$(MD)/sysgo_dd
-
-BOOTFILES	= bootfile_d64_DS40_51 bootfile_d64_DS40_32 \
-		  bootfile_d64_SS40_51 bootfile_d64_SS40_32 \
-		  bootfile_d64_DS80_51 bootfile_d64_DS80_32 \
-		  bootfile_d64tano_DS40_51 bootfile_d64tano_DS40_32 \
-		  bootfile_d64tano_DS80_51 bootfile_d64tano_DS80_32 \
-		  bootfile_dalpha_SS80_32 bootfile_dalpha_SS80_51 \
-		  bootfile_dalpha_DS80_32 bootfile_dalpha_DS80_51
+BOOTFILES	= bootfile_covdg_ss80 bootfile_cohr_ss80 \
+			bootfile_covdg_ds80 bootfile_cohr_ds80
 		  
-KERNELS		= kernel_d64 kernel_d64tano kernel_dalpha
+KERNELS		= kernel
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
 all:	$(ALLOBJS)
 
 echo:	
-	@$(ECHO) $(BOOTFILE_D64_DS40_32)
-
-# Dragon64 Disk boot
-bootfile_d64_DS40_32: 	$(BOOTFILE_D64_DS40_32) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_32)>$@
-
-bootfile_d64_DS40_51: 	$(BOOTFILE_D64_DS40_51) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_51)>$@
-			
-bootfile_d64_SS40_32: 	$(BOOTFILE_D64_DS40_32) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_32)>$@
-
-bootfile_d64_SS40_51: 	$(BOOTFILE_D64_DS40_51) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS40_51)>$@
+	@$(ECHO) $(BOOTFILE_COVDG_SS80)
 
-bootfile_d64_DS80_32: 	$(BOOTFILE_D64_DS80_32) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS80_32)>$@
-
-bootfile_d64_DS80_51: 	$(BOOTFILE_D64_DS80_51) $(DEPENDS)
-			$(MERGE) $(BOOTFILE_D64_DS80_51)>$@
-
-#Tano bootfiles
-bootfile_d64tano_DS40_32: 	$(BOOTFILE_D64TANO_DS40_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS40_32)>$@
-
-bootfile_d64tano_DS40_51: 	$(BOOTFILE_D64TANO_DS40_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS40_51)>$@
-
-bootfile_d64tano_DS80_32: 	$(BOOTFILE_D64TANO_DS80_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS80_32)>$@
-
-bootfile_d64tano_DS80_51: 	$(BOOTFILE_D64TANO_DS80_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS80_51)>$@
 
 # Dragon Alpha Disk boot
-bootfile_dalpha_SS80_32: 	$(BOOTFILE_DALPHA_SS80_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_SS80_32)>$@
+bootfile_covdg_ss80: 	$(BOOTFILE_COVDG_SS80) $(DEPENDS)
+				$(MERGE) $^ > $@
 
-bootfile_dalpha_SS80_51: 	$(BOOTFILE_DALPHA_SS80_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_SS80_51)>$@
-
-bootfile_dalpha_DS80_32: 	$(BOOTFILE_DALPHA_DS80_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_DS80_32)>$@
+bootfile_cohr_ss80: 	$(BOOTFILE_COHR_SS80) $(DEPENDS)
+				$(MERGE) $^ > $@
 
-bootfile_dalpha_DS80_51: 	$(BOOTFILE_DALPHA_DS80_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_DALPHA_DS80_51)>$@
+bootfile_covdg_ds80: 	$(BOOTFILE_COVDG_DS80) $(DEPENDS)
+				$(MERGE) $^ > $@
 
-# Dragon 64 WD2797 Kernel
-kernel_d64: 	$(KERNEL_D64) $(DEPENDS)
-		$(MERGE) $(KERNEL_D64)>$@
-		$(PADROM) 4096 $@
-
-# Tano Dragon 64 WD1773 Kernel
-kernel_d64tano:	$(KERNEL_D64TANO) $(DEPENDS)
-		$(MERGE) $(KERNEL_D64TANO)>$@
-		$(PADROM) 4096 $@
+bootfile_cohr_ds80: 	$(BOOTFILE_COHR_DS80) $(DEPENDS)
+				$(MERGE) $^ > $@
 
 # Dragon Alpha WD2797 Kernel
-kernel_dalpha: 	$(KERNEL_D64) $(DEPENDS)
-		$(MERGE) $(KERNEL_DALPHA)>$@
+kernel: 	$(KERNEL) $(DEPENDS)
+		$(MERGE) $(KERNEL)>$@
 		$(PADROM) 4096 $@
 
 clean:
--- a/level1/dalpha/cmds/makefile	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/dalpha/cmds/makefile	Mon Apr 24 18:02:14 2006 +0000
@@ -1,7 +1,7 @@
 PORT = dalpha
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
 
 DEPENDS		= ./makefile
 
--- a/level1/dalpha/modules/kernel/makefile	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/dalpha/modules/kernel/makefile	Mon Apr 24 18:02:14 2006 +0000
@@ -1,7 +1,9 @@
+PORT = dalpha
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/modules/kernel
+vpath %.asm $(LEVEL1)/modules/kernel
 
+AFLAGS		+= -I$(LEVEL1)/modules/kernel
 DEPENDS		= ./makefile
 
 KERNEL		= krn
--- a/level1/dalpha/modules/makefile	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/dalpha/modules/makefile	Mon Apr 24 18:02:14 2006 +0000
@@ -23,8 +23,9 @@
 PORT = dalpha
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(6809L1)/modules
+vpath %.asm $(LEVEL1)/modules
 
+AFLAGS			+= -I$(LEVEL1)/modules
 CLOCKELIM       = -aRTCElim=1
 CLOCKDISTO2     = -aRTCDsto2=1
 CLOCKDISTO4     = -aRTCDsto4=1
@@ -39,9 +40,9 @@
 DEPENDS		= ./makefile
 TPB		= $(3RDPARTY)/booters
 
-BOOTERS		= boot_d64 boot_1773_tano boot_dalpha
+BOOTERS		= boot_dalpha
 
-BOOTTRACK	= rel $(BOOTERS) rel_dalpha
+BOOTTRACK	= rel $(BOOTERS)
 KERNEL		= krn krnp2
 SYSMODS		= ioman init sysgo_dd sysgo_h0
 
@@ -51,22 +52,16 @@
 		clock2_messemu clock2_jvemu 
 
 RBF		= rbf.mn \
-		ddisk.dr \
-		ddd0_40d_d64.dd d0_40d_d64.dd d1_40d_d64.dd d2_40d_d64.dd d3_40d_d64.dd \
-		ddd0_40s_d64.dd d0_40s_d64.dd d1_40s_d64.dd d2_40s_d64.dd d3_40s_d64.dd \
-		ddd0_80_d64.dd d0_80_d64.dd d1_80_d64.dd d2_80_d64.dd d3_80_d64.dd \
-		rb1773.dr \
-		ddd0_40d_d64tano.dd d0_40d_d64tano.dd d1_40d_d64tano.dd d2_40d_d64tano.dd d3_40d_d64tano.dd \
-		ddd0_80_d64tano.dd d0_80_d64tano.dd d1_80_d64tano.dd d2_80_d64tano.dd d3_80_d64tano.dd \
 		adisk.dr \
-		ddd0_dalpha.dd d0_dalpha.dd d1_dalpha.dd d2_dalpha.dd d3_dalpha.dd
+		ddd0_80s.dd ddd0_80d.dd d0_80s.dd d0_80d.dd d1_80s.dd d1_80d.dd \
+		d2_80s.dd d2_80d.dd d3_80s.dd d3_80d.dd
 		
 SCF		= scf.mn \
-		vrn.dr printer_d64.dr sspak.dr vtio.dr \
+		vrn.dr scdpp.dr sspak.dr vtio.dr \
 		covdg.io cohr.io\
-		nil.dd p_d64.dd pipe.dd ssp.dd \
-		term_sc6551.dt t1.dd t2_sc6551.dd t3_sc6551.dt \
-		term32.dt term51.dt term80.dt t1_d64.dd p1_d64.dd
+		nil.dd p_dpp.dd pipe.dd ssp.dd \
+		term_sc6551.dt t2_sc6551.dt t3_sc6551.dt \
+		term32.dt term51.dt term80.dt p1_sc6551dragon.dd
 
 PIPE		= pipeman.mn \
 		piper.dr \
@@ -83,14 +78,8 @@
 	$(CD) kernel; make $@
 	$(CP) kernel/$@ .
 
-boot_d64:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP)
-
-boot_1773_tano:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=$(STEP)
-
 boot_dalpha:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP) -aDragonAlpha=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=0
 
 # Clocks
 clock_60hz: clock.asm
@@ -105,136 +94,54 @@
 clock2_cloud9: clock2_ds1315.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
 
-#Terminals, vtio, is compiled with code to remap keyboad from CoCo to Dragon layout.
-vtio.dr: vtio.asm
-	$(AS) $(ASFLAGS) $(ASOUT)$@ $<  -aDragonIO=1
-
 # Floppy descriptors
 SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
+		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0
 SSDD40		= -aCyls=40 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
+		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0
 DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
+		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0
 SSDD80		= -aCyls=80 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35
+		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=0
 DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35
-
-#Dragon 64
-#Dragon 64 Drives can be double or single sided, but assume 
-# that /d0 and /d1 are double sided 40 track.
-
-ddd0_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=3 -aStep=$(STEP)
-
-#Single sided 40 track drives.
-ddd0_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=3 -aStep=$(STEP)
-
-
-ddd0_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aStep=$(STEP)
-
-d1_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1 -aStep=$(STEP)
-
-d2_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
-
-d3_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
-
-#
-#Tano Dragon 64, using rb1773 driver
-# 40 track DS
-ddd0_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=3 -aStep=$(STEP)
-
-#80track DS
-ddd0_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aStep=$(STEP)
-
-d1_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1 -aStep=$(STEP)
-
-d2_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
-
-d3_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
-
+		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=0
 
 #Dragon Alpha
 # Internal drives on Alpha are Single Sided 80 track.
 
-ddd0_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
+ddd0_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aDD=1
+
+ddd0_80d.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
 
-d0_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aStep=$(STEP)
+d0_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0
+	
+d0_80d.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
 	
-d1_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=1 -aStep=$(STEP)
+d1_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=1
+
+d1_80d.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
+
+d2_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=2
 
-d2_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
+d2_80d.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
 
-d3_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
+d3_80s.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=3
+
+d3_80d.dd: ddiskdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3
 
 adisk.dr: ddisk.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDragonAlpha=1
-
+	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 
-rel: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=1
-
-rel_dalpha: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=1 -aDragonAlpha=1
-	
 
 sysgo_dd: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
@@ -242,12 +149,6 @@
 sysgo_h0: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
-sysgo_d64: sysgo_d64.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-ddisk.dr: ddisk.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ -aUPGRADED32=$(UPGRADED32) $< 
-
 
 clean:
 	$(CD) kernel; make $@
@@ -279,5 +180,3 @@
 
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)
-
-
--- a/level1/dalpha/sys/makefile	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/dalpha/sys/makefile	Mon Apr 24 18:02:14 2006 +0000
@@ -1,22 +1,23 @@
 PORT = dalpha
 include $(NITROS9DIR)/rules.mak
 
+vpath %.hp	$(LEVEL1)/sys
+
 DEPENDS		= ./makefile
-HD		= $(6809L1)/sys
 
 SYSFILES	= errmsg motd password
-HELPFILES	= $(HD)/asm.hp $(HD)/attr.hp $(HD)/backup.hp $(HD)/binex.hp $(HD)/build.hp $(HD)/chd.hp \
-		$(HD)/chx.hp $(HD)/cmp.hp $(HD)/cobbler.hp $(HD)/config.hp $(HD)/copy.hp $(HD)/cputype.hp $(HD)/date.hp \
-		$(HD)/dcheck.hp $(HD)/debug.hp $(HD)/ded.hp $(HD)/deiniz.hp $(HD)/del.hp $(HD)/deldir.hp $(HD)/devs.hp \
-		$(HD)/dir.hp $(HD)/dirsort.hp $(HD)/disasm.hp $(HD)/display.hp $(HD)/dmode.hp $(HD)/dsave.hp $(HD)/dump.hp $(HD)/echo.hp \
-		$(HD)/edit.hp $(HD)/error.hp $(HD)/ex.hp $(HD)/exbin.hp $(HD)/format.hp $(HD)/free.hp $(HD)/gfx.hp \
-		$(HD)/help.hp $(HD)/ident.hp $(HD)/iniz.hp $(HD)/inkey.hp $(HD)/irqs.hp $(HD)/kill.hp $(HD)/link.hp \
-		$(HD)/list.hp $(HD)/load.hp $(HD)/login.hp $(HD)/makdir.hp \
-		$(HD)/mdir.hp $(HD)/megaread.hp $(HD)/merge.hp $(HD)/mpi.hp $(HD)/mfree.hp $(HD)/os9gen.hp \
-		$(HD)/padrom.hp $(HD)/park.hp $(HD)/procs.hp $(HD)/prompt.hp $(HD)/pwd.hp $(HD)/pxd.hp \
-	 	$(HD)/rename.hp $(HD)/save.hp $(HD)/setime.hp \
-		$(HD)/setpr.hp $(HD)/shell.hp $(HD)/sleep.hp $(HD)/tee.hp $(HD)/tmode.hp $(HD)/touch.hp $(HD)/tsmon.hp \
-		$(HD)/tuneport.hp $(HD)/unlink.hp $(HD)/verify.hp $(HD)/xmode.hp
+HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
+		chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp date.hp \
+		dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
+		dir.hp dirsort.hp disasm.hp display.hp dmode.hp dsave.hp dump.hp echo.hp \
+		edit.hp error.hp ex.hp exbin.hp format.hp free.hp gfx.hp \
+		help.hp ident.hp iniz.hp inkey.hp irqs.hp kill.hp link.hp \
+		list.hp load.hp login.hp makdir.hp \
+		mdir.hp megaread.hp merge.hp mpi.hp mfree.hp os9gen.hp \
+		padrom.hp park.hp procs.hp prompt.hp pwd.hp pxd.hp \
+	 	rename.hp save.hp setime.hp \
+		setpr.hp shell.hp sleep.hp tee.hp tmode.hp touch.hp tsmon.hp \
+		tuneport.hp unlink.hp verify.hp xmode.hp
 HELPMSG		= helpmsg
 ALLOBJS		= $(SYSFILES) $(HELPMSG)
 
@@ -26,7 +27,7 @@
 alldragon: $(ALLOBJS)
 
 helpmsg: $(HELPFILES)
-	$(MERGE) $(HELPFILES) > $@
+	$(MERGE) $^ > $@
 
 clean:
 	$(RM) $(HELPMSG)
--- a/level1/makefile	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/makefile	Mon Apr 24 18:02:14 2006 +0000
@@ -1,6 +1,6 @@
 include $(NITROS9DIR)/rules.mak
 
-dirs	= coco tano
+dirs	= coco tano d64 dalpha
 
 # Make all components
 all:
--- a/level1/modules/init.asm	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/modules/init.asm	Mon Apr 24 18:02:14 2006 +0000
@@ -52,9 +52,15 @@
          fcb   NOS9VER    OS version
          fcb   NOS9MAJ    OS major revision
          fcb   NOS9MIN    OS minor revision
+         IFNE  H6309
+         fcb   Proc6309+CRCOff     feature byte #1
+         ELSE
          fcb   CRCOff     feature byte #1
+         ENDC
          fcb   $00        feature byte #2
-         fcb   0,0,0,0,0,0,0,0  reserved
+         fdb   OSStr
+         fdb   MachStr
+         fcb   0,0,0,0  reserved
 
          IFGT  Level-1
 * CC3IO section
@@ -72,6 +78,47 @@
 DefCons  fcs   "/Term"
 DefBoot  fcs   "Boot"
 
+OSStr    equ   *
+         fcc   "NitrOS-9/"
+         IFNE  H6309
+         fcc   /6309 /
+         ELSE
+         fcc   /6809 /
+         ENDC
+         fcc   /Level /
+         fcb   '0+Level
+         fcc   / V0/
+         fcb   '0+NOS9VER
+         fcc   /.0/
+         fcb   '0+NOS9MAJ
+         fcc   /.0/
+         fcb   '0+NOS9MIN
+         fcb   C$CR
+
+MachStr  equ   *
+         IFNE   coco
+         fcc    "Radio Shack Color Computer"
+         ELSE
+         IFNE   coco3
+         fcc    "Tandy Color Computer 3"
+         ELSE
+         IFNE   tano
+         fcc    "Tano Dragon (US)"
+         ELSE
+         IFNE   d64
+         fcc    "Dragon 64 (UK)"
+         ELSE
+         IFNE   dalpha
+         fcc    "Dragon Alpha"
+         ELSE
+         fcc    "Unknown Machine"
+         ENDC
+         ENDC
+         ENDC
+         ENDC
+         ENDC
+         fcb   C$CR
+
          emod  
 eom      equ   *
          end   
--- a/level1/modules/sysgo.asm	Mon Apr 24 12:59:17 2006 +0000
+++ b/level1/modules/sysgo.asm	Mon Apr 24 18:02:14 2006 +0000
@@ -36,11 +36,10 @@
 
          mod   eom,name,tylg,atrv,start,size
 
-u0000    rmb   32
-u0020    rmb   42
-u004A    rmb   33
-u006B    rmb   6
-u0071    rmb   655
+
+         org   0
+InitAddr rmb   2
+         rmb   250
 size     equ   .
 
 name     fcs   /SysGo/
@@ -50,44 +49,9 @@
 DefPrior set   128         
 
 Banner   equ   *
-         fcc   "NitrOS-9/"
-         IFNE  H6309
-         fcc   /6309 /
-         ELSE
-         fcc   /6809 /
-         ENDC
-         fcc   /Level /
-         fcb   '0+Level
-         fcc   / V0/
-         fcb   '0+NOS9VER
-         fcc   /.0/
-         fcb   '0+NOS9MAJ
-         fcc   /.0/
-         fcb   '0+NOS9MIN
-         fcb   C$CR,C$LF
-* For ROM version, cut down on verbage
-         IFNE  tano
-         fcc   "Tano Dragon (US)"
-         ELSE
-         IFNE  d64
-         fcc   "Dragon (UK)"
-         ELSE
-         IFNE  dalpha
-         fcc   "Dragon Alpha"
-         ELSE
-         IFNE  coco
-         fcc   "Color Computer"
-         ELSE
-         fcc   "Color Computer 3"
-         ENDC
-         ENDC
-         ENDC
-         ENDC
-         fcc   " Port"
-         fcb   C$CR,C$LF
          IFEQ  ROM
          fcc   /(C) 2006 The NitrOS-9 Project/
-         fcb   C$CR,C$LF
+CrRtn    fcb   C$CR,C$LF
          IFNE  NOS9DBG
          fcc   "**   DEVELOPMENT BUILD   **"
          fcb   C$CR,C$LF
@@ -154,6 +118,7 @@
 BasicRL  equ   *-BasicRst
          ENDC
 
+Init     fcs   /Init/
 
 * SysGo Entry Point
 start    leax  >IcptRtn,pcr
@@ -162,11 +127,30 @@
          os9   F$ID
          ldb   #DefPrior
          os9   F$SPrior
-* Show banner
+
+* Write OS name and Machine name strings
+         leax  Init,pcr
+         clra
+         os9   F$Link
+         bcs   SignOn
+         stx   <InitAddr
+         ldd   OSName,u
+         leax  d,u						point to name
+         ldy   #80
+         lda   #$01
+         os9   I$WritLn
+         ldd   MachineName,u
+         leax  d,u						point to name
+         lda   #$01
+         os9   I$WritLn
+
+* Show rest of banner
+SignOn
          leax  >Banner,pcr
          ldy   #BannLen
          lda   #$01                    standard output
          os9   I$Write                 write out banner
+
 * Set default time
          leax  >DefTime,pcr
          os9   F$STime                 set time to default
--- a/level2/makefile	Mon Apr 24 12:59:17 2006 +0000
+++ b/level2/makefile	Mon Apr 24 18:02:14 2006 +0000
@@ -1,6 +1,6 @@
 include $(NITROS9DIR)/rules.mak
 
-dirs	= coco3
+dirs	= coco3 coco3_6309
 
 # Make all components
 all: