Commit dbf8b9c4 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Escape some dollars, sort out value of NULL

Change $ => $$ to reduce substitution warnings.
Be consistent about NULL (being 0) not -1, otherwise the total memory bar vanishes on systems with >= 2GB of RAM.

Version 1.43. Tagged as 'Switcher-1_43'
parent 92303eae
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.42"
Module_Version SETA 142
Module_MajorVersion SETS "1.43"
Module_Version SETA 143
Module_MinorVersion SETS ""
Module_Date SETS "23 Jul 2014"
Module_ApplicationDate SETS "23-Jul-14"
Module_Date SETS "21 Dec 2014"
Module_ApplicationDate SETS "21-Dec-14"
Module_ComponentName SETS "Switcher"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Switcher"
Module_FullVersion SETS "1.42"
Module_HelpVersion SETS "1.42 (23 Jul 2014)"
Module_FullVersion SETS "1.43"
Module_HelpVersion SETS "1.43 (21 Dec 2014)"
END
/* (1.42)
/* (1.43)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.42
#define Module_MajorVersion_CMHG 1.43
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Jul 2014
#define Module_Date_CMHG 21 Dec 2014
#define Module_MajorVersion "1.42"
#define Module_Version 142
#define Module_MajorVersion "1.43"
#define Module_Version 143
#define Module_MinorVersion ""
#define Module_Date "23 Jul 2014"
#define Module_Date "21 Dec 2014"
#define Module_ApplicationDate "23-Jul-14"
#define Module_ApplicationDate "21-Dec-14"
#define Module_ComponentName "Switcher"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Switcher"
#define Module_FullVersion "1.42"
#define Module_HelpVersion "1.42 (23 Jul 2014)"
#define Module_LibraryVersionInfo "1:42"
#define Module_FullVersion "1.43"
#define Module_HelpVersion "1.43 (21 Dec 2014)"
#define Module_LibraryVersionInfo "1:43"
......@@ -22,7 +22,6 @@
GET Hdr:Macros
GET Hdr:System
GET Hdr:Machine.<Machine>
GET Hdr:CPU.Arch
GET Hdr:UserIF.<UserIF>
GET Hdr:Proc
GET Hdr:CMOS
......@@ -1514,9 +1513,9 @@ Init Push "R0,LR"
CLRV
Pull "R0,PC"
Path DCB "Switcher$Path"
Path DCB "Switcher$$Path"
DCB 0
PathDefault DCB "Resources:$.Resources.Switcher."
PathDefault DCB "Resources:$$.Resources.Switcher."
DCB 0
ALIGN
......@@ -1560,8 +1559,8 @@ wn_powrdown DCB "powrdown",0 ; must be word-aligned
ALIGN
wn_powerdown DCB "power",0 ; must be word-aligned
str_altboot DCB "<Choices$Write>.Boot.Tasks",0
str_altbootfn DCB "<Choices$Write>.Boot.Tasks." ; share name with str_boot
str_altboot DCB "<Choices$$Write>.Boot.Tasks",0
str_altbootfn DCB "<Choices$$Write>.Boot.Tasks." ; share name with str_boot
str_boot DCB "!Boot",0
templatefname DCB "Switcher:Templates",0 ; relies on Switcher$Path
......@@ -1952,7 +1951,7 @@ do_date
LTORG
com_unset DCB "%Unset SaveDesk$File", 0
com_unset DCB "%Unset SaveDesk$$File", 0
ALIGN
MakeInternatErrorBlock Switcher_BadTemplate,,E00
......@@ -1960,7 +1959,7 @@ com_unset DCB "%Unset SaveDesk$File", 0
icondef DCD &D7006002 ; flags
DCB "taskmanager",0
bootosstring DCB "<Boot$OSVersion>",0
bootosstring DCB "<Boot$$OSVersion>",0
ALIGN
ErrorCloseTemplate
......@@ -2878,7 +2877,7 @@ updateblock
MOVEQ R3,#icb_size2
;
STR R1,[R2,#icb_icon1] ; actually set up all 4 bytes
MOV R14,#-1
MOV R14,#0
STR R14,[R2,#icb_memsize]
STRB R5,[R2,#icb_height]
Pull "R3-R5,PC",NE ; don't copy name unless it's a task
......@@ -2932,6 +2931,7 @@ allocateblock
STR R1,[R2,#icb_icon1] ; actually set up all 4 bytes
MOV R14,#-1
STR R14,[R2,#icb_link]
MOV R14,#0
STR R14,[R2,#icb_memsize]
STRB R5,[R2,#icb_height]
Pull "R3-R5,PC",NE ; don't copy name unless it's a task
......@@ -3119,9 +3119,9 @@ setmembar
;
LDR R14,[userblk,#icb_memsize]
CMP R14,#0
MOVLE R14,#is_deleted ; mark deleted if null
STRLE R14,[R1,#i_flags]
Pull "R0-R1,userblk,PC",LE
MOVEQ R14,#is_deleted ; mark deleted if null
STREQ R14,[R1,#i_flags]
Pull "R0-R1,userblk,PC",EQ
;
SUB cx1,cx1,cx0 ; multiply by unit size
[ SteppedMem
......@@ -3416,9 +3416,9 @@ doshutdown
str_shutdown DCB "WimpTask ShutDown", 0
str_postdesk DCB "WimpTask Repeat BootObey " ; continues...
str_postpath DCB "Choices:Boot.PostDesk -type Obey", 0 ; OSFile_ReadNoPath accepts spaces as terminators
str_postset DCB "Set Alias$BootObey Obey -c %*0", 0
str_postset DCB "Set Alias$$BootObey Obey -c %*0", 0
ALIGN
str_postunset DCB "Unset Alias$BootObey", 0
str_postunset DCB "Unset Alias$$BootObey", 0
ALIGN
;..............................................................................
......@@ -5451,7 +5451,7 @@ key_pressed
LTORG
[ KeyTasks
keytask_templ DCB "Key$"
keytask_templ DCB "Key$$"
keytask_red DCB "Red", 0
keytask_green DCB "Green", 0
keytask_blue DCB "Blue", 0
......@@ -6095,7 +6095,7 @@ goexit
STR R14,autosave
B startsave
str_savedesk DCB "SaveDesk$File", 0
str_savedesk DCB "SaveDesk$$File", 0
ALIGN
;........................................................................
......@@ -6465,7 +6465,7 @@ savestate_bydragging
Pull "R1-R5,PC"
str_header DCB "Boot", 0
str_setsavedesk DCB "Set SaveDesk$File <Desktop$File>", 10, 0
str_setsavedesk DCB "Set SaveDesk$$File <Desktop$$File>", 10, 0
fsconfig DCB "Configure FileSystem ",0
filecore_prefix DCB "FileCore%",0
......
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