# HG changeset patch
# User boisy
# Date 1026909666 0
# Node ID 3fa31ecd389a6576033e2e55145af51029a35b7e
# Parent  61fa267967306ace1b723b121e95fb5e75f9c7d4
Modified oscode to allow conditional assembly for Dragon 64

diff -r 61fa26796730 -r 3fa31ecd389a level1/modules/makefile
--- a/level1/modules/makefile	Wed Jul 17 07:56:32 2002 +0000
+++ b/level1/modules/makefile	Wed Jul 17 12:41:06 2002 +0000
@@ -39,6 +39,12 @@
 	$(MERGE) $(KERNEL_1773)>$@
 	$(PADROM) \$$1200 $@ -c=\$$E5
 
+oscode: oscode.asm
+	$(AS) $(ASOUT)$@ $< -aDragon64=0
+
+oscode_d64: oscode.asm
+	$(AS) $(ASOUT)$@ $< -aDragon64=1
+
 clean:
 	$(RM) $(ALLOBJS)
 	$(OS92UNIX) $(HELP)
diff -r 61fa26796730 -r 3fa31ecd389a level1/modules/oscode.asm
--- a/level1/modules/oscode.asm	Wed Jul 17 07:56:32 2002 +0000
+++ b/level1/modules/oscode.asm	Wed Jul 17 12:41:06 2002 +0000
@@ -6,13 +6,17 @@
 * Ed.    Comments                                       Who YY/MM/DD
 * ------------------------------------------------------------------
 *        From Tandy OS-9 Level One VR 02.00.00
+*        Also put in conditionals for the Dragon 64
 
          ifp1
          use   defsfile
          endc
 
+ScrnLoc  equ   $8000
+OS9Start equ   $EF00
+OS9Size  equ   $0F80
+
 * Initial code executed upon booting up to OS-9
-         org   $2600
 
 Start    fcc   /OS/
          bra   L2620
@@ -24,6 +28,11 @@
 BootMLen equ   *-BootMsg
 
 L2620    clr   PIA.U4+3
+
+         ifne  Dragon64
+         clr   PIA.U4+1			added for Dragon, works on CoCo
+         endc
+
          sta   $FFDF                   turn off ROM
 * locate Boot Text Screen at $8000
          ldb   #$06
@@ -33,16 +42,16 @@
          bne   L262B
          sta   1,x
 
-* clear screen at $8000
-         ldx   #$8000
-         ldy   #$0200
+* Clear VDG screen
+         ldx   #ScrnLoc
+         ldy   #512
          lda   #$60
 L263B    sta   ,x+
          leay  -1,y
          bne   L263B
 
 * Copy "OS9 BOOT" to screen area
-         ldx   #$810C
+         ldx   #ScrnLoc+$10C
          leay  <BootMsg,pcr
          ldb   #BootMLen
 L2649    lda   ,y+
@@ -50,17 +59,22 @@
          decb
          bne   L2649
 
+         ifne  Dragon64
+         tst   <$72
+         else
          ldd   #$1212
          cmpd  <$0078
+         endc
+
          beq   L266E
          leau  >Start,pcr
-         ldx   #$0F80
-         ldy   #$EF00
+         ldx   #OS9Size
+         ldy   #OS9Start
 L2663    lda   ,u+
          sta   ,y+
          leax  -1,x
          bne   L2663
-         jmp   >$EF5C
+         jmp   >OS9Start+L266E
 L266E    leax  <eoc,pcr
          ldd   $09,x
          jmp   d,x