Mercurial > hg > Members > kono > nitros9-code

changeset 3247:0aaa348afc57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated level1/coco1/modules/makefile to build Jim Brain's CoCoLINK DriveWire drivers. This will allow users to take advantage of the 230400 baud that this special RS232 Pak can do. Updated level1/coco1/bootfiles/makefile to make the kernel and bootfiles needed for level1 to use the new CoCoLINK drivers. Updated level1/coco1/makefile to create the new disk images using the CoCoLINK drivers.
author David Ladd <drencor-xeen@users.sourceforge.net>
date Sun, 11 Mar 2018 01:34:48 -0600
parents be3446f758ca
children 1d7d6a09a973
files level1/coco1/bootfiles/makefile level1/coco1/makefile level1/coco1/modules/makefile
diffstat 3 files changed, 154 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco1/bootfiles/makefile	Sun Mar 11 01:30:30 2018 -0600
+++ b/level1/coco1/bootfiles/makefile	Sun Mar 11 01:34:48 2018 -0600
@@ -24,6 +24,9 @@
 KERNEL_RS232PAK	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_dw_rs232pak
 
+KERNEL_COCOLINK	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		$(MD)/boot_dw_cocolink
+
 KERNEL_DIRECTMODEMPAK	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_dw_directmodempak
 
@@ -62,6 +65,9 @@
 RBRS232PAK	= $(MD)/rbdw.dr $(MD)/dwio_rs232pak.sb \
 		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
 
+RBCOCOLINK	= $(MD)/rbdw.dr $(MD)/dwio_cocolink.sb \
+		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
+
 RBDIRECTMODEMPAK	= $(MD)/rbdw.dr $(MD)/dwio_directmodempak.sb \
 		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
 
@@ -180,6 +186,19 @@
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd
 
+BOOTFILE_COCOLINK_HEADLESS	= $(MD)/ioman \
+		$(MD)/rbf.mn \
+		$(RBCOCOLINK) \
+		$(MD)/ddx0.dd \
+		$(MD)/scf.mn \
+		$(MD)/scdwv.dr \
+		$(MD)/term_scdwv.dt \
+		$(SCDWV_NET) \
+		$(SCDWV_WIN) \
+		$(SCDWP) \
+		$(CLOCK60HZDW) \
+		$(MD)/sysgo_dd
+
 BOOTFILE_DIRECTMODEMPAK_HEADLESS	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(RBDIRECTMODEMPAK) \
@@ -262,6 +281,21 @@
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd
 
+BOOTFILE_COVDG_COCOLINK	= $(MD)/ioman \
+		$(MD)/rbf.mn \
+		$(RBCOCOLINK) \
+		$(FLOPPY_40D) \
+		$(MD)/ddx0.dd \
+		$(MD)/scf.mn \
+		$(VTIO_COVDG) \
+		$(MD)/scdwv.dr \
+		$(SCDWV_NET) \
+		$(SCDWV_WIN) \
+		$(SCDWP) \
+		$(PIPE) \
+		$(CLOCK60HZDW) \
+		$(MD)/sysgo_dd
+
 BOOTFILE_COVDG_DIRECTMODEMPAK	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(RBDIRECTMODEMPAK) \
@@ -299,6 +333,17 @@
 		$(MD)/sysgo_dd \
 		$(CMDSDIR)/shell_21
 
+BOOTFILE_COVDG_COCOLINK_GAME	= $(MD)/ioman \
+		$(MD)/rbf.mn \
+		$(RBCOCOLINK) \
+		$(MD)/ddx0.dd \
+		$(MD)/scf.mn \
+		$(VTIO_COVDG) \
+		$(PIPE) \
+		$(CLOCK60HZDW) \
+		$(MD)/sysgo_dd \
+		$(CMDSDIR)/shell_21
+
 BOOTFILE_COVDG_DIRECTMODEMPAK_GAME	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(RBDIRECTMODEMPAK) \
@@ -441,6 +486,20 @@
 		$(CLOCK60HZDW) \
 		$(MD)/sysgo_dd
 
+BOOTFILE_COHR_COCOLINK	= $(MD)/ioman \
+		$(MD)/rbf.mn \
+		$(FLOPPY_40D) \
+		$(RBCOCOLINK) \
+		$(MD)/ddx0.dd \
+		$(MD)/scf.mn \
+		$(VTIO_COHR) \
+		$(MD)/scdwv.dr \
+		$(SCDWV_NET) \
+		$(SCDWP) \
+		$(PIPE) \
+		$(CLOCK60HZDW) \
+		$(MD)/sysgo_dd
+
 BOOTFILE_COHR_DIRECTMODEMPAK	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(FLOPPY_40D) \
