# HG changeset patch
# User boisy
# Date 1036448910 0
# Node ID e70529a05aca19ec53b32482e1418c0e0c8ae3ce
# Parent  4be6f027b201a279d77e17115b32c5884865fa4d
Cleanup for Phoenix Release

diff -r 4be6f027b201 -r e70529a05aca level1/ChangeLog
--- a/level1/ChangeLog	Mon Nov 04 21:46:23 2002 +0000
+++ b/level1/ChangeLog	Mon Nov 04 22:28:30 2002 +0000
@@ -1,5 +1,6 @@
-OS-9 Level One V2.01.00 Beta2:
+OS-9 Level One V2.01.00 'Phoenix' Release (11/04/2002):
 - Defs files now have properly terminated lines and 'pag' is now emitted
   as a comment.
 - SYS/password now references /DD instead of /D0
+- ASM now assembles 6309 op-codes
 
diff -r 4be6f027b201 -r e70529a05aca level1/ReleaseNotes
--- a/level1/ReleaseNotes	Mon Nov 04 21:46:23 2002 +0000
+++ b/level1/ReleaseNotes	Mon Nov 04 22:28:30 2002 +0000
@@ -51,7 +51,7 @@
 
 Command		Edition		Comments
 -------		-------		-----------------------------------
-asm		6		Y2K issues resolved
+asm		6		Y2K issues resolved, 6309 compatible
 attr		11		From OS-9 Level Two V2.00.01
 backup		8		Unchanged from last Tandy release
 binex		68		Put proper edition in place in code
diff -r 4be6f027b201 -r e70529a05aca level1/makefile
--- a/level1/makefile	Mon Nov 04 21:46:23 2002 +0000
+++ b/level1/makefile	Mon Nov 04 22:28:30 2002 +0000
@@ -11,8 +11,8 @@
 ROOTFILES	= startup
 
 PACKAGENAME	= $(RELEASE).zip
-DSK_DS40_1	= $(RELEASE)_ds40_1.dsk
-DSK_DS40_2	= $(RELEASE)_ds40_2.dsk
+DSK_SS35_1	= $(RELEASE)_ss35_1.dsk
+DSK_SS35_2	= $(RELEASE)_ss35_2.dsk
 
 # Make all components
 all:
@@ -39,26 +39,27 @@
 	-$(OS92UNIX) $(ROOTFILES)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2)
+	-$(RM) $(PACKAGENAME) $(DSK_SS35_1) $(DSK_SS35_2)
 
 dsk: all $(PACKAGENAME)
 
-$(PACKAGENAME): $(DSK_DS40_1) $(DSK_DS40_2)
-	$(ZIP) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2) ReleaseNotes ChangeLog
+$(PACKAGENAME): $(DSK_SS35_1) $(DSK_SS35_2)
+	$(ZIP) $(PACKAGENAME) $(DSK_SS35_1) $(DSK_SS35_2) ReleaseNotes ChangeLog
 
-$(DSK_DS40_1):
-	$(RM) $(DSK_DS40_1)
-	$(OS9FORMAT) $(DSK_DS40_1) -t40 -h1 -n"OS-9 Level One System Disk"
-	$(OS9GEN) $(DSK_DS40_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
-	$(MAKDIR) $(DSK_DS40_1),CMDS
-	$(MAKDIR) $(DSK_DS40_1),SYS
-	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_DS40_1),CMDS
-	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS40_1),SYS
-	$(CP) $(ROOTFILES) $(DSK_DS40_1),.
+$(DSK_SS35_1):
+	$(RM) $(DSK_SS35_1)
+	$(OS9FORMAT) $(DSK_SS35_1) -t35 -h1 -n"OS-9 Level One System Disk"
+	$(OS9GEN) $(DSK_SS35_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
+	$(MAKDIR) $(DSK_SS35_1),CMDS
+	$(MAKDIR) $(DSK_SS35_1),SYS
+	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_SS35_1),CMDS
+	$(CD) SYS; $(CP) $(SYS) ../$(DSK_SS35_1),SYS
+	$(CP) $(ROOTFILES) $(DSK_SS35_1),.
 
