Commit 38cc13c6 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Ursula branch merged. Tagged as Display-0_36.

parent 165c3cc4
No preview for this file type
......@@ -50,7 +50,15 @@
; 28-Oct-94 0.31 SMC Added message tokenisation support.
; 21-Dec-94 0.32 SMC Changed to correct format for version string.
; 11-Jan-95 0.33 SMC Improved wording of invalid mode error.
; 12-May-00 0.34 KJB 32-bit compatible.
; 29-May-97 0.34 KJB Stopped responding to Service_MessageFileClosed. Responding to this
; allowed instant response to resource changes while actually running,
; but the code had the disadvantage that mode selections in progress
; were lost when this service call happens. Thanks to ShareFS, files
; pop in and out of ResourceFS a lot, causing a lot of service calls.
; Hence this behaviour was more of a hindrance than a help. Especially
; as territories are only normally loaded outside the desktop.
; 15-Apr-98 0.35 MJS Ursula service format.
; 12-May-00 0.36 KJB 32-bit compatible.
;
GBLA Version
......@@ -59,8 +67,8 @@
; REMEMBER TO UPDATE VERSION IN MESSAGES FILE
Version SETA 034 ; 000
VString SETS "0.34" ; "0.00"
Version SETA 036 ; 000
VString SETS "0.36" ; "0.00"
Date SETS "12 May 2000" ; "Development"
END
END
......@@ -82,6 +82,10 @@ SortOnPixelShape SETL true
GBLL NewShading
NewShading SETL true
GBLL MessageChanging
MessageChanging SETL false
;---------------------------------------------------------------------------
; Get the sources.
;
......
......@@ -138,7 +138,52 @@ Mod_PathDefault DCB "Resources:$.Resources.Display.",0
;---------------------------------------------------------------------------
; Service call handler.
;
;Ursula format
;
ASSERT Service_Reset < Service_ModeChange
ASSERT Service_ModeChange < Service_StartWimp
ASSERT Service_StartWimp < Service_StartedWimp
ASSERT Service_StartedWimp < Service_CalibrationChanged
ASSERT Service_CalibrationChanged < Service_WimpPalette
ASSERT Service_WimpPalette < Service_MessageFileClosed
ASSERT Service_MessageFileClosed < Service_ResourceFSStarting
ASSERT Service_ResourceFSStarting < Service_ModeFileChanged
;
UServTab
DCD 0
DCD UService - Module_BaseAddr
DCD Service_Reset
DCD Service_ModeChange
DCD Service_StartWimp
DCD Service_StartedWimp
DCD Service_CalibrationChanged
DCD Service_WimpPalette
[ MessageChanging
DCD Service_MessageFileClosed
]
[ standalone
DCD Service_ResourceFSStarting
]
DCD Service_ModeFileChanged
DCD 0
DCD UServTab - Module_BaseAddr
Mod_Service
MOV r0, r0
TEQ r1, #Service_StartWimp
TEQNE r1, #Service_StartedWimp
TEQNE r1, #Service_Reset
TEQNE r1, #Service_ModeChange
TEQNE r1, #Service_WimpPalette
TEQNE r1, #Service_CalibrationChanged
TEQNE r1, #Service_ModeFileChanged
[ standalone
TEQNE r1, #Service_ResourceFSStarting
]
[ MessageChanging
TEQNE r1, #Service_MessageFileClosed
]
MOVNE pc, lr
UService
TEQ r1, #Service_StartWimp
BEQ svc_startwimp
......@@ -167,6 +212,7 @@ Mod_Service
BEQ svc_resourcefsstarting
]
[ MessageChanging
TEQ r1, #Service_MessageFileClosed
MOVNE pc, lr
......@@ -177,7 +223,7 @@ svc_messagefileclosed
LDR lr, task_handle ; Make sure we are a task.
TEQ lr, #0
EXIT EQ
[ {FALSE}
[ {FALSE}
; We don't actually have to re-open the message file using
; MessageTrans_OpenFile as it says in the PRM. MessageTrans
; remembers the file block and will open the file for us when
......@@ -185,13 +231,15 @@ svc_messagefileclosed
LDRB lr, flags
BIC lr, lr, #f_messagesopen
STRB lr, flags
]
]
BL Menu_Init ; Re-open messages file and build all menus.
LDRVC lr, pollword
ORRVC lr, lr, #pf_modeinit :OR: pf_refreshicons
STRVC lr, pollword
EXIT
|
MOV pc, lr ; Just in case...
] ; MessageChanging
svc_reset
ENTRY "r0-r3"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment