Mercurial > hg > Members > kono > nitros9-code

changeset 3067:0373a199c2cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
level1: Generate CoCoSDC disk images
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 22 Feb 2015 12:39:13 +0100
parents 594490949f0a
children b547712d6209
files level1/coco1/bootfiles/makefile level1/coco1/makefile level1/coco1/modules/makefile
diffstat 3 files changed, 109 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco1/bootfiles/makefile	Sun Feb 08 17:55:45 2015 -0600
+++ b/level1/coco1/bootfiles/makefile	Sun Feb 22 12:39:13 2015 +0100
@@ -24,6 +24,9 @@
 KERNEL_ARDUINO	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_dw_arduino
 
+KERNEL_COCOSDC	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		$(MD)/boot_sdc
+
 IDE		= $(3PD)/ide
 SCSI		= $(3PD)/scsisys
 
@@ -50,6 +53,9 @@
 RBARDUINO	= $(MD)/rbdw.dr $(MD)/dwio_arduino.sb \
 		$(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
 
+RBCOCOSDC	= $(MD)/rbsuper.dr $(MD)/llcocosdc.dr \
+		$(MD)/sd0_cocosdc.dd $(MD)/sd1_cocosdc.dd
+
 SCDWV_NET  = $(MD)/n_scdwv.dd $(MD)/n1_scdwv.dd $(MD)/n2_scdwv.dd \
 		$(MD)/n3_scdwv.dd $(MD)/n4_scdwv.dd $(MD)/n5_scdwv.dd \
 		$(MD)/n6_scdwv.dd $(MD)/n7_scdwv.dd $(MD)/n8_scdwv.dd \
@@ -225,6 +231,20 @@
 		$(CLOCK60HZ) \
 		$(MD)/sysgo_dd
 
+BOOTFILE_COVDG_COCOSDC	= $(MD)/ioman \
+		$(MD)/rbf.mn \
+		$(RBCOCOSDC) \
+		$(MD)/ddsd0_cocosdc.dd \
+		$(FLOPPY_40D) \
+		$(MD)/scf.mn \
+		$(VTIO_COVDG) \
+		$(MD)/scdwv.dr \
+		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
+		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
+		$(PIPE) \
+		$(CLOCK60HZ) \
+		$(MD)/sysgo_dd
+
 BOOTFILE_COHR_DW	= $(MD)/ioman \
 		$(MD)/rbf.mn \
 		$(FLOPPY_40D) \
@@ -282,12 +302,13 @@
 BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw \
 		bootfile_headless_dw bootfile_covdg_becker \
 		bootfile_covdg_becker_game bootfile_covdg_dw_game \
+		bootfile_covdg_cocosdc \
 		bootfile_cohr_dw bootfile_covdg_ds80 bootfile_cohr_ds80 \
 		bootfile_cohr_becker bootfile_headless_becker \
 		bootfile_covdg_arduino bootfile_headless_arduino \
 		bootfile_cohr_arduino bootfile_covdg_arduino_game 
 
-KERNELS		= kernel_1773 kernel_dw kernel_becker kernel_arduino
+KERNELS		= kernel_1773 kernel_dw kernel_becker kernel_arduino kernel_cocosdc
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -332,6 +353,9 @@
 bootfile_covdg_arduino_game: $(BOOTFILE_COVDG_ARDUINO_GAME) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_ARDUINO_GAME)>$@
 
+bootfile_covdg_cocosdc: $(BOOTFILE_COVDG_COCOSDC) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_COCOSDC)>$@
+
 bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COHR_DS80)>$@
 
@@ -362,5 +386,9 @@
 	$(MERGE) $(KERNEL_ARDUINO)>$@
 	$(PADROM) 4608 $@
 
+kernel_cocosdc: $(KERNEL_COCOSDC) $(DEPENDS) 
+	$(MERGE) $(KERNEL_COCOSDC)>$@
+	$(PADROM) 4608 $@
+
 clean:
 	$(RM) $(ALLOBJS)
--- a/level1/coco1/makefile	Sun Feb 08 17:55:45 2015 -0600
+++ b/level1/coco1/makefile	Sun Feb 22 12:39:13 2015 +0100
@@ -16,6 +16,7 @@
 BOOTFILE_COVDG_DW	= bootfiles/bootfile_covdg_dw
 BOOTFILE_COVDG_BECKER	= bootfiles/bootfile_covdg_becker
 BOOTFILE_COVDG_ARDUINO	= bootfiles/bootfile_covdg_arduino
+BOOTFILE_COVDG_COCOSDC	= bootfiles/bootfile_covdg_cocosdc
 BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
 BOOTFILE_COHR_DW	= bootfiles/bootfile_cohr_dw
 BOOTFILE_COHR_BECKER	= bootfiles/bootfile_cohr_becker
@@ -24,6 +25,7 @@
 KERNELFILE_DW	= bootfiles/kernel_dw
 KERNELFILE_BECKER	= bootfiles/kernel_becker
 KERNELFILE_ARDUINO	= bootfiles/kernel_arduino
