Mercurial > hg > Members > kono > nitros9-code

changeset 751:6ec99f9702bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
init no longer references cc3go from CMDS. This way, cc3go can still reside in memory for rom boots and other special case boots. So cc3go goes back to the root directory for those who don't want it in the bootfile. Makefile reflects this
author boisy
date Wed, 08 Jan 2003 13:58:08 +0000
parents 1bc9f2ecac47
children 9e166adbc547
files level2/coco3/bootfiles/makefile.cust level2/coco3_6309/bootfiles/makefile.cust level2/makefile level2/modules/init.asm
diffstat 4 files changed, 42 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/bootfiles/makefile.cust	Wed Jan 08 05:56:16 2003 +0000
+++ b/level2/coco3/bootfiles/makefile.cust	Wed Jan 08 13:58:08 2003 +0000
@@ -12,8 +12,8 @@
 
 KERNEL_1773	= $(MD)/rel $(MD)/boot_1773 $(MD)/os9p1
 KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/os9p1
-KERNEL_KENTON	= $(MD)/rel $(3PB)/boot_ktlr_id5 $(MD)/os9p1
-KERNEL_TC3	= $(MD)/rel $(3PB)/boot_tc3 $(MD)/os9p1
+KERNEL_KENTON	= $(MD)/rel $(3PD)/superscsi/boot_ktlr_id5_l2 $(MD)/os9p1
+KERNEL_TC3	= $(MD)/rel $(3PD)/superscsi/boot_tc3_id0_l2 $(MD)/os9p1
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_1773	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
@@ -40,26 +40,28 @@
 
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
 # This is a custom boot for Boisy's system
