# HG changeset patch
# User boisy
# Date 1058880756 0
# Node ID 70923b54cc471552cf822abac09b47acf60e422e
# Parent  6d4a60e7ecf053b086a2a0dc319d77adca078a6a
cc3go_dd and cc3go_h0 are now part of the distribution, replacing cc3go.
rel module now has conditional for 50Hz systems (to be implemented)

diff -r 6d4a60e7ecf0 -r 70923b54cc47 level2/coco3/ChangeLog
--- a/level2/coco3/ChangeLog	Fri Jul 11 19:46:38 2003 +0000
+++ b/level2/coco3/ChangeLog	Tue Jul 22 13:32:36 2003 +0000
@@ -1,4 +1,6 @@
 OS-9 Level Two V03.01.04:
+- There are now two versions of cc3go: cc3go_h0 which performs chd/chx
+  to /H0 on startup, and cc3go_dd which performs chd/chx to /DD on startup.
 - A compatibility issue with os9gen's -t option and OS-9 Level One     
   has been resolved.
 
diff -r 6d4a60e7ecf0 -r 70923b54cc47 level2/coco3/bootlists/standard.bl
--- a/level2/coco3/bootlists/standard.bl	Fri Jul 11 19:46:38 2003 +0000
+++ b/level2/coco3/bootlists/standard.bl	Tue Jul 22 13:32:36 2003 +0000
@@ -81,14 +81,14 @@
 * RAMDisk driver
 *../MODULES/RBF/rammer.dr
 * RAMDisk descriptors - select as needed
-*../MODULES/RBF/ddr0_8k.dr
-*../MODULES/RBF/ddr0_96k.dr
-*../MODULES/RBF/ddr0_128k.dr
-*../MODULES/RBF/ddr0_192k.dr
-*../MODULES/RBF/r0_8k.dr
-*../MODULES/RBF/r0_96k.dr
-*../MODULES/RBF/r0_128k.dr
-*../MODULES/RBF/r0_192k.dr
+*../MODULES/RBF/ddr0_8k.dd
+*../MODULES/RBF/ddr0_96k.dd
+*../MODULES/RBF/ddr0_128k.dd
+*../MODULES/RBF/ddr0_192k.dd
+*../MODULES/RBF/r0_8k.dd
+*../MODULES/RBF/r0_96k.dd
+*../MODULES/RBF/r0_128k.dd
+*../MODULES/RBF/r0_192k.dd
 ***************************************
 * SCF Section
 *
@@ -191,6 +191,10 @@
 ***************************************
 * System Kick-Start Module
 *
+* Choose which startup module you wish to use. (cc3go_dd is recommended
+* for most configurations.)
+*
 * Alternatively, this module can reside in the root directory of the
 * boot device, saving precious system RAM.
-../MODULES/SYSMODS/cc3go
+../MODULES/SYSMODS/cc3go_dd
+*../MODULES/SYSMODS/cc3go_h0
diff -r 6d4a60e7ecf0 -r 70923b54cc47 level2/coco3_6309/ChangeLog
--- a/level2/coco3_6309/ChangeLog	Fri Jul 11 19:46:38 2003 +0000
+++ b/level2/coco3_6309/ChangeLog	Tue Jul 22 13:32:36 2003 +0000
@@ -1,4 +1,6 @@
 OS-9 Level Two V03.01.04:
+- There are now two versions of cc3go: cc3go_h0 which performs chd/chx
+  to /H0 on startup, and cc3go_dd which performs chd/chx to /DD on startup.
 - A compatibility issue with os9gen's -t option and OS-9 Level One     
   has been resolved.
 
diff -r 6d4a60e7ecf0 -r 70923b54cc47 level2/coco3_6309/bootlists/standard.bl
--- a/level2/coco3_6309/bootlists/standard.bl	Fri Jul 11 19:46:38 2003 +0000
+++ b/level2/coco3_6309/bootlists/standard.bl	Tue Jul 22 13:32:36 2003 +0000
@@ -81,14 +81,14 @@
 * RAMDisk driver
 *../MODULES/RBF/rammer.dr
 * RAMDisk descriptors - select as needed
