Mercurial > hg > Members > kono > nitros9-code

changeset 1446:7687a6621d7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
720K disk images are now made sacia.asm fixed typo -- still needs to be completely ported!
author boisy
date Thu, 11 Dec 2003 04:51:49 +0000
parents 229396b827b0
children ddf57424f7b3
files level1/makefile level2/coco3/bootfiles/makefile level2/coco3_6309/bootfiles/makefile level2/makefile level2/modules/sacia.asm
diffstat 5 files changed, 107 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Thu Dec 11 03:51:58 2003 +0000
+++ b/level1/makefile	Thu Dec 11 04:51:49 2003 +0000
@@ -2,6 +2,7 @@
 
 RELEASE		= nos96809l1v030200
 BOOTFILE	= bootfiles/bootfile_stock
+BOOTFILE_DS80	= bootfiles/bootfile_stock_ds80
 KERNELFILE	= bootfiles/kernel_stock
 DIRS		= cmds modules defs sys bootfiles
 
@@ -46,7 +47,7 @@
 dskcopy: dsk
 	$(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR)
 
-$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) ReadMe ChangeLog
+$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) ReadMe ChangeLog
 	$(ARCHIVE) $@ $^
 
 $(DSK360K_1):
@@ -103,7 +104,7 @@
 $(DSK720K):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
+	$(OS9GEN) $@ -b=$(BOOTFILE_DS80) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
--- a/level2/coco3/bootfiles/makefile	Thu Dec 11 03:51:58 2003 +0000
+++ b/level2/coco3/bootfiles/makefile	Thu Dec 11 04:51:49 2003 +0000
@@ -49,7 +49,8 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft
 
-BOOTFILES	= bootfile_vdg bootfile_win40 bootfile_win80
+BOOTFILES	= bootfile_vdg bootfile_win40 bootfile_win80 \
+		bootfile_vdg_ds80 bootfile_win40_ds80 bootfile_win80_ds80
 KERNELS		= kernel_stock
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
@@ -66,6 +67,15 @@
 bootfile_win80: $(BOOTFILE_WIN80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_WIN80)>$@
 
+bootfile_vdg_ds80: $(BOOTFILE_VDG_DS80) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_VDG_DS80)>$@
+
+bootfile_win40_ds80: $(BOOTFILE_WIN40_DS80) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_WIN40_DS80)>$@
+
+bootfile_win80_ds80: $(BOOTFILE_WIN80_DS80) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_WIN80_DS80)>$@
+
 # Kernels
 kernel_stock: $(KERNEL_STOCK) $(DEPENDS)
 	$(MERGE) $(KERNEL_STOCK)>$@
@@ -73,3 +83,42 @@
 clean:
 	$(RM) $(ALLOBJS)
 
+# OS-9 disk bootfile to allow booting from WD1773 disk controller
+BOOTFILE_VDG_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn $(MD)/cc3io.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/windint.io $(MD)/vdgint.io \
+		$(MD)/term_vdg.dt \
+		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
+		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft
+
+BOOTFILE_WIN40_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn $(MD)/cc3io.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/windint.io $(MD)/vdgint.io \
+		$(MD)/term_win40.dt \
+		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
+		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft
+
+BOOTFILE_WIN80_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn $(MD)/cc3io.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/windint.io $(MD)/vdgint.io \
+		$(MD)/term_win80.dt \
+		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
+		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft
--- a/level2/coco3_6309/bootfiles/makefile	Thu Dec 11 03:51:58 2003 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Thu Dec 11 04:51:49 2003 +0000
@@ -49,7 +49,8 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft
 
-BOOTFILES	= bootfile_vdg bootfile_win40 bootfile_win80
+BOOTFILES	= bootfile_vdg bootfile_win40 bootfile_win80 \
+		bootfile_vdg_ds80 bootfile_win40_ds80 bootfile_win80_ds80
 KERNELS		= kernel_stock
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
@@ -66,6 +67,15 @@
 bootfile_win80: $(BOOTFILE_WIN80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_WIN80)>$@
 
+bootfile_vdg_ds80: $(BOOTFILE_VDG_DS80) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_VDG_DS80)>$@
+
+bootfile_win40_ds80: $(BOOTFILE_WIN40_DS80) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_WIN40_DS80)>$@
+
+bootfile_win80_ds80: $(BOOTFILE_WIN80_DS80) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_WIN80_DS80)>$@
+
 # Kernels
 kernel_stock: $(KERNEL_STOCK) $(DEPENDS)
 	$(MERGE) $(KERNEL_STOCK)>$@
@@ -73,3 +83,42 @@
 clean:
 	$(RM) $(ALLOBJS)
 
+# OS-9 disk bootfile to allow booting from WD1773 disk controller
+BOOTFILE_VDG_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn $(MD)/cc3io.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/windint.io $(MD)/vdgint.io \
+		$(MD)/term_vdg.dt \
+		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
+		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft
+
+BOOTFILE_WIN40_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn $(MD)/cc3io.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/windint.io $(MD)/vdgint.io \
+		$(MD)/term_win40.dt \
+		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
+		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft
+
+BOOTFILE_WIN80_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/scf.mn $(MD)/cc3io.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/windint.io $(MD)/vdgint.io \
+		$(MD)/term_win80.dt \
+		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
+		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_soft
--- a/level2/makefile	Thu Dec 11 03:51:58 2003 +0000
+++ b/level2/makefile	Thu Dec 11 04:51:49 2003 +0000
@@ -2,6 +2,7 @@
 
 RELEASE		= nos96809l2v030200
 BOOTFILE	= bootfiles/bootfile_vdg
+BOOTFILE_DS80	= bootfiles/bootfile_vdg_ds80
 KERNELFILE	= bootfiles/kernel_stock
 DIRS		= cmds modules defs sys bootfiles
 
@@ -49,7 +50,7 @@
 dskcopy: dsk
 	$(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR)
 
-$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) ReadMe ChangeLog
+$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) ReadMe ChangeLog
 	$(ARCHIVE) $@ $^
 
 $(DSK360K_1):
@@ -110,7 +111,7 @@
 $(DSK720K):
 	-$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/6809 Level 2"
-	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
+	$(OS9GEN) $@ -b=$(BOOTFILE_DS80) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
--- a/level2/modules/sacia.asm	Thu Dec 11 03:51:58 2003 +0000
+++ b/level2/modules/sacia.asm	Thu Dec 11 04:51:49 2003 +0000
@@ -402,7 +402,7 @@
            tim   #Stat.TxE,StatReg,x
            ELSE
            pshs  a
-           lda   StatRegx
+           lda   StatReg,x
            bita  #Stat.TxE
            puls  a
            ENDC