+KERNELFILE_COCOSDC	= bootfiles/kernel_cocosdc
 DIRS		= cmds modules defs sys bootfiles bootroms wwwroot
 
 
@@ -64,11 +66,15 @@
 LDSKARDUINO	= $(DISTRONAME)$(PORT)_arduino.dsk
 DSKARDUINOHEADLESS	= $(DISTROVER)_arduino_headless.dsk
 LDSKARDUINOHEADLESS	= $(DISTRONAME)$(PORT)_arduino_headless.dsk
+DSKCOCOSDC	= $(DISTROVER)_cocosdc.dsk
+LDSKCOCOSDC	= $(DISTRONAME)$(PORT)_cocosdc.dsk
 
 DSKS		= $(DSKDW) $(DSKDWHEADLESS) $(DSKBECKER) $(DSKBECKERHEADLESS) \
-		$(DSKARDUINO) $(DSKARDUINOHEADLESS) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+		$(DSKARDUINO) $(DSKARDUINOHEADLESS) $(DSK360K_1) $(DSK360K_2) \
+		$(DSK720K) $(DSKCOCOSDC)
 LDSKS		= $(LDSKDW) $(LDSKDWHEADLESS) $(LDSKBECKER) $(LDSKBECKERHEADLESS) \
-		$(LDSKARDUINO) $(LDSKARDUINOHEADLESS) $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)
+		$(LDSKARDUINO) $(LDSKARDUINOHEADLESS) $(LDSK360K_1) $(LDSK360K_2) \
+		$(LDSK720K) $(LDSKCOCOSDC)
 
 # Make all components
 all:
@@ -259,6 +265,60 @@
 	$(RM) $(LDSKARDUINO)
 	$(SOFTLINK) $@ $(LDSKARDUINO)
 
+$(DSKCOCOSDC):
+	$(RM) $@
+	$(OS9FORMAT) -t1024 -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_COCOSDC) -t=$(KERNELFILE_COCOSDC)
+	$(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) $(LDSKCOCOSDC)
+	$(SOFTLINK) $@ $(LDSKCOCOSDC)
+
 $(DSKDWHEADLESS):
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 1"
--- a/level1/coco1/modules/makefile	Sun Feb 08 17:55:45 2015 -0600
+++ b/level1/coco1/modules/makefile	Sun Feb 22 12:39:13 2015 +0100
@@ -23,7 +23,7 @@
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
 		boot_burke boot_rampak boot_wd1002 boot_dw \
 		boot_tc3 boot_ide boot_rom boot_dw_becker \
-		boot_dw_arduino boot_dw_coco1
+		boot_dw_arduino boot_dw_coco1 boot_sdc
 BOOTTRACK	= rel $(BOOTERS)
 KERNEL		= krn krnp2 wbug
 SYSMODS		= ioman init sysgo_dd sysgo_h0 rominfo rominfo_pak vectors
@@ -39,10 +39,11 @@
 		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \
 		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd \
 		ddx0.dd x0.dd x1.dd x2.dd x3.dd \
-		rbsuper.dr lltc3.dr llide.dr \
+		rbsuper.dr lltc3.dr llide.dr llcocosdc.dr \
 		ddi0_ide.dd i0_ide.dd i1_ide.dd ih_ide.dd \
 		dds0_tc3.dd s0_tc3.dd s1_tc3.dd s2_tc3.dd s3_tc3.dd s4_tc3.dd \
-                s5_tc3.dd s6_tc3.dd sh_tc3.dd
+                s5_tc3.dd s6_tc3.dd sh_tc3.dd \
+		ddsd0_cocosdc.dd sd0_cocosdc.dd sd1_cocosdc.dd
 
 SCF		= scf.mn \
 		sc6551.dr vrn.dr scbbp.dr scbbt.dr scdwp.dr sspak.dr vtio.dr \
@@ -85,6 +86,10 @@
 boot_ide: boot_ide.asm
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
+# CoCo SDC Booter
+boot_sdc: boot_sdc.asm
+	$(AS) $(ASOUT)$@ $< $(SDFLAGS)
+
 # DriveWire Becker Booter
 boot_dw_becker:	boot_dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1
@@ -310,6 +315,16 @@
 ih_ide.dd: superdesc.asm
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS)
 
+# CoCo SDC Descriptors
+ddsd0_cocosdc.dd: superdesc.asm
+	$(AS) $(ASOUT)$@ $< $(SDFLAGS) -DDD=1
+
+sd0_cocosdc.dd: superdesc.asm
+	$(AS) $(ASOUT)$@ $< $(SDFLAGS) -DITDRV=0
+
+sd1_cocosdc.dd: superdesc.asm
+	$(AS) $(ASOUT)$@ $< $(SDFLAGS) -DITDRV=1
+
 # RFM descriptors
 ddy0.dd: rfmdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0