-*../MODULES/RBF/ddr0_8k.dr
-*../MODULES/RBF/ddr0_96k.dr
-*../MODULES/RBF/ddr0_128k.dr
-*../MODULES/RBF/ddr0_192k.dr
-*../MODULES/RBF/r0_8k.dr
-*../MODULES/RBF/r0_96k.dr
-*../MODULES/RBF/r0_128k.dr
-*../MODULES/RBF/r0_192k.dr
+*../MODULES/RBF/ddr0_8k.dd
+*../MODULES/RBF/ddr0_96k.dd
+*../MODULES/RBF/ddr0_128k.dd
+*../MODULES/RBF/ddr0_192k.dd
+*../MODULES/RBF/r0_8k.dd
+*../MODULES/RBF/r0_96k.dd
+*../MODULES/RBF/r0_128k.dd
+*../MODULES/RBF/r0_192k.dd
 ***************************************
 * SCF Section
 *
@@ -191,6 +191,10 @@
 ***************************************
 * System Kick-Start Module
 *
+* Choose which startup module you wish to use. (cc3go_dd is recommended
+* for most configurations.)
+*
 * Alternatively, this module can reside in the root directory of the
 * boot device, saving precious system RAM.
-../MODULES/SYSMODS/cc3go
+../MODULES/SYSMODS/cc3go_dd
+*../MODULES/SYSMODS/cc3go_h0
diff -r 6d4a60e7ecf0 -r 70923b54cc47 level2/makefile
--- a/level2/makefile	Fri Jul 11 19:46:38 2003 +0000
+++ b/level2/makefile	Tue Jul 22 13:32:36 2003 +0000
@@ -21,7 +21,7 @@
 SYSBIN		= $(shell $(CD) SYS; make showbinobjs)
 SYSTEXT		= $(shell $(CD) SYS; make showtextobjs)
 ROOTFILES	= startup
-SYSGO		= cc3go
+SYSGO		= cc3go_dd
 
 PACKAGENAME	= $(RELEASE).zip
 DSK1		= $(RELEASE)_ds40_1.dsk
@@ -60,8 +60,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) MODULES/$(SYSGO) $@,
-	$(OS9ATTR_EXEC) $@,$(SYSGO)
+	$(CP) MODULES/$(SYSGO) $@,cc3go
+	$(OS9ATTR_EXEC) $@,cc3go
 	$(CD) CMDS; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) SYS; $(CP) $(SYSBIN) ../$@,SYS
diff -r 6d4a60e7ecf0 -r 70923b54cc47 level2/modules/makefile
--- a/level2/modules/makefile	Fri Jul 11 19:46:38 2003 +0000
+++ b/level2/modules/makefile	Tue Jul 22 13:32:36 2003 +0000
@@ -20,7 +20,7 @@
 		 boot_burke boot_idelba boot_rampak boot_wd1002
 BOOTTRACK	= rel $(BOOTERS) os9p1
 KERNEL		= os9p2 os9p3_perr os9p4_regdump
-SYSMODS		= ioman init cc3go
+SYSMODS		= ioman init cc3go_h0 cc3go_dd
 CLOCKS          = clock_elim clock_disto2 clock_disto4 clock_bnb \
 		clock_smart clock_harris clock_tc3 clock_soft
 
@@ -30,7 +30,7 @@
 		d0_40d.dd d1_40d.dd d2_40d.dd d0_80d.dd \
 		d1_80d.dd d2_80d.dd ddd0_35s.dd ddd0_40d.dd \
 		ddd0_80d.dd r0_8k.dd r0_96k.dd r0_128k.dd r0_192k.dd \
-		ddr0_8k.dd ddr0_96k.dd ddr0_128k.dd ddr0_192k.dd \
+		ddr0_8k.dd ddr0_96k.dd ddr0_128k.dd ddr0_192k.dd md.dd \
 		h0_10.dd h1_10.dd h0_15.dd h1_15.dd h0_35.dd h1_35.dd
 
 SCF		= scf.mn \
@@ -71,6 +71,12 @@
 cc3hdisk.dr: $(LEVEL1)/MODULES/cchdisk.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 
+cc3go_dd: cc3go.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1
+	
+cc3go_h0: cc3go.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS)
+	
 # Floppy descriptors
 SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
 		-aInterlv=3 -aSAS=8 -aDensity=1
diff -r 6d4a60e7ecf0 -r 70923b54cc47 level2/modules/rel.asm
--- a/level2/modules/rel.asm	Fri Jul 11 19:46:38 2003 +0000
+++ b/level2/modules/rel.asm	Tue Jul 22 13:32:36 2003 +0000
@@ -61,7 +61,11 @@
          fdb   $0900      timer
          fcb   $00        unused
          fcb   $00        unused
-         fcb   $00
+         IFEQ  TkPerSec-50
+         fcb   $08	50Hz refresh
+         ELSE
+         fcb   $00	60Hz refresh
+         ENDC
          fcb   $00
          fcb   $00
          fcb   $00