-BOOTFILE_TC3	= $(3PD)/scsimax/scsimax_tc3_l2.dr \
-		$(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_TC3	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+		$(3PD)/superscsi/superscsi_tc3_l2.dr \
+		$(3PD)/superscsi/h0_ez135_tc3ktlr_l2.dd \
+		$(3PD)/superscsi/dd_ez135_tc3ktlr_l2.dd \
 		$(MD)/rbf.mn \
-		$(3PD)/scsimax/h5_zip100_tc3ktlr_l2.dd \
+		$(3PD)/disto/rampak.dr $(3PD)/disto/r0_512_l2.dd \
+		$(MD)/cc3disk.dr \
+		$(MD)/d0_40d.dd $(MD)/d1_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv $(MD)/joydrv_6551L $(MD)/snddrv \
-		$(3PD)/disto/rampak.dr $(3PD)/disto/r0_256_l2.dd \
-		$(MD)/cc3disk.dr \
-		$(MD)/ddd0_40d.dd $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
-		$(MD)/windint.io $(MD)/term_win80.dt \
+		$(MD)/keydrv $(MD)/joydrv_joy $(MD)/snddrv \
+		$(MD)/windint.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_soft
+		$(MD)/clock_tc3
 		
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
-BOOTFILE_KENTON	= $(3PD)/scsimax/scsimax_ktlr_l2.dr \
+BOOTFILE_KENTON	= $(3PD)/superscsi/superscsi_ktlr_l2.dr \
 		$(MD)/os9p2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(3PD)/scsimax/h5_zip100_tc3ktlr_l2.dd \
+		$(3PD)/superscsi/h0_ez135_tc3ktlr_l2.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv $(MD)/joydrv_6551L $(MD)/snddrv \
 		$(3PD)/disto/rampak.dr $(3PD)/disto/r0_256_l2.dd \
--- a/level2/coco3_6309/bootfiles/makefile.cust	Wed Jan 08 05:56:16 2003 +0000
+++ b/level2/coco3_6309/bootfiles/makefile.cust	Wed Jan 08 13:58:08 2003 +0000
@@ -12,8 +12,8 @@
 
 KERNEL_1773	= $(MD)/rel $(MD)/boot_1773 $(MD)/os9p1
 KERNEL_ROM	= $(MD)/rel $(3PB)/boot_rom $(MD)/os9p1
-KERNEL_KENTON	= $(MD)/rel $(3PB)/boot_ktlr_id5 $(MD)/os9p1
-KERNEL_TC3	= $(MD)/rel $(3PB)/boot_tc3 $(MD)/os9p1
+KERNEL_KENTON	= $(MD)/rel $(3PD)/superscsi/boot_ktlr_id5_l2 $(MD)/os9p1
+KERNEL_TC3	= $(MD)/rel $(3PD)/superscsi/boot_tc3_id0_l2 $(MD)/os9p1
 
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_1773	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
@@ -40,26 +40,28 @@
 
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
 # This is a custom boot for Boisy's system
-BOOTFILE_TC3	= $(3PD)/scsimax/scsimax_tc3_l2.dr \
-		$(MD)/os9p2 $(MD)/ioman $(MD)/init \
+BOOTFILE_TC3	= $(MD)/os9p2 $(MD)/ioman $(MD)/init \
+		$(3PD)/superscsi/superscsi_tc3_l2.dr \
+		$(3PD)/superscsi/h0_ez135_tc3ktlr_l2.dd \
+		$(3PD)/superscsi/dd_ez135_tc3ktlr_l2.dd \
 		$(MD)/rbf.mn \
-		$(3PD)/scsimax/h5_zip100_tc3ktlr_l2.dd \
+		$(3PD)/disto/rampak.dr $(3PD)/disto/r0_512_l2.dd \
+		$(MD)/cc3disk.dr \
+		$(MD)/d0_40d.dd $(MD)/d1_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv $(MD)/joydrv_6551L $(MD)/snddrv \
-		$(3PD)/disto/rampak.dr $(3PD)/disto/r0_256_l2.dd \
-		$(MD)/cc3disk.dr \
-		$(MD)/ddd0_40d.dd $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
-		$(MD)/windint.io $(MD)/term_win80.dt \
+		$(MD)/keydrv $(MD)/joydrv_joy $(MD)/snddrv \
+		$(MD)/windint.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_soft
+		$(MD)/clock_tc3
 		
 # OS-9 disk bootfile to allow booting from Ken-Ton SCSI controller
-BOOTFILE_KENTON	= $(3PD)/scsimax/scsimax_ktlr_l2.dr \
+BOOTFILE_KENTON	= $(3PD)/superscsi/superscsi_ktlr_l2.dr \
 		$(MD)/os9p2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(3PD)/scsimax/h5_zip100_tc3ktlr_l2.dd \
+		$(3PD)/superscsi/h0_ez135_tc3ktlr_l2.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv $(MD)/joydrv_6551L $(MD)/snddrv \
 		$(3PD)/disto/rampak.dr $(3PD)/disto/r0_256_l2.dd \
--- a/level2/makefile	Wed Jan 08 05:56:16 2003 +0000
+++ b/level2/makefile	Wed Jan 08 13:58:08 2003 +0000
@@ -1,7 +1,7 @@
 include ../Makefile.rules
 
 RELEASE		= os9l2v030002beta2
-BOOTFILE	= bootfile_win80
+BOOTFILE	= bootfile_vdg
 KERNEL		= kernel_stock
 
 CMDS            = $(shell $(CD) CMDS; make showobjs)
@@ -56,7 +56,7 @@
 	$(OS9FORMAT) $(DSK_SS40_1) -t40 -h1 -n"OS-9 Level Two System Disk"
 	$(OS9GEN) $(DSK_SS40_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
 	$(MAKDIR) $(DSK_SS40_1),CMDS
-	$(CP) $(SYSGO) $(DSK_SS40_1),CMDS
+	$(CP) $(SYSGO) $(DSK_SS40_1),
 	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_SS40_1),CMDS
 	$(CP) $(ROOTFILES) $(DSK_SS40_1),.
 
@@ -67,7 +67,7 @@
 	$(MAKDIR) $(DSK_DS40_1),CMDS
 	$(MAKDIR) $(DSK_DS40_1),SYS
 	$(MAKDIR) $(DSK_DS40_1),MODULES
-	$(CP) $(SYSGO) $(DSK_DS40_1),CMDS
+	$(CP) $(SYSGO) $(DSK_DS40_1),
 	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_DS40_1),CMDS
 	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS40_1),SYS
 	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_DS40_1),MODULES
--- a/level2/modules/init.asm	Wed Jan 08 05:56:16 2003 +0000
+++ b/level2/modules/init.asm	Wed Jan 08 13:58:08 2003 +0000
@@ -1,5 +1,5 @@
 ********************************************************************
-* Init - OS-9 Level Two V3 Configuration module
+* Init - OS-9 Level Two Configuration module
 *
 * $Id$
 *
@@ -8,9 +8,15 @@
 * 204    Original OS-9 L2 Tandy distribution
 * 205    Added CC3IO and Clock sections                 BGP 98/10/12
 * 205b   Removed clock information from here            BGP 98/10/20
+*   1    Restarted edition number back to 1,            BGP 03/01/08
+*        removed CMDS/cc3go reference and just
+*        have cc3go so that in certain cases, cc3go
+*        can be in the bootfile, and so that ROMmed
+*        systems don't have to have a special init
+*        module.
 
          nam   Init
-         ttl   OS-9 Level Two V3 Configuration module
+         ttl   OS-9 Level Two Configuration module
 
          ifp1  
          use   defsfile
@@ -50,7 +56,7 @@
 name     fcs   "Init"
          fcb   edition
 
-DefProg  fcs   "CMDS/CC3Go"
+DefProg  fcs   "CC3Go"
 DefDev   fcs   "/DD"
 DefCons  fcs   "/Term"
 DefBoot  fcs   "Boot"