Skip to content

GitLab

Commit cb2f11f1 authored by John Ballance's avatar John Ballance
Browse files

Correct exit of CallbackCode to pull PC not LR 

Version 1.25. Tagged as 'FSLock-1_25'
parent 620ec992
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 23 deletions
VersionASM
View file @ cb2f11f1
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.24"
Module_Version SETA 124
Module_MajorVersion SETS "1.25"
Module_Version SETA 125
Module_MinorVersion SETS ""
Module_Date SETS "26 Sep 2014"
Module_ApplicationDate SETS "26-Sep-14"
Module_Date SETS "28 Jun 2019"
Module_ApplicationDate SETS "28-Jun-19"
Module_ComponentName SETS "FSLock"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/FSLock"
Module_FullVersion SETS "1.24"
Module_HelpVersion SETS "1.24 (26 Sep 2014)"
Module_FullVersion SETS "1.25"
Module_HelpVersion SETS "1.25 (28 Jun 2019)"
END
VersionNum
View file @ cb2f11f1
/* (1.24)
/* (1.25)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.24
#define Module_MajorVersion_CMHG 1.25
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Sep 2014
#define Module_Date_CMHG 28 Jun 2019
#define Module_MajorVersion "1.24"
#define Module_Version 124
#define Module_MajorVersion "1.25"
#define Module_Version 125
#define Module_MinorVersion ""
#define Module_Date "26 Sep 2014"
#define Module_Date "28 Jun 2019"
#define Module_ApplicationDate "26-Sep-14"
#define Module_ApplicationDate "28-Jun-19"
#define Module_ComponentName "FSLock"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/FSLock"
#define Module_FullVersion "1.24"
#define Module_HelpVersion "1.24 (26 Sep 2014)"
#define Module_LibraryVersionInfo "1:24"
#define Module_FullVersion "1.25"
#define Module_HelpVersion "1.25 (28 Jun 2019)"
#define Module_LibraryVersionInfo "1:25"
s/FSLock
View file @ cb2f11f1
......@@ -128,7 +128,8 @@ FSLock_Init
Push "LR"
LDR R0, [R12] ; R0 -> Private word
CMP R0, #0 ; Non fatal init?
BNE init_claim ; If so, just claim filing system
MOVNE R12, R0 ; If so, put to R12
BNE init_claim ; Then just claim filing system
MOV R3, #:INDEX:Wsp_Size
MOV R0, #ModHandReason_Claim
SWI XOS_Module
......@@ -1007,7 +1008,7 @@ CallbackCode
SWI XOS_FSControl
CMP R2, #0 ; Is our special FS there?
BLNE insert_foot_in_door ; If so, redirect the FSBlock!
Pull "R0-R4,LR"
Pull "R0-R4,PC"
Our_FS_Open
Push "R0,R1,LR"
......
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