Mercurial > hg > Members > kono > nitros9-code

changeset 2293:cf5bdb01a497

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
No more DW server specific stuf
author boisy
date Wed, 30 Dec 2009 20:05:52 +0000
parents 2062c89e8492
children 82cc48b84835
files level2/coco3/bootfiles/makefile level2/coco3/makefile level2/coco3/modules/makefile level2/coco3/startup.dw
diffstat 4 files changed, 38 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/bootfiles/makefile	Wed Dec 30 20:03:25 2009 +0000
+++ b/level2/coco3/bootfiles/makefile	Wed Dec 30 20:05:52 2009 +0000
@@ -31,20 +31,6 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw3
 
-# NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
-# minimum bootfile without graphics console support
-BOOTFILE_DW3_MIN = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
-		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
-		$(MD)/scf.mn \
-		$(MD)/scdwt.dr $(MD)/term_scdwt.dt \
-                $(MD)/t1_scdwt.dd $(MD)/t2_scdwt.dd $(MD)/t3_scdwt.dd \
-                $(MD)/t4_scdwt.dd $(MD)/t5_scdwt.dd $(MD)/t6_scdwt.dd \
-		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3
-
 # NitrOS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -98,7 +84,7 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft
 
-BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3 bootfile_dw3_min
+BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3
 KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw3
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
@@ -121,9 +107,6 @@
 bootfile_dw3: $(BOOTFILE_DW3) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_DW3)>$@
 
-bootfile_dw3_min: $(BOOTFILE_DW3_MIN) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3_MIN)>$@
-
 # Kernels
 kernel_1773: $(KERNEL_1773) $(DEPENDS)
 	$(MERGE) $(KERNEL_1773)>$@
--- a/level2/coco3/makefile	Wed Dec 30 20:03:25 2009 +0000
+++ b/level2/coco3/makefile	Wed Dec 30 20:05:52 2009 +0000
@@ -8,7 +8,6 @@
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
 BOOTFILE_DW3	= bootfiles/bootfile_dw3
-BOOTFILE_DW3_SERVER	= bootfiles/bootfile_dw3_server
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
 BOOTFILE_40D_50HZ	= bootfiles/bootfile_40d_50hz
@@ -20,8 +19,6 @@
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
 CMDS_D2		= $(shell $(CD) cmds; make showobjs_d2)
-CMDS_DW		= $(shell $(CD) cmds; make showobjs_dw)
-CMDS_DW_SERVER	= $(shell $(CD) cmds; make showobjs_dw_server)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
 SYSMODS		= $(shell $(CD) modules; make showsysmods)
@@ -35,14 +32,11 @@
 SYSBIN		= $(shell $(CD) sys; make showbinobjs)
 SYSTEXT		= $(shell $(CD) sys; make showtextobjs)
 STARTUP		= startup
-STARTUP_DW_SERVER	= startup.dwserver
 SYSGO		= sysgo_dd
 
 PACKAGENAME	= $(DISTROVER).zip
 DSKDW3		= $(DISTROVER)_dw3.dsk
 LDSKDW3		= $(DISTRONAME)_dw3.dsk
-DSKDW3_SERVER	= $(DISTROVER)_dw3_server.dsk
-LDSKDW3_SERVER	= $(DISTRONAME)_dw3_server.dsk
 DSK360K_1	= $(DISTROVER)_40d_1.dsk
 LDSK360K_1	= $(DISTRONAME)_40d_1.dsk
 DSK360K_1_50HZ	= $(DISTROVER)_40d_1_50hz.dsk
@@ -55,8 +49,8 @@
 LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
-DSKS		= $(DSKDW3) $(DSKDW3_SERVER) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
-LDSKS		= $(LDSKDW3) $(LDSKDW3_SERVER) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
+DSKS		= $(DSKDW3) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+LDSKS		= $(LDSKDW3) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
 
 # Make all components
 all:
@@ -138,25 +132,6 @@
 	$(RM) $(LDSKDW3)
 	$(SOFTLINK) $@ $(LDSKDW3)
 
-$(DSKDW3_SERVER):
-	-$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 2"
-	$(OS9GEN) $@ -b=$(BOOTFILE_DW3_SERVER) -t=$(KERNELFILE_DW3)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(CP) modules/$(SYSGO) $@,sysgo
-	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS_DW_SERVER) ../$@,CMDS
-	$(foreach file, $(CMDS_DW_SERVER), $(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);)
-	$(CPL) $(STARTUP_DW_SERVER) $@,startup
-	$(OS9ATTR_TEXT) $@,startup
-	$(RM) $(LDSKDW3_SERVER)
-	$(SOFTLINK) $@ $(LDSKDW3_SERVER)
-
 $(DSK360K_1):
 	-$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
--- a/level2/coco3/modules/makefile	Wed Dec 30 20:03:25 2009 +0000
+++ b/level2/coco3/modules/makefile	Wed Dec 30 20:05:52 2009 +0000
@@ -56,7 +56,9 @@
 		v1.dw v2.dw v3.dw v4.dw v5.dw \
 		v6.dw v7.dw \
 		scdwt.dr term_scdwt.dt t0_scdwt.dd t1_scdwt.dd t2_scdwt.dd t3_scdwt.dd \
-		t4_scdwt.dd t5_scdwt.dd t6_scdwt.dd
+                t4_scdwt.dd t5_scdwt.dd t6_scdwt.dd t7_scdwt.dd \
+		u0_scdwt.dd u1_scdwt.dd u2_scdwt.dd u3_scdwt.dd \
+                u4_scdwt.dd u5_scdwt.dd u6_scdwt.dd
 
 PIPE		= pipeman.mn pipeman_named.mn \
 		piper.dr \
@@ -194,28 +196,52 @@
 
 # DriveWire 3 SCF descriptors
 term_scdwt.dt: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aTNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aAddr=1 -aTNum=1
 
 t0_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=0 -aTNum=0
 
 t1_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1 -aTNum=1
 
 t2_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2 -aTNum=2
 
 t3_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3 -aTNum=3
 
 t4_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=4
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4 -aTNum=4
 
 t5_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=5
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5 -aTNum=5
 
 t6_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=6
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6 -aTNum=6
+
+t7_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7 -aTNum=7
+
+u0_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8 -aUTIL=1 -aTNum=0
+
+u1_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9 -aUTIL=1 -aTNum=1
+
+u2_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10 -aUTIL=1 -aTNum=2
+
+u3_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11 -aUTIL=1 -aTNum=3
+
+u4_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12 -aUTIL=1 -aTNum=4
+
+u5_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13 -aUTIL=1 -aTNum=5
+
+u6_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14 -aUTIL=1 -aTNum=6
 
 # DriveWire 3 RBF descriptors
 ddx0.dd: dwdesc.asm
--- a/level2/coco3/startup.dw	Wed Dec 30 20:03:25 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-* Start tsmon on all terminals
-* tsmon /t0 &
-tsmon /t1 &
-tsmon /t2 &
-tsmon /t3 &
-tsmon /t4 &
-tsmon /t5 &
-tsmon /t6 &