diff --git a/VersionASM b/VersionASM index db2ec802a4da799604122c15e605337d3eeb46aa..fd92ee5cbfc818f8afa1acd968c521e86630691e 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.6" -Module_Date SETS "21 May 2012" -Module_ApplicationDate SETS "21-May-12" +Module_MinorVersion SETS "4.79.2.147.2.7" +Module_Date SETS "23 May 2012" +Module_ApplicationDate SETS "23-May-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.147.2.6)" -Module_HelpVersion SETS "5.35 (21 May 2012) 4.79.2.147.2.6" +Module_FullVersion SETS "5.35 (4.79.2.147.2.7)" +Module_HelpVersion SETS "5.35 (23 May 2012) 4.79.2.147.2.7" END diff --git a/VersionNum b/VersionNum index ca1f86076ac75d1e388162a52ad16c5ecab154a6..6021665026eb8c736ceb7b30d2769b1e753741db 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.147.2.6 -#define Module_Date_CMHG 21 May 2012 +#define Module_MinorVersion_CMHG 4.79.2.147.2.7 +#define Module_Date_CMHG 23 May 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.147.2.6" -#define Module_Date "21 May 2012" +#define Module_MinorVersion "4.79.2.147.2.7" +#define Module_Date "23 May 2012" -#define Module_ApplicationDate "21-May-12" +#define Module_ApplicationDate "23-May-12" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.147.2.6)" -#define Module_HelpVersion "5.35 (21 May 2012) 4.79.2.147.2.6" +#define Module_FullVersion "5.35 (4.79.2.147.2.7)" +#define Module_HelpVersion "5.35 (23 May 2012) 4.79.2.147.2.7" #define Module_LibraryVersionInfo "5:35" diff --git a/s/NewIRQs b/s/NewIRQs index 9675c464e1501fc1c8afc9177cd30280047b3970..99677de8e52193c3a7004755444460856deb2356 100644 --- a/s/NewIRQs +++ b/s/NewIRQs @@ -1408,6 +1408,8 @@ TickOne ROUT ; Don't push r14 - we're using new interface, and claim the vector Push "r9,r12" AddressHAL + MOV r0, #0 ; timer 0 + CallHAL HAL_TimerIRQClear CallHAL HAL_IRQClear Pull "r9,r12" |