@@ -495,20 +554,21 @@
 
 BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_co42 bootfile_cowprs \
 		bootfile_dw_headless bootfile_covdg_becker bootfile_covdg_rs232pak \
-		bootfile_covdg_directmodempak \
-		bootfile_covdg_becker_game bootfile_covdg_rs232pak_game \
+		bootfile_covdg_cocolink bootfile_covdg_directmodempak \
+		bootfile_covdg_becker_game bootfile_covdg_rs232pak_game bootfile_covdg_cocolink_game \
 		bootfile_covdg_directmodempak_game bootfile_covdg_dw_game \
 		bootfile_covdg_cocosdc bootfile_co42_cocosdc bootfile_covdg_cocosdc_game \
 		bootfile_covdg_dw bootfile_cohr_dw bootfile_co42_dw \
 		bootfile_covdg_ds80 bootfile_cohr_ds80 bootfile_co42_ds80 \
 		bootfile_cohr_becker bootfile_becker_headless \
 		bootfile_cohr_rs232pak bootfile_rs232pak_headless \
+		bootfile_cohr_cocolink bootfile_cocolink_headless \
 		bootfile_cohr_directmodempak bootfile_directmodempak_headless \
 		bootfile_covdg_arduino bootfile_arduino_headless \
 		bootfile_cohr_arduino bootfile_covdg_arduino_game
 
 KERNELS		= kernel_1773 kernel_dw kernel_becker kernel_arduino kernel_cocosdc \
-			kernel_rs232pak kernel_directmodempak
+			kernel_rs232pak kernel_directmodempak kernel_cocolink
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -541,6 +601,9 @@
 bootfile_rs232pak_headless: $(BOOTFILE_RS232PAK_HEADLESS) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_RS232PAK_HEADLESS)>$@
 
+bootfile_cocolink_headless: $(BOOTFILE_COCOLINK_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COCOLINK_HEADLESS)>$@
+
 bootfile_directmodempak_headless: $(BOOTFILE_DIRECTMODEMPAK_HEADLESS) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_DIRECTMODEMPAK_HEADLESS)>$@
 
@@ -559,6 +622,9 @@
 bootfile_covdg_rs232pak: $(BOOTFILE_COVDG_RS232PAK) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_RS232PAK)>$@
 
+bootfile_covdg_cocolink: $(BOOTFILE_COVDG_COCOLINK) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_COCOLINK)>$@
+
 bootfile_covdg_directmodempak: $(BOOTFILE_COVDG_DIRECTMODEMPAK) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DIRECTMODEMPAK)>$@
 
@@ -568,6 +634,9 @@
 bootfile_covdg_rs232pak_game: $(BOOTFILE_COVDG_RS232PAK_GAME) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_RS232PAK_GAME)>$@
 
+bootfile_covdg_cocolink_game: $(BOOTFILE_COVDG_COCOLINK_GAME) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_COCOLINK_GAME)>$@
+
 bootfile_covdg_directmodempak_game: $(BOOTFILE_COVDG_DIRECTMODEMPAK_GAME) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DIRECTMODEMPAK_GAME)>$@
 
@@ -604,6 +673,9 @@
 bootfile_cohr_rs232pak: $(BOOTFILE_COHR_RS232PAK) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COHR_RS232PAK)>$@
 
+bootfile_cohr_cocolink: $(BOOTFILE_COHR_COCOLINK) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COHR_COCOLINK)>$@
+
 bootfile_cohr_directmodempak: $(BOOTFILE_COHR_DIRECTMODEMPAK) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COHR_DIRECTMODEMPAK)>$@
 
@@ -624,6 +696,10 @@
 	$(MERGE) $(KERNEL_BECKER)>$@
 	$(PADROM) 4608 $@
 
+kernel_cocolink: $(KERNEL_COCOLINK) $(DEPENDS)
+	$(MERGE) $(KERNEL_COCOLINK)>$@
+	$(PADROM) 4608 $@
+
 kernel_rs232pak: $(KERNEL_RS232PAK) $(DEPENDS)
 	$(MERGE) $(KERNEL_RS232PAK)>$@
 	$(PADROM) 4608 $@
