diff --git a/VersionASM b/VersionASM index 2d669f724ab74dcf3d8c121fabf9d7942c1bfc55..1693b5d19fd90d0efbea818ac131fadb3dc19b20 100644 --- a/VersionASM +++ b/VersionASM @@ -11,13 +11,13 @@ GBLS Module_HelpVersion GBLS Module_ComponentName GBLS Module_ComponentPath -Module_MajorVersion SETS "0.84" -Module_Version SETA 84 +Module_MajorVersion SETS "0.85" +Module_Version SETA 85 Module_MinorVersion SETS "" -Module_Date SETS "13 Jan 2013" -Module_ApplicationDate SETS "13-Jan-13" +Module_Date SETS "22 Jan 2013" +Module_ApplicationDate SETS "22-Jan-13" Module_ComponentName SETS "OMAP3" Module_ComponentPath SETS "castle/RiscOS/Sources/HAL/OMAP3" -Module_FullVersion SETS "0.84" -Module_HelpVersion SETS "0.84 (13 Jan 2013)" +Module_FullVersion SETS "0.85" +Module_HelpVersion SETS "0.85 (22 Jan 2013)" END diff --git a/VersionNum b/VersionNum index 7731a888d74974dd93daf68dc2fa421ab6662fe6..68204620f9dca005484b39f1f9bc34eee038cbe5 100644 --- a/VersionNum +++ b/VersionNum @@ -1,23 +1,23 @@ -/* (0.84) +/* (0.85) * * This file is automatically maintained by srccommit, do not edit manually. * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 0.84 +#define Module_MajorVersion_CMHG 0.85 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 13 Jan 2013 +#define Module_Date_CMHG 22 Jan 2013 -#define Module_MajorVersion "0.84" -#define Module_Version 84 +#define Module_MajorVersion "0.85" +#define Module_Version 85 #define Module_MinorVersion "" -#define Module_Date "13 Jan 2013" +#define Module_Date "22 Jan 2013" -#define Module_ApplicationDate "13-Jan-13" +#define Module_ApplicationDate "22-Jan-13" #define Module_ComponentName "OMAP3" #define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP3" -#define Module_FullVersion "0.84" -#define Module_HelpVersion "0.84 (13 Jan 2013)" -#define Module_LibraryVersionInfo "0:84" +#define Module_FullVersion "0.85" +#define Module_HelpVersion "0.85 (22 Jan 2013)" +#define Module_LibraryVersionInfo "0:85" diff --git a/s/Boot b/s/Boot index 674091b8bd60c03834ee8c773a90c2d456234d74..db6f2c78138c6b5123d7685aa052940f1f7a242a 100644 --- a/s/Boot +++ b/s/Boot @@ -217,6 +217,7 @@ HALdescriptor DATA IMPORT HAL_FIQClear IMPORT HAL_FIQSource IMPORT HAL_FIQStatus + IMPORT HAL_IRQMax IMPORT HAL_Timers IMPORT HAL_TimerDevice @@ -426,7 +427,7 @@ HAL_EntryTable DATA HALEntry HAL_USBControllerInfo - NullEntry ;HALEntry HAL_MonitorLeadID + HALEntry HAL_IRQMax NullEntry ;HALEntry HAL_VideoRender diff --git a/s/Interrupts b/s/Interrupts index 7d71c56518dce7ed1c7614de0358bdcf39dd3f75..8879d0de3a548d13033d05b7b8e9fb91ea5a26cb 100644 --- a/s/Interrupts +++ b/s/Interrupts @@ -41,6 +41,7 @@ EXPORT HAL_FIQClear EXPORT HAL_FIQSource EXPORT HAL_FIQStatus + EXPORT HAL_IRQMax [ DebugInterrupts IMPORT DebugHALPrint @@ -457,4 +458,8 @@ HAL_FIQSource myDSB MOV pc, lr +HAL_IRQMax + MOV a1, #INTERRUPT_MAX + MOV pc, lr + END