diff --git a/VersionASM b/VersionASM index 1537ffb5a933af7164e970aea97fb8244953672a..e6840ee6ef552729e2961c868a891f4dcfc53932 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.146" -Module_Date SETS "15 Apr 2012" -Module_ApplicationDate SETS "15-Apr-12" +Module_MinorVersion SETS "4.79.2.147" +Module_Date SETS "26 Apr 2012" +Module_ApplicationDate SETS "26-Apr-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.146)" -Module_HelpVersion SETS "5.35 (15 Apr 2012) 4.79.2.146" +Module_FullVersion SETS "5.35 (4.79.2.147)" +Module_HelpVersion SETS "5.35 (26 Apr 2012) 4.79.2.147" END diff --git a/VersionNum b/VersionNum index 5c76c40fb328232b0b0691a81b51336e991115af..950b322b31076c654775f5f70d563853e5b43d6e 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.146 -#define Module_Date_CMHG 15 Apr 2012 +#define Module_MinorVersion_CMHG 4.79.2.147 +#define Module_Date_CMHG 26 Apr 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.146" -#define Module_Date "15 Apr 2012" +#define Module_MinorVersion "4.79.2.147" +#define Module_Date "26 Apr 2012" -#define Module_ApplicationDate "15-Apr-12" +#define Module_ApplicationDate "26-Apr-12" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.146)" -#define Module_HelpVersion "5.35 (15 Apr 2012) 4.79.2.146" +#define Module_FullVersion "5.35 (4.79.2.147)" +#define Module_HelpVersion "5.35 (26 Apr 2012) 4.79.2.147" #define Module_LibraryVersionInfo "5:35" diff --git a/s/NewReset b/s/NewReset index 56bdd9801450360da3c480724270e7dbfc2a2653..6e326766a31e36ed3d5e0a7faef76ced541e5ac4 100644 --- a/s/NewReset +++ b/s/NewReset @@ -2421,9 +2421,9 @@ LookForHALRTC MOV R8, #4 01 SWI XOS_Hardware - Pull "R0-R2,R8,PC",VS + Pull "R0-R2,R8,R12,PC",VS CMP R1, #-1 - Pull "R0-R2,R8,PC",EQ + Pull "R0-R2,R8,R12,PC",EQ LDR R14, [R2, #HALDevice_Location] ; Currently, we only support devices located on IIC bus 0 CMP R14, #HALDeviceBus_Ser+HALDeviceSerBus_IIC