Skip to content

GitLab

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

Actually pay attention to configured cache preferences 

The kernel recently took back ownership of the *CACHE command and it's configure counterpart, but wasn't reading the CMOS value on startup.
Spotted while looking at bus transactions on IOMD, and wondering where they all are, then realising it's all running from the cache.

Version 5.35, 4.79.2.170. Tagged as 'Kernel-5_35-4_79_2_170'
parent 3fb54a38
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 12 deletions
VersionASM
View file @ ee2fa7bc
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.169"
Module_Date SETS "06 Oct 2012"
Module_ApplicationDate SETS "06-Oct-12"
Module_MinorVersion SETS "4.79.2.170"
Module_Date SETS "07 Oct 2012"
Module_ApplicationDate SETS "07-Oct-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.169)"
Module_HelpVersion SETS "5.35 (06 Oct 2012) 4.79.2.169"
Module_FullVersion SETS "5.35 (4.79.2.170)"
Module_HelpVersion SETS "5.35 (07 Oct 2012) 4.79.2.170"
END
VersionNum
View file @ ee2fa7bc
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.169
#define Module_Date_CMHG 06 Oct 2012
#define Module_MinorVersion_CMHG 4.79.2.170
#define Module_Date_CMHG 07 Oct 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.169"
#define Module_Date "06 Oct 2012"
#define Module_MinorVersion "4.79.2.170"
#define Module_Date "07 Oct 2012"
#define Module_ApplicationDate "06-Oct-12"
#define Module_ApplicationDate "07-Oct-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.169)"
#define Module_HelpVersion "5.35 (06 Oct 2012) 4.79.2.169"
#define Module_FullVersion "5.35 (4.79.2.170)"
#define Module_HelpVersion "5.35 (07 Oct 2012) 4.79.2.170"
#define Module_LibraryVersionInfo "5:35"
s/PMF/osinit
View file @ ee2fa7bc
......@@ -259,6 +259,15 @@ ReadCMOSDefaults
BICEQ R1, R1, #KBStat_NoNumLock
STRB R1, KeyBdStatus
MOV R0, #SystemSpeedCMOS
BL Read
TST R0, #&20 ; Cache off when b5 set
LDR R2, =:NOT: (MMUC_I + MMUC_C + MMUC_W)
LDRNE R1, =0
LDREQ R1, =MMUC_I + MMUC_C + MMUC_W
MOV R0, #MMUCReason_ModifyControl
BL MMUControlSub
[ ModeSelectors
BL Read_Configd_MonitorType
LDR r1, =ZeroPage+VduDriverWorkSpace+CurrentMonitorType ; set current to default
......
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