Commit bcb04bd9 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix application and next slot size limits

Detail:
  s/Switcher - Fix ReadDynamicArea routine to use OS_ReadDynamicArea when reading the details of application space (since OS_DynamicArea doesn't recognise the fake application space DA)
Admin:
  Tested on imx6
  Fixes inability to increase size of (e.g.) filer action wimpslot, and fixes 'next' slot size not being clamped to 512MB


Version 1.47. Tagged as 'Switcher-1_47'
parent 4aff63cd
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.46"
Module_Version SETA 146
Module_MajorVersion SETS "1.47"
Module_Version SETA 147
Module_MinorVersion SETS ""
Module_Date SETS "31 Aug 2015"
Module_ApplicationDate SETS "31-Aug-15"
Module_Date SETS "26 Sep 2015"
Module_ApplicationDate SETS "26-Sep-15"
Module_ComponentName SETS "Switcher"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Switcher"
Module_FullVersion SETS "1.46"
Module_HelpVersion SETS "1.46 (31 Aug 2015)"
Module_FullVersion SETS "1.47"
Module_HelpVersion SETS "1.47 (26 Sep 2015)"
END
/* (1.46)
/* (1.47)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.46
#define Module_MajorVersion_CMHG 1.47
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 Aug 2015
#define Module_Date_CMHG 26 Sep 2015
#define Module_MajorVersion "1.46"
#define Module_Version 146
#define Module_MajorVersion "1.47"
#define Module_Version 147
#define Module_MinorVersion ""
#define Module_Date "31 Aug 2015"
#define Module_Date "26 Sep 2015"
#define Module_ApplicationDate "31-Aug-15"
#define Module_ApplicationDate "26-Sep-15"
#define Module_ComponentName "Switcher"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Switcher"
#define Module_FullVersion "1.46"
#define Module_HelpVersion "1.46 (31 Aug 2015)"
#define Module_LibraryVersionInfo "1:46"
#define Module_FullVersion "1.47"
#define Module_HelpVersion "1.47 (26 Sep 2015)"
#define Module_LibraryVersionInfo "1:47"
......@@ -7027,6 +7027,10 @@ ReadDynamicArea ROUT
[ {TRUE}
Entry "r3-r8"
; Use OS_DynamicArea so that we can claim PMPs have unlimited size
; However, OS_DynamicArea doesn't cope with application space, so we
; must still use OS_ReadDynamicArea for that
CMP r0, #-1
BEQ %FT50
CMP r0, #256
BICLO r0, r0, #128 ; Clear the OS_ReadDynamicArea "return max size" flag
MOV r1, r0
......@@ -7038,6 +7042,9 @@ ReadDynamicArea ROUT
MOV r1, r2
MOV r2, r5
EXIT
50
SWI XOS_ReadDynamicArea
EXIT
|
CMP R0,#128
ADDLO R0,R0,#128 ; Set flag if not already set
......
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