--- a/level1/coco1/makefile	Sun Mar 11 01:30:30 2018 -0600
+++ b/level1/coco1/makefile	Sun Mar 11 01:34:48 2018 -0600
@@ -14,11 +14,13 @@
 BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
 BOOTFILE_DW_HEADLESS	= bootfiles/bootfile_dw_headless
 BOOTFILE_BECKER_HEADLESS	= bootfiles/bootfile_becker_headless
+BOOTFILE_COCOLINK_HEADLESS	= bootfiles/bootfile_cocolink_headless
 BOOTFILE_RS232PAK_HEADLESS	= bootfiles/bootfile_rs232pak_headless
 BOOTFILE_DIRECTMODEMPAK_HEADLESS	= bootfiles/bootfile_directmodempak_headless
 BOOTFILE_ARDUINO_HEADLESS	= bootfiles/bootfile_arduino_headless
 BOOTFILE_COVDG_DW	= bootfiles/bootfile_covdg_dw
 BOOTFILE_COVDG_BECKER	= bootfiles/bootfile_covdg_becker
+BOOTFILE_COVDG_COCOLINK	= bootfiles/bootfile_covdg_cocolink
 BOOTFILE_COVDG_RS232PAK	= bootfiles/bootfile_covdg_rs232pak
 BOOTFILE_COVDG_DIRECTMODEMPAK	= bootfiles/bootfile_covdg_directmodempak
 BOOTFILE_COVDG_ARDUINO	= bootfiles/bootfile_covdg_arduino
@@ -28,12 +30,14 @@
 BOOTFILE_COHR_DW	= bootfiles/bootfile_cohr_dw
 BOOTFILE_CO42_DW	= bootfiles/bootfile_co42_dw
 BOOTFILE_COHR_BECKER	= bootfiles/bootfile_cohr_becker
+BOOTFILE_COHR_COCOLINK	= bootfiles/bootfile_cohr_cocolink
 BOOTFILE_COHR_RS232PAK	= bootfiles/bootfile_cohr_rs232pak
 BOOTFILE_COHR_DIRECTMODEMPAK	= bootfiles/bootfile_cohr_directmodempak
 BOOTFILE_COHR_ARDUINO	= bootfiles/bootfile_cohr_arduino
 KERNELFILE	= bootfiles/kernel_1773
 KERNELFILE_DW	= bootfiles/kernel_dw
 KERNELFILE_BECKER	= bootfiles/kernel_becker
+KERNELFILE_COCOLINK	= bootfiles/kernel_cocolink
 KERNELFILE_RS232PAK	= bootfiles/kernel_rs232pak
 KERNELFILE_DIRECTMODEMPAK	= bootfiles/kernel_directmodempak
 KERNELFILE_ARDUINO	= bootfiles/kernel_arduino
@@ -71,6 +75,8 @@
 LDSK720K        = $(DISTRONAME)_$(PORT)_80d.dsk
 DSKBECKER	= $(DISTROVER)_becker.dsk
 LDSKBECKER	= $(DISTRONAME)_$(PORT)_becker.dsk
+DSKCOCOLINK	= $(DISTROVER)_dw_cocolink.dsk
+LDSKCOCOLINK	= $(DISTRONAME)_$(PORT)_dw_cocolink.dsk
 DSKRS232PAK	= $(DISTROVER)_dw_rs232pak.dsk
 LDSKRS232PAK	= $(DISTRONAME)_$(PORT)_dw_rs232pak.dsk
 DSKDIRECTMODEMPAK	= $(DISTROVER)_dw_directmodempak.dsk
@@ -91,11 +97,13 @@
 DSKS		= $(DSKDW) $(DSKDWHEADLESS) $(DSKBECKER) $(DSKBECKERHEADLESS) \
 		$(DSKARDUINO) $(DSKARDUINOHEADLESS) $(DSK360K_1) $(DSK360K_2) \
 		$(DSK720K) $(DSKCOCOSDC) $(DSKRS232PAK) $(DSKDIRECTMODEMPAK) \
-		$(DSKRS232PAKHEADLESS) $(DSKDIRECTMODEMPAKHEADLESS)
+		$(DSKRS232PAKHEADLESS) $(DSKDIRECTMODEMPAKHEADLESS) \
+		$(DSKCOCOLINK)
 LDSKS		= $(LDSKDW) $(LDSKDWHEADLESS) $(LDSKBECKER) $(LDSKBECKERHEADLESS) \
 		$(LDSKARDUINO) $(LDSKARDUINOHEADLESS) $(LDSK360K_1) $(LDSK360K_2) \
 		$(LDSK720K) $(LDSKCOCOSDC) $(LDSKRS232PAK) $(LDSKDIRECTMODEMPAK) \
