diff --git a/VersionASM b/VersionASM index f0273adef9a0eb7752c5711acff0b5cb079dcd53..57b399fdba92fbfa911d1d4da49a76d4fda5757d 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.147.2.10" -Module_Date SETS "24 Jun 2012" -Module_ApplicationDate SETS "24-Jun-12" +Module_MinorVersion SETS "4.79.2.147.2.11" +Module_Date SETS "27 Jun 2012" +Module_ApplicationDate SETS "27-Jun-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.147.2.10)" -Module_HelpVersion SETS "5.35 (24 Jun 2012) 4.79.2.147.2.10" +Module_FullVersion SETS "5.35 (4.79.2.147.2.11)" +Module_HelpVersion SETS "5.35 (27 Jun 2012) 4.79.2.147.2.11" END diff --git a/VersionNum b/VersionNum index 9bec50306cb413685fd91123a2ae5375c6fa1da0..818fb288e3f7fccd2f3b2c35b4bedf981941ad8f 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.147.2.10 -#define Module_Date_CMHG 24 Jun 2012 +#define Module_MinorVersion_CMHG 4.79.2.147.2.11 +#define Module_Date_CMHG 27 Jun 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.147.2.10" -#define Module_Date "24 Jun 2012" +#define Module_MinorVersion "4.79.2.147.2.11" +#define Module_Date "27 Jun 2012" -#define Module_ApplicationDate "24-Jun-12" +#define Module_ApplicationDate "27-Jun-12" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.147.2.10)" -#define Module_HelpVersion "5.35 (24 Jun 2012) 4.79.2.147.2.10" +#define Module_FullVersion "5.35 (4.79.2.147.2.11)" +#define Module_HelpVersion "5.35 (27 Jun 2012) 4.79.2.147.2.11" #define Module_LibraryVersionInfo "5:35" diff --git a/s/VMSAv6 b/s/VMSAv6 index 7d65228420ed51667eddb3ddaf94341ce881ce0c..3ddf8b562e70a4f076a3ca7061aaa6a6e128b536 100644 --- a/s/VMSAv6 +++ b/s/VMSAv6 @@ -37,12 +37,6 @@ SixteenMByte EQU (1024*1024 * 16) KEEP -; ***************************************************************************** - -; mjs Oct 2000 kernel/HAL split -; SetDAG stuff is no more, routines like SetVinit now call equivalent HAL -; routine - ; **************** CAM manipulation utility routines *********************************** ; ************************************************************************************** @@ -319,8 +313,8 @@ SSETMEMC ROUT MOV r1, #0 ; no funny business with DPMS MOV r0, #0 MOV r1 - mjsAddressHAL - mjsCallHAL HAL_Video_SetBlank + AddressHAL + CallHAL HAL_Video_SetBlank Pull "r0-r3, r9, r14" ]