# HG changeset patch
# User boisy
# Date 1090066831 0
# Node ID 558cab4680526d3715f1602cc4a9be851047c365
# Parent  d696f50c0c674f8bf83763cee8e3a3ee0c04cada
RG fixed a bug in the Vavasour emulator clock2 module.
clock2 is now of type Sbrtn instead of Systm.  clock.asm has been modified
to link to this type.

diff -r d696f50c0c67 -r 558cab468052 docs/Getting Started With NitrOS-9.doc
Binary file docs/Getting Started With NitrOS-9.doc has changed
diff -r d696f50c0c67 -r 558cab468052 level1/modules/clock.asm
--- a/level1/modules/clock.asm	Fri Jul 16 19:16:37 2004 +0000
+++ b/level1/modules/clock.asm	Sat Jul 17 12:20:31 2004 +0000
@@ -189,7 +189,7 @@
          tfr   a,dp
 
          leax  <Clock2,pcr
-         lda   #Systm+Objct
+         lda   #Sbrtn+Objct
          os9   F$Link    
          bcc   LinkOk    
          jmp   >$FFFE		reset
@@ -665,7 +665,7 @@
          stx   <D.Proc   
 
          leax  <Clock2,pcr
-         lda   #Systm+Objct
+         lda   #Sbrtn+Objct
          os9   F$Link    
 
 * And here, we restore the original D.Proc value
diff -r d696f50c0c67 -r 558cab468052 level1/modules/clock2.asm
--- a/level1/modules/clock2.asm	Fri Jul 16 19:16:37 2004 +0000
+++ b/level1/modules/clock2.asm	Sat Jul 17 12:20:31 2004 +0000
@@ -76,7 +76,7 @@
 *
 * Start of module
 *
-         mod   len,name,Systm+Objct,ReEnt+0,JmpTable,RTC.Base
+         mod   len,name,Sbrtn+Objct,ReEnt+0,JmpTable,RTC.Base
 
 name     fcs   "Clock2"  
          fcb   1         
@@ -126,15 +126,16 @@
          std   <D.Year     tell OS-9
          IFNE  H6309
          ldq   3,x         get all time values
-         stq   <D.Day
+         sta   <D.Day
+         stw   <D.Hour
          ELSE
          lda   3,x         get day
          sta   <D.Day
          ldd   5,x         get hour/minute
          std   <D.Hour
+         ENDC
          lda   7,x
          sta   <D.Sec
-         ENDC
          rts
          ENDC
 
@@ -639,9 +640,10 @@
 UpdMin   clrb             seconds=00
          std   <D.Min     save min,secs
 UpdTExit rts             
+
+months   fcb   31,28,31,30,31,30,31,31,30,31,30,31 Days in each month
          ENDC            
 
-months   fcb   31,28,31,30,31,30,31,31,30,31,30,31 Days in each month
 
 
 SetTime  equ   *         
diff -r d696f50c0c67 -r 558cab468052 level2/coco3/bootfiles/makefile.cust
--- a/level2/coco3/bootfiles/makefile.cust	Fri Jul 16 19:16:37 2004 +0000
+++ b/level2/coco3/bootfiles/makefile.cust	Sat Jul 17 12:20:31 2004 +0000
@@ -116,11 +116,11 @@
                 $(C9)/Products/SuperDrivers/software/6809l2/s6_tc3.dd \
                 $(C9)/Products/SuperDrivers/software/6809l2/s7_tc3.dd \
                 $(C9)/Products/SuperDrivers/software/6809l2/sh_255_tc3.dd \
-                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
-                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x1.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x2.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x3.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \
+                $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \
                 $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
                 $(MD)/scf.mn $(MD)/cc3io.dr \
                 $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -132,11 +132,11 @@
                 $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
                 $(MD)/clock_60hz \
                 $(C9)/Products/DriveWire/software/6809l2/clock2_dw
-#                $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \
-#                $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \
-#                $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \
-#                $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \
-#                $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
+#                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/x1.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/x2.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/x3.dd \
 
 
 BOOTFILES	= bootfile_1773 bootfile_cust
diff -r d696f50c0c67 -r 558cab468052 level2/coco3_6309/bootfiles/makefile.cust
--- a/level2/coco3_6309/bootfiles/makefile.cust	Fri Jul 16 19:16:37 2004 +0000
+++ b/level2/coco3_6309/bootfiles/makefile.cust	Sat Jul 17 12:20:31 2004 +0000
@@ -116,11 +116,11 @@
                 $(C9)/Products/SuperDrivers/software/6809l2/s6_tc3.dd \
                 $(C9)/Products/SuperDrivers/software/6809l2/s7_tc3.dd \
                 $(C9)/Products/SuperDrivers/software/6809l2/sh_255_tc3.dd \
-                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
-                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x1.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x2.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x3.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \
+                $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \
+                $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \
                 $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
                 $(MD)/scf.mn $(MD)/cc3io.dr \
                 $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -132,11 +132,11 @@
                 $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
                 $(MD)/clock_60hz \
                 $(C9)/Products/DriveWire/software/6809l2/clock2_dw
-#                $(C9)/Products/SuperDrivers/software/6809l2/lldw.dr \
-#                $(C9)/Products/SuperDrivers/software/6809l2/ddx0.dd \
-#                $(C9)/Products/SuperDrivers/software/6809l2/x1.dd \
-#                $(C9)/Products/SuperDrivers/software/6809l2/x2.dd \
-#                $(C9)/Products/SuperDrivers/software/6809l2/x3.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
+#                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/x1.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/x2.dd \
+#                $(C9)/Products/DriveWire/software/6809l2/x3.dd \
 
 
 BOOTFILES	= bootfile_1773 bootfile_cust