Mercurial > hg > Members > kono > nitros9-code

changeset 2183:d29be35a48bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makefiles updated, opcode for printing updated
author boisy
date Sun, 08 Mar 2009 22:28:45 +0000
parents b1b374ada668
children 410d0f81ff00
files level1/coco/bootfiles/makefile level1/coco/makefile level1/modules/dwdefs.d level1/modules/scdwp.asm rules.mak
diffstat 5 files changed, 133 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco/bootfiles/makefile	Sun Mar 08 14:11:52 2009 +0000
+++ b/level1/coco/bootfiles/makefile	Sun Mar 08 22:28:45 2009 +0000
@@ -11,7 +11,10 @@
 KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_1773_6ms
 
-KERNEL_DW3	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+KERNEL_DW3_COCO1	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		$(MD)/boot_dw3_coco1
+
+KERNEL_DW3_COCO2	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_dw3
 
 IDE		= $(3PD)/ide
@@ -53,7 +56,20 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_COVDG_DW3	= $(MD)/ioman \
+BOOTFILE_COVDG_DW3_COCO1	= $(MD)/ioman \
+		$(MD)/rbdw3.dr $(MD)/dw3_coco1.sb \
+		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
+		$(MD)/rbf.mn $(MD)/rb1773.dr \
+		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
+		$(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
+		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
+		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft \
+		$(MD)/sysgo_dd
+
+BOOTFILE_COVDG_DW3_COCO2	= $(MD)/ioman \
 		$(MD)/rbdw3.dr $(MD)/dw3.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
@@ -78,7 +94,21 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_COHR_DW3	= $(MD)/ioman \
+BOOTFILE_COHR_DW3_COCO1	= $(MD)/ioman \
+		$(MD)/rbdw3.dr $(MD)/dw3_coco1.sb \
+		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
+		$(MD)/rbf.mn $(MD)/rb1773.dr \
+		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
+		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
+		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/sysgo_dd
+
+BOOTFILE_COHR_DW3_COCO2	= $(MD)/ioman \
 		$(MD)/rbdw3.dr $(MD)/dw3.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
@@ -104,8 +134,9 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw3 bootfile_cohr_dw3 bootfile_covdg_ds80 bootfile_cohr_ds80
-KERNELS		= kernel_1773 kernel_dw3
+BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw3_coco1 bootfile_covdg_dw3_coco2 \
+		bootfile_cohr_dw3_coco1 bootfile_cohr_dw3_coco2 bootfile_covdg_ds80 bootfile_cohr_ds80
+KERNELS		= kernel_1773 kernel_dw3_coco1 kernel_dw3_coco2
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -123,14 +154,20 @@
 bootfile_covdg_ds80: $(BOOTFILE_COVDG_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
 
-bootfile_covdg_dw3: $(BOOTFILE_COVDG_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DW3)>$@
+bootfile_covdg_dw3_coco1: $(BOOTFILE_COVDG_DW3_COCO1) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_DW3_COCO1)>$@
+
+bootfile_covdg_dw3_coco2: $(BOOTFILE_COVDG_DW3_COCO2) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_DW3_COCO2)>$@
 
 bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COHR_DS80)>$@
 
-bootfile_cohr_dw3: $(BOOTFILE_COHR_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_DW3)>$@
+bootfile_cohr_dw3_coco1: $(BOOTFILE_COHR_DW3_COCO1) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COHR_DW3_COCO1)>$@
+
+bootfile_cohr_dw3_coco2: $(BOOTFILE_COHR_DW3_COCO2) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COHR_DW3_COCO2)>$@
 
 # Dragon64 Disk boot
 bootfile_d64: $(BOOTFILE_D64) $(DEPENDS)
@@ -142,8 +179,12 @@
 	$(PADROM) 4608 $@
 
 # DriveWire 3 Kernel
-kernel_dw3: $(KERNEL_DW3) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW3)>$@
+kernel_dw3_coco1: $(KERNEL_DW3_COCO1) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW3_COCO1)>$@
+	$(PADROM) 4608 $@
+
+kernel_dw3_coco2: $(KERNEL_DW3_COCO2) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW3_COCO2)>$@
 	$(PADROM) 4608 $@
 
 clean:
--- a/level1/coco/makefile	Sun Mar 08 14:11:52 2009 +0000
+++ b/level1/coco/makefile	Sun Mar 08 22:28:45 2009 +0000
@@ -14,11 +14,14 @@
 BOOTFILE_COVDG	= bootfiles/bootfile_covdg
 BOOTFILE_COHR	= bootfiles/bootfile_cohr
 BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
-BOOTFILE_COVDG_DW3	= bootfiles/bootfile_covdg_dw3
+BOOTFILE_COVDG_DW3_COCO1	= bootfiles/bootfile_covdg_dw3_coco1
+BOOTFILE_COVDG_DW3_COCO2	= bootfiles/bootfile_covdg_dw3_coco2
 BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
-BOOTFILE_COHR_DW3	= bootfiles/bootfile_cohr_dw3
+BOOTFILE_COHR_DW3_COCO1	= bootfiles/bootfile_cohr_dw3_coco1
+BOOTFILE_COHR_DW3_COCO2	= bootfiles/bootfile_cohr_dw3_coco2
 KERNELFILE	= bootfiles/kernel_1773
