Mercurial > hg > Members > kono > nitros9-code

changeset 2547:141cfa8a4302

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added
author boisy
date Sat, 12 Jun 2010 12:15:54 +0000
parents f0977fc3f2d6
children 0a4ce6e154fb
files level1/modules/dwwrite.asm level2/coco3/bootfiles/makefile level2/coco3/modules/makefile
diffstat 3 files changed, 46 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/level1/modules/dwwrite.asm	Sat Jun 12 11:59:39 2010 +0000
+++ b/level1/modules/dwwrite.asm	Sat Jun 12 12:15:54 2010 +0000
@@ -190,3 +190,4 @@
           ENDC
           ENDC
           ENDC
+          ENDC
--- a/level2/coco3/bootfiles/makefile	Sat Jun 12 11:59:39 2010 +0000
+++ b/level2/coco3/bootfiles/makefile	Sat Jun 12 12:15:54 2010 +0000
@@ -10,6 +10,31 @@
 KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_1773_50HZ	= $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW3	= $(MD)/rel_80 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_BECKER	= $(MD)/rel_80 $(MD)/boot_dw3_becker $(MD)/krn
+
+# NitrOS-9 disk bootfile to allow booting from DriveWire server
+# on a DE1 or Xilinx using Gary Becker's CoCo 3 FGPA
+BOOTFILE_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb \
+		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/d2_40d.dd $(MD)/ddd0_40d.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/cowin.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)/scdwn.dr \
+		$(MD)/n_scdwn.dd $(MD)/n1_scdwn.dd $(MD)/n2_scdwn.dd \
+		$(MD)/n3_scdwn.dd $(MD)/n4_scdwn.dd $(MD)/n5_scdwn.dd \
+		$(MD)/n6_scdwn.dd $(MD)/n7_scdwn.dd $(MD)/n8_scdwn.dd \
+		$(MD)/n9_scdwn.dd $(MD)/n10_scdwn.dd $(MD)/n11_scdwn.dd \
+		$(MD)/n12_scdwn.dd $(MD)/n13_scdwn.dd $(MD)/n14_scdwn.dd \
+		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
+		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw3_becker
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
 BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
@@ -106,14 +131,17 @@
 		$(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_headless
-KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw3
+BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3 bootfile_dw3_headless bootfile_becker
+KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw3 kernel_becker
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
 all:	$(ALLOBJS)
 
 # Bootfiles
+bootfile_becker: $(BOOTFILE_BECKER) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_BECKER)>$@
+
 bootfile_40d: $(BOOTFILE_40D) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_40D)>$@
 
@@ -133,6 +161,9 @@
 	$(MERGE) $(BOOTFILE_DW3_HEADLESS)>$@
 
 # Kernels
+kernel_becker: $(KERNEL_BECKER) $(DEPENDS)
+	$(MERGE) $(KERNEL_BECKER)>$@
+
 kernel_1773: $(KERNEL_1773) $(DEPENDS)
 	$(MERGE) $(KERNEL_1773)>$@
 
--- a/level2/coco3/modules/makefile	Sat Jun 12 11:59:39 2010 +0000
+++ b/level2/coco3/modules/makefile	Sat Jun 12 12:15:54 2010 +0000
@@ -20,17 +20,17 @@
 TPB		= ../../3rdparty/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		 boot_burke boot_rampak boot_wd1002 boot_dw3
+		 boot_burke boot_rampak boot_wd1002 boot_dw3 boot_dw3_becker
 BOOTTRACK	= rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn
 KERNEL		= krnp2 krnp3_perr krnp4_regdump
 SYSMODS		= ioman init sysgo_h0 sysgo_dd
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
 		clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_jvemu clock2_messemu clock2_dw3
+		clock2_jvemu clock2_messemu clock2_dw3 clock2_dw3_becker
 
 RBF		= rbf.mn \
-		rbdw3.dr dw3.sb \
+		rbdw3.dr dw3.sb dw3_becker.sb \
 		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
 		d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		d0_40d.dd d1_40d.dd d2_40d.dd d0_80d.dd \
@@ -86,6 +86,12 @@
 	$(CP) kernel/$@ .
 
 # Special cases
+boot_dw3_becker: boot_dw3.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
+
+dw3_becker.sb: dw3.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
+
 cogrf.io: cowin.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aCoGrf=1
 
@@ -298,6 +304,9 @@
 clock2_bnb: clock2_ds1315.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
 
+clock2_dw3_becker: clock2_dw3.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBECKER=1
+
 clean:
 	$(CD) kernel; make $@
 	$(RM) $(ALLOBJS)