Mercurial > ecos

changeset 3028:ca5a6d972d84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* include/hal_intr.h: Remove double inclusion of var_intr.h header and include it at proper place. [ Bugzilla 1001184 ]
author sergeig
date Tue, 05 Apr 2011 16:01:30 +0000
parents 4df50cbc6176
children 9aec6a8ff9b9
files packages/hal/cortexm/arch/current/ChangeLog packages/hal/cortexm/arch/current/include/hal_intr.h
diffstat 2 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/cortexm/arch/current/ChangeLog
+++ b/packages/hal/cortexm/arch/current/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-01  Ilija Kocho  <ilijak@siva.com.mk>
+
+	* include/hal_intr.h: Remove double inclusion of var_intr.h
+	header and include it at proper place. [ Bugzilla 1001184 ]
+
 2011-02-17  John Dallaway  <john@dallaway.org.uk>
 
 	* include/hal_intr.h (HAL_DISABLE_INTERRUPTS): Mark operand as
--- a/packages/hal/cortexm/arch/current/include/hal_intr.h
+++ b/packages/hal/cortexm/arch/current/include/hal_intr.h
@@ -56,8 +56,6 @@
 
 #include <cyg/hal/hal_io.h>
 
-#include <cyg/hal/var_intr.h>           // variant extensions
-
 //==========================================================================
 // Exception vectors
 //
@@ -95,6 +93,11 @@
 #define CYGNUM_HAL_INTERRUPT_EXTERNAL    1
 
 
+//==========================================================================
+// Include variant definitions here.
+
+#include <cyg/hal/var_intr.h>
+
 // Variant or platform allowed to override these definitions to use
 // a different RTC
 #ifndef CYGNUM_HAL_INTERRUPT_RTC
@@ -102,11 +105,6 @@
 #endif
 
 //==========================================================================
-// Include variant definitions here.
-
-#include <cyg/hal/var_intr.h>
-
-//==========================================================================
 // Exception vectors.
 //
 // These are the values used when passed out to an external exception