-KERNELFILE_DW3	= bootfiles/kernel_dw3
+KERNELFILE_DW3_COCO1	= bootfiles/kernel_dw3_coco1
+KERNELFILE_DW3_COCO2	= bootfiles/kernel_dw3_coco2
 DIRS		= cmds modules defs sys bootfiles
 
 
@@ -38,8 +41,10 @@
 ROOTFILES	= startup
 
 PACKAGENAME	= $(DISTROVER).zip
-DSKDW3          = $(DISTROVER)_dw3.dsk
-LDSKDW3         = $(DISTRONAME)_dw3.dsk
+DSKDW3COCO1     = $(DISTROVER)1_dw3.dsk
+LDSKDW3COCO1    = $(DISTRONAME)coco1_dw3.dsk
+DSKDW3COCO2     = $(DISTROVER)2_dw3.dsk
+LDSKDW3COCO2    = $(DISTRONAME)coco2_dw3.dsk
 DSK360K_1       = $(DISTROVER)_40d_1.dsk
 LDSK360K_1      = $(DISTRONAME)_40d_1.dsk
 DSK360K_2       = $(DISTROVER)_40d_2.dsk
@@ -62,25 +67,27 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKDW3) $(DSK360K_1) $(LDSK360K_1) \
+	-$(RM) $(PACKAGENAME) $(DSKDW3COCO1) $(DSKDW3COCO2) \
+	$(LDSKDW3COCO1) $(LDSKDW3COCO2) \
+	$(DSK360K_1) $(LDSK360K_1) \
 	$(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K)
 
 
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(CP) $(DSKDW3) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR)
+	$(CP) $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
 
-$(PACKAGENAME): $(DSKDW3) $(DSK360K_1) $(DSK360K_2) $(DSK720K) ../../ReadMe ../../ChangeLog
+$(PACKAGENAME): $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSK360K_1) $(DSK360K_2) $(DSK720K) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
-$(DSKDW3):
+$(DSKDW3COCO1):
 	$(RM) $@
 	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW3) -t=$(KERNELFILE_DW3)
+	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW3_COCO1) -t=$(KERNELFILE_DW3_COCO1)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -127,8 +134,61 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
-	$(RM) $(LDSKDW3)
-	$(SOFTLINK) $@ $(LDSKDW3)
+	$(RM) $(LDSKDW3COCO1)
+	$(SOFTLINK) $@ $(LDSKDW3COCO1)
+
+$(DSKDW3COCO2):
+	$(RM) $@
+	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/6809 Level 1"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW3_COCO2) -t=$(KERNELFILE_DW3_COCO2)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
+	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
+	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
+	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/6809L1
+	$(MAKDIR) $@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
+	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
+	$(RM) $(LDSKDW3COCO2)
+	$(SOFTLINK) $@ $(LDSKDW3COCO2)
 
 $(DSK360K_1):
 	$(RM) $@
--- a/level1/modules/dwdefs.d	Sun Mar 08 14:11:52 2009 +0000
+++ b/level1/modules/dwdefs.d	Sun Mar 08 22:28:45 2009 +0000
@@ -25,7 +25,10 @@
 OP_GETSTA   equ   'G		GetStat routine called
 OP_SETSTA   equ   'S		SetStat routine called
 OP_TERM     equ   'T		Term routine called
-OP_PRINT    equ   'P		PrintTerm routine called
+
+* Printer opcodes
+OP_PRINT    equ   'P		Print byte to the print buffer
+OP_PRINTFLUSH equ 'F		Flush the server print buffer
 
 * WireBug opcodes (Server-initiated)
 OP_WIREBUG_MODE  equ   'B
--- a/level1/modules/scdwp.asm	Sun Mar 08 14:11:52 2009 +0000
+++ b/level1/modules/scdwp.asm	Sun Mar 08 22:28:45 2009 +0000
@@ -14,6 +14,7 @@
 
          ifp1
          use   defsfile
+         use   dwdefs.d
          endc
 
 tylg     set   Drivr+Objct   
@@ -88,7 +89,7 @@
 *
 Write    equ   *
          tfr   a,b
-         lda   #'Q
+         lda   #OP_PRINT
          pshs  d
          leax  ,s
          ldy   #$0002
@@ -147,7 +148,7 @@
 SetStt   
 Close    cmpa  #SS.Close	close the device?
          bne   L0173
-         lda   #'F		send PrintQueue Flush Packet
+         lda   #OP_PRINTFLUSH	send PrintQueue Flush Packet
          pshs  a
          ldy   #$0001
          leax  ,s
--- a/rules.mak	Sun Mar 08 14:11:52 2009 +0000
+++ b/rules.mak	Sun Mar 08 22:28:45 2009 +0000
@@ -13,10 +13,10 @@
 # NitrOS-9 version, major and minor release numbers are here
 NOS9VER	= 3
 NOS9MAJ	= 2
-NOS9MIN	= 8
+NOS9MIN	= 9
 
 # Set this to 1 to turn on "DEVELOPMENT" message in sysgo
-NOS9DBG = 0
+NOS9DBG = 1
 
 #################### DO NOT CHANGE ANYTHING BELOW THIS LINE ####################