Ursula branch merged.

Version 2.29. Tagged as 'ScrBlank-2_29'

UrsulaLog

+***************************************************************************
+*                                                                         *
+*  Project: Ursula                                                        *
+*                                                                         *
+*  Module:  ScrBlank                                                      *
+*                                                                         *
+*  Created: Wed 22-Apr-98      By: Richard Leggett                        *
+*                                                                         *
+*  First version: 2.27                                                    *
+*                                                                         *
+*    Copyright:    (C) 1998, Acorn Computers Ltd., Cambridge, England.    *
+*                                                                         *
+***************************************************************************
+
+---------------------------------------------------------------------------
+
+Version: 2.27 (Richard Leggett)
+
+Wed 15-Apr-98
+  - Added Ursula service call table.
+
+Checked into CVS.
+
+Wed 22-Apr-98
+  - Included ScreenBlanker_Control SWI Reason code 5 (Read Timeout2) for
+    non-LCD builds.
+

VersionASM

@@ -6,9 +6,9 @@
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
 			GBLS	Module_FullVersion
-Module_MajorVersion	SETS    "2.28"
-Module_Version          SETA    228
+Module_MajorVersion	SETS    "2.29"
+Module_Version          SETA    229
 Module_MinorVersion	SETS	""
-Module_Date		SETS    "21 May 1999"
-Module_FullVersion      SETS    "2.28"
+Module_Date		SETS    "05 Aug 1999"
+Module_FullVersion      SETS    "2.29"
                         END

VersionNum

-/* (2.28)
+/* (2.29)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	2.28
+#define Module_MajorVersion_CMHG     	2.29
 #define Module_MinorVersion_CMHG	
-#define Module_Date_CMHG      		21 May 1999
+#define Module_Date_CMHG      		05 Aug 1999
 
-#define Module_MajorVersion     	"2.28"
-#define Module_Version                  228
+#define Module_MajorVersion     	"2.29"
+#define Module_Version                  229
 #define Module_MinorVersion		""
-#define Module_Date      		"21 May 1999"
+#define Module_Date      		"05 Aug 1999"
 
-#define Module_FullVersion              "2.28"
+#define Module_FullVersion              "2.29"

s/ScrBlank

@@ -42,6 +42,7 @@
 ; 19-Jul-93     2.16    ECN: Internationalised
 ; 17-May-95     2.18    WT: Added support for LCD power control on screen blank/unblank.
 ; 11-Jul-95     2.19    RCM: Added ScreenDim code for portables.
+; 05-Aug-99     2.29    KJB: Ursula branch merged.
 ;
 
         GET     Hdr:ListOpts
@@ -69,7 +70,7 @@
 WorkRoundCallEveryBug   SETL    True            ; CallEvery seems to add 1 to the specified timeout
 
         GBLL    LCDSupport
-LCDSupport      SETL    True
+LCDSupport      SETL    False
 
         GBLL    Stork
 Stork           SETL    LCDSupport
@@ -218,7 +219,7 @@ SWIDecode
         B       Go_SetDimTime
         B       Go_ReadDimTime
  |
-        B       badreason
+        B       Go_ReadTimeout2
         B       badreason
         B       badreason
  ]
@@ -293,14 +294,14 @@ ConvertTicksToSecs      ENTRY   "R0,R2"
         DivRem  R1, R0, R2, LR
         EXIT
 
- [ Stork
+; [ Stork
 ; R0 is time in ticks.  Leaves time in centi-seconds in R1.
 
 ConvertTicksToCS        ENTRY   "R0,R2"
         MOV     R2, #TickDelta  ;centi-seconds per tick
         MUL     R1, R0, R2
         EXIT
- ]
+; ]
 
 ; R1 is unblanked time in centiseconds
 ; R2 is blanked time in centiseconds
@@ -354,13 +355,13 @@ Go_ReadTimeout
         CLRV
         Pull    "PC"
 
- [ Stork
 Go_ReadTimeout2
         LDR     R0, NormOnTime
         BL      ConvertTicksToCS
         CLRV
         Pull    "PC"
 
+ [ Stork
 ; R1 holds dimmer time in centiseconds (or 0 for "never")
 ; Input registers corrupted
 
@@ -893,8 +894,31 @@ ReclaimVectorsAndStuff ENTRY "R0-R2"
         BLEQ    ClaimVectorsAndStuff
         EXIT
 
+; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+; Table of service calls we want
+
+        ASSERT  Service_ModeChange > Service_Reset
+        ASSERT  Service_ScreenBlanked > Service_ModeChange
+        ASSERT  Service_ScreenRestored > Service_ScreenBlanked
+
+ServiceTable
+        DCD     0
+        DCD     ServiceUrsula - Module_BaseAddr
+        DCD     Service_Reset
+        [ 0 = 1
+        DCD     Service_ModeChange
+        ]
+        [ DebugServices
+        DCD     Service_ScreenBlanked
+        DCD     Service_ScreenRestored
+        ]
+        DCD     0
+        DCD     ServiceTable - Module_BaseAddr
 
 Service
+        MOV     r0, r0          ; Indicates there is a service call table
+
+ServiceUrsula
         LDR     R12, [R12]      ; get workspace pointer
 
         [ DebugServices