Commit 24276dc4 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Spinner and Ursula branches merged.

Changed to use srccommit.
Ancient [ Version < x conditionals removed.

Version 0.21. Tagged as 'Filter-0_21'
parent d605e7f9
......@@ -71,17 +71,20 @@ resources: resources-${CMDHELP}
resources_common: ${MERGEDRESOURCE}
${MKDIR} ${RESDIR}.${COMPONENT}
${CP} Resources.${LOCALE}.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
TokenCheck LocalRes:Messages
${CP} LocalRes:Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
resources-None: resources_common
@
resources-: resources_common
print Resources.${LOCALE}.CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
TokenCheck LocalRes:CmdHelp
print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
${MERGEDRESOURCE}: Resources.${LOCALE}.Messages Resources.${LOCALE}.CmdHelp
${CP} Resources.${LOCALE}.Messages ${MERGEDRESOURCE} ${CPFLAGS}
print Resources.${LOCALE}.CmdHelp { >> ${MERGEDRESOURCE} }
${MERGEDRESOURCE}: LocalRes:Messages LocalRes:CmdHelp
TokenCheck LocalRes:Messages LocalRes:CmdHelp
${CP} LocalRes:Messages ${MERGEDRESOURCE} ${CPFLAGS}
print LocalRes:CmdHelp { >> ${MERGEDRESOURCE} }
${TARGET}: ${SOURCE} ${MERGEDRESOURCE}
${AS} ${ASFLAGS} ${SOURCE}
......
; > Version
GBLA Version
GBLS VString
GBLS Date
Version SETA 018 ; 001
VString SETS "0.19" ; "0.01"
Date SETS "05 Mar 1998" ; "16 Nov 1990"
END
......@@ -5,8 +5,8 @@
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
Module_MajorVersion SETS "0.20"
Module_Version SETA 20
Module_MajorVersion SETS "0.21"
Module_Version SETA 21
Module_MinorVersion SETS ""
Module_Date SETS "05 Oct 1998"
END
/* (0.20)
/* (0.21)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.20
#define Module_MajorVersion_CMHG 0.21
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 05 Oct 1998
#define Module_MajorVersion "0.20"
#define Module_Version 20
#define Module_MajorVersion "0.21"
#define Module_Version 21
#define Module_MinorVersion ""
#define Module_Date "05 Oct 1998"
......@@ -57,7 +57,7 @@ Module_BaseAddr
GET Hdr:NdrDebug
GET Hdr:Switcher
GET Version
GET VersionASM
GBLL hostvdu
GBLL debugxx
......
......@@ -38,7 +38,10 @@ MySWIBase * Module_SWISystemBase + FilterSWI * Module_SWIChunkSize
; ----------------------------------------------------------------------------------------------------------------------
Title DCB "FilterManager",0
Helpstr DCB "Filter Manager",9,"$VString ($Date)"
Helpstr DCB "Filter Manager",9,"$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
= " $Module_MinorVersion"
]
[ standalone
= " (Stand alone)"
]
......@@ -592,7 +595,7 @@ servicecallback
MOV R1,#0 ; the callback has been granted, so flag as no longer pending
STR R1,callbackpending
LDR R0,=Version
LDR R0,=Module_Version
MOV R1,#Service_FilterManagerInstalled
SWI XOS_ServiceCall ; broadcast the service
......@@ -601,12 +604,24 @@ servicecallback
; ----------------------------------------------------------------------------------------------------------------------
; Module service entry point
ServiceTable
DCD 0 ; flags word
DCD Service2 - Module_BaseAddr
[ standalone
DCD Service_ResourceFSStarting ; &60 ;
] ; must be in ascending order
DCD Service_WimpRegisterFilters ; &86 ;
DCD 0 ; terminator
DCD ServiceTable - Module_BaseAddr
Service
MOV R0, R0 ; flag service table to aware kernels
TEQ R1,#Service_WimpRegisterFilters
[ standalone
TEQNE R1,#Service_ResourceFSStarting
TEQNE R1,#Service_ResourceFSStarting
]
MOVNE PC,LR
MOVNES PC,LR
Service2
[ standalone
TEQ R1,#Service_ResourceFSStarting
BEQ serviceresourcefsstarting
......@@ -749,57 +764,6 @@ serviceresourcefsstarting
]
; ----------------------------------------------------------------------------------------------------------------------
; Reset button pressed. Wimp has shut down. Release filter handlers. Release linked lists of filters.
[ Version < 4
svc_reset
Push "R0-R2, LR"
ADR r2, pre_filters
BL free_list ; Free list of pre filters
ADR r2, rect_filters
BL free_list ; Free list of rect filters
ADR r2, post_filters
BL free_list ; Free list of post filters
ADR r2, post_rect_filters
BL free_list ; Free list of post rect filters
ADR r2, post_icon_filters
BL free_list ; Free list of post icon filters
ADR r2, copy_filters
BL free_list ; Free list of copy filters
MOV R0,#WimpFilter_PrePoll
MOV R1,#0
MOV R2,#0
SWI XWimp_RegisterFilter ; Ignore errors.
MOV R0,#WimpFilter_GetRectangle
MOV R1,#0
MOV R2,#0
SWI XWimp_RegisterFilter ; Ignore errors.
MOV R0,#WimpFilter_PostPoll
MOV R1,#0
MOV R2,#0
SWI XWimp_RegisterFilter ; Ignore errors.
MOV R0,#WimpFilter_BlockCopy
MOV R1,#0
MOV R2,#0
SWI XWimp_RegisterFilter ; Ignore errors.
MOV R0,#WimpFilter_PostGetRectangle
MOV R1,#0
MOV R2,#0
SWI XWimp_RegisterFilter ; Ignore errors.
MOV R0,#WimpFilter_PostIconGetRectangle
MOV R1,#0
MOV R2,#0
SWI XWimp_RegisterFilter ; Ignore errors.
Pull "R0-R2, PC",,^
]
; ----------------------------------------------------------------------------------------------------------------------
; RMKill'ing the module - Release filter handlers. Release linked lists of filters.
Die
Push "R0-R11,LR"
......@@ -868,13 +832,6 @@ Die
SWI XResourceFS_DeregisterFiles ; ignore errors
]
[ Version < 5
; Release all workspace
MOV r2, r12
MOV r0, #ModHandReason_Free
SWI XOS_Module
]
BL MsgTrans_CloseFile ; Make sure Messages file is closed.
Pull "R0-R11,PC",,^ ; don't refuse to die
......
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