-		$(LDSKRS232PAKHEADLESS) $(LDSKDIRECTMODEMPAKHEADLESS)
+		$(LDSKRS232PAKHEADLESS) $(LDSKDIRECTMODEMPAKHEADLESS) \
+		$(LDSKCOCOLINK)
 
 # Make all components
 all:
@@ -226,6 +234,60 @@
 	$(RM) $(LDSKBECKER)
 	$(SOFTLINK) $@ $(LDSKBECKER)
 
+$(DSKCOCOLINK):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_COCOLINK) -t=$(KERNELFILE_COCOLINK)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	$(CD) cmds; $(OS9COPY) $(sort $(CMDS_DW) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS_DW) $(CMDS_D2)),$@,CMDS/$(file))
+	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
+	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
+	$(CD) wwwroot; $(OS9COPY) $(WWWROOT) ../$@,WWWROOT
+	$(OS9ATTR_TEXT) $(foreach file,$(WWWROOT),$@,WWWROOT/$(file))
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file))
+	$(CPL) $(STARTUP_DW) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/$(DISTRO)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(MODULECMDS),$@,NITROS9/$(DISTRO)/CMDS/$(file))
+	$(OS9RENAME) $@,NITROS9/$(DISTRO)/CMDS/$(WHICHSHELL) shell
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(OS9ATTR_EXEC) $(foreach file,$(BOOTTRACK),$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(OS9ATTR_EXEC) $(foreach file,$(KERNEL),$@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(OS9ATTR_EXEC) $(foreach file,$(SYSMODS),$@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(OS9ATTR_EXEC) $(foreach file,$(CLOCKS),$@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(OS9ATTR_EXEC) $(foreach file,$(RBF),$@,NITROS9/$(DISTRO)/MODULES/RBF/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(OS9ATTR_EXEC) $(foreach file,$(SCF),$@,NITROS9/$(DISTRO)/MODULES/SCF/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(OS9ATTR_EXEC) $(foreach file,$(PIPE),$@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSKCOCOLINK)
+	$(SOFTLINK) $@ $(LDSKCOCOLINK)
+
 $(DSKRS232PAK):
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
--- a/level1/coco1/modules/makefile	Sun Mar 11 01:30:30 2018 -0600
+++ b/level1/coco1/modules/makefile	Sun Mar 11 01:34:48 2018 -0600
@@ -25,7 +25,8 @@
 		boot_burke boot_rampak boot_wd1002 boot_dw \
 		boot_tc3 boot_ide boot_rom boot_dw_becker \
 		boot_dw_rs232pak boot_dw_directmodempak \
-		boot_dw_arduino boot_dw_38400 boot_sdc
+		boot_dw_arduino boot_dw_38400 boot_dw_cocolink \
+		boot_sdc
 BOOTTRACK	= rel $(BOOTERS)
 KERNEL		= krn krnp2 wbug
 SYSMODS		= ioman init sysgo_dd sysgo_h0 rominfo rominfo_pak vectors
@@ -36,7 +37,7 @@
 
 RBF		= rbf.mn \
 		rbdw.dr dwio.sb dwio_38400.sb dwio_becker.sb dwio_arduino.sb \
-		dwio_rs232pak.sb dwio_directmodempak.sb \
+		dwio_rs232pak.sb dwio_directmodempak.sb dwio_cocolink.sb \
 		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
 		ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \
@@ -101,6 +102,10 @@
 boot_dw_rs232pak:	boot_dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSY6551N=1
 
+# DriveWire CoCoLINK RS232 Pak Booter
+boot_dw_cocolink:	boot_dw.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSY6551N=1 -DSYCONSET=15
+
 # DriveWire Direct Modem Pak Booter
 boot_dw_directmodempak:	boot_dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSY6551N=1 -DSY6551B=65388
@@ -113,6 +118,10 @@
 dwio_rs232pak.sb:	dwio.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSY6551N=1
 
+# DriveWire CoCoLINK RS232 Pak Submodule
+dwio_cocolink.sb:	dwio.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSY6551N=1 -DSYCONSET=15
+
 # DriveWire Direct Modem Pak Submodule
 dwio_directmodempak.sb:	dwio.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSY6551N=1 -DSY6551B=65388