diff --git a/VersionASM b/VersionASM index 18089a14d9c8818ba22fdb7a38b4fb13226115e3..ebfe2ed935804345bf2b7fd081f4a2b1965f9ae0 100644 --- a/VersionASM +++ b/VersionASM @@ -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 diff --git a/VersionNum b/VersionNum index 80afa87187d08d1b04eace292b98163de477a6e3..40f889a5965f471ece139bd34927d22d7a6b78ad 100644 --- a/VersionNum +++ b/VersionNum @@ -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" diff --git a/s/PMF/osinit b/s/PMF/osinit index 5b2c1bc349c87f08b92668d88e1edbbc3a91dc4b..6f87df057c4b1fcaa8efeeaa7eb979d9c4990be6 100644 --- a/s/PMF/osinit +++ b/s/PMF/osinit @@ -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