-$(DSK_DS40_2):
-	-$(RM) $(DSK_DS40_2)
-	$(OS9FORMAT) $(DSK_DS40_2) -t40 -h1 -n"OS-9 Level One Development Disk"
-	$(MAKDIR) $(DSK_DS40_2),DEFS
-	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_DS40_2),DEFS
-
+$(DSK_SS35_2):
+	$(RM) $(DSK_SS35_2)
+	$(OS9FORMAT) $(DSK_SS35_2) -t35 -h1 -n"OS-9 Level One Modules Disk"
+	$(MAKDIR) $(DSK_SS35_2),MODULES
+	$(MAKDIR) $(DSK_SS35_2),DEFS
+	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_SS35_2),MODULES
+	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_SS35_2),DEFS
diff -r 4be6f027b201 -r e70529a05aca level1/modules/sysgo.asm
--- a/level1/modules/sysgo.asm	Mon Nov 04 21:46:23 2002 +0000
+++ b/level1/modules/sysgo.asm	Mon Nov 04 22:28:30 2002 +0000
@@ -16,10 +16,10 @@
          nam   SysGo
          ttl   OS-9 Level One 2 SysGo
 
-         ifp1
+         IFP1
          use   defsfile
          use   scfdefs
-         endc
+         ENDC
 
 tylg     set   Systm+Objct
 atrv     set   ReEnt+rev
@@ -46,8 +46,8 @@
          fdb   C$CR,C$LF
 
 * For ROM version, cut down on verbage
-         ifne  DiskGo
-         fcc   !'BETA1' RELEASE 08/21/2002!
+         IFNE  DiskGo
+         fcc   !PHOENIX RELEASE 11/04/2002!
          fdb   C$CR,C$LF
          fcc   "HTTP://COCOOS9.SOURCEFORGE.NET"
          fdb   C$CR,C$LF
@@ -59,19 +59,19 @@
          fdb   C$CR,C$LF
          fcc   "ALL RIGHTS RESERVED."
          fdb   C$CR,C$LF
-         endc
+         ENDC
 
          fcb   C$LF
 MsgEnd   equ   *
 
-         ifne  DiskGo
+         IFNE  DiskGo
 ChdDev   fcc   "/DD"
          fcb   C$CR
 ChxDev   fcc   "/DD/"
 ChxPath  fcc   "CMDS"
          fcb   C$CR
          fcc   ",,,,,,,,,,"
-         endc
+         ENDC
 
 Shell    fcc   "Shell"
 CrRtn    fcb   C$CR
@@ -79,12 +79,12 @@
 AutoEx   fcc   "AutoEx"
          fcb   C$CR
 
-         ifne  DiskGo
+         IFNE  DiskGo
 Startup  fcc   "startup -p"
          fcb   C$CR
          fcc   ",,,,,,,,,,"
 StartupL equ   *-Startup
-         endc
+         ENDC
 
 * Default time packet
 *               YY MM DD HH MM SS
@@ -120,7 +120,7 @@
          leax  >TimePckt,pcr
          os9   F$STime
 
-         ifne  DiskGo
+         IFNE  DiskGo
          leax  >ChxPath,pcr
          lda   #EXEC.
          os9   I$ChgDir
@@ -132,14 +132,14 @@
          lda   #EXEC.
          os9   I$ChgDir
          bcc   DoStrtup
-         endc
+         ENDC
 
 * Set priority and do startup file
 DoStrtup os9   F$ID
          ldb   #DefPrior
          os9   F$SPrior
 
-         ifne  DiskGo
+         IFNE  DiskGo
 * First, do startup
          leax  >Shell,pcr
          leau  >Startup,pcr
@@ -148,7 +148,7 @@
          os9   F$Fork
          bcs   DeadEnd
          os9   F$Wait
-         endc
+         ENDC
 
 * Second, attempt to find AutoEx
 FrkAuto  leax  >AutoEx,pcr