Skip to content

GitLab

Commit 60a00c1c authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix GraphicsV_StartupMode call. Fix HiProcVecs build. 

Detail:
  s/MemInfo - Fixed typo causing build error with HiProcVecs/zero page relocated kernel
  s/PMF/osinit - Fix the call to GraphicsV_StartupMode to work correctly with non-zero driver numbers
Admin:
  Tested on BB-xM with high processor vectors


Version 5.35, 4.79.2.226. Tagged as 'Kernel-5_35-4_79_2_226'
parent 8c1b7cdf
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
VersionASM
View file @ 60a00c1c
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.225"
Module_Date SETS "07 May 2014"
Module_ApplicationDate SETS "07-May-14"
Module_MinorVersion SETS "4.79.2.226"
Module_Date SETS "01 Jun 2014"
Module_ApplicationDate SETS "01-Jun-14"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.225)"
Module_HelpVersion SETS "5.35 (07 May 2014) 4.79.2.225"
Module_FullVersion SETS "5.35 (4.79.2.226)"
Module_HelpVersion SETS "5.35 (01 Jun 2014) 4.79.2.226"
END
VersionNum
View file @ 60a00c1c
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.225
#define Module_Date_CMHG 07 May 2014
#define Module_MinorVersion_CMHG 4.79.2.226
#define Module_Date_CMHG 01 Jun 2014
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.225"
#define Module_Date "07 May 2014"
#define Module_MinorVersion "4.79.2.226"
#define Module_Date "01 Jun 2014"
#define Module_ApplicationDate "07-May-14"
#define Module_ApplicationDate "01-Jun-14"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.225)"
#define Module_HelpVersion "5.35 (07 May 2014) 4.79.2.225"
#define Module_FullVersion "5.35 (4.79.2.226)"
#define Module_HelpVersion "5.35 (01 Jun 2014) 4.79.2.226"
#define Module_LibraryVersionInfo "5:35"
s/MemInfo
View file @ 60a00c1c
......@@ -1496,7 +1496,7 @@ CheckMemoryAccess ROUT
ASSERT ZeroPage > ROM
MOV r3, r10
LDR r4, =16*1024
MOV r5, =CMA_Read
MOV r5, #CMA_Read
BL CMA_AddRange
]
90
......
s/PMF/osinit
View file @ 60a00c1c
......@@ -813,6 +813,7 @@ TranslateMonitorLeadType Entry "r0-r2"
MOV r0, r3
VDWS r4
LDR r4, [r4, #CurrentGraphicsVDriver]
MOV r4, r4, LSL #24
ORR r4, r4, #GraphicsV_StartupMode
BL CallGraphicsV
Pull "r4"
......
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