Commit 698e5e6d authored by ROOL's avatar ROOL 🤖
Browse files

Fix to OS_ReadSysInfo 1

Detail:
  Prior to ScreenModes starting (when CurrentMonitorType becaomes 7) this SWI would return Auto as 31 for EDID rather than -1, as would be the case had ReadMultiField been called.
  Change to use -1 for consistency and so it gets translated to type 3 (VGA).
Admin:
  Submission from Willi Theiss.

Version 5.85. Tagged as 'Kernel-5_85'
parent 03b66d46
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.84"
Module_Version SETA 584
Module_MajorVersion SETS "5.85"
Module_Version SETA 585
Module_MinorVersion SETS ""
Module_Date SETS "15 Jun 2017"
Module_ApplicationDate SETS "15-Jun-17"
Module_Date SETS "18 Jun 2017"
Module_ApplicationDate SETS "18-Jun-17"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.84"
Module_HelpVersion SETS "5.84 (15 Jun 2017)"
Module_FullVersion SETS "5.85"
Module_HelpVersion SETS "5.85 (18 Jun 2017)"
END
/* (5.84)
/* (5.85)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.84
#define Module_MajorVersion_CMHG 5.85
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Jun 2017
#define Module_Date_CMHG 18 Jun 2017
#define Module_MajorVersion "5.84"
#define Module_Version 584
#define Module_MajorVersion "5.85"
#define Module_Version 585
#define Module_MinorVersion ""
#define Module_Date "15 Jun 2017"
#define Module_Date "18 Jun 2017"
#define Module_ApplicationDate "15-Jun-17"
#define Module_ApplicationDate "18-Jun-17"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.84"
#define Module_HelpVersion "5.84 (15 Jun 2017)"
#define Module_LibraryVersionInfo "5:84"
#define Module_FullVersion "5.85"
#define Module_HelpVersion "5.85 (18 Jun 2017)"
#define Module_LibraryVersionInfo "5:85"
......@@ -1266,7 +1266,7 @@ ReadSysInfo_InvalidReason
LDR r1, =ZeroPage+VduDriverWorkSpace+CurrentMonitorType ; read current monitortype
LDR r1, [r1]
TEQ r1, #MonitorTypeEDID :SHR: MonitorTypeShift ; equate EDID=auto in this context
MOVEQ r1, #MonitorTypeAuto :SHR: MonitorTypeShift
MOVEQ r1, #-1
BL Read_Configd_Mode
CMP r0, #-1 ; if none of the three are auto, don't bother with translation
CMPNE r1, #-1
......
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