Mercurial > nand-ecoscentric

changeset 2677:d16f29a90821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/hal_misc.c (hal_deliver_interrupt): Fix instrumentation call to allow it to compile properly.
author nickg
date Wed, 03 Dec 2008 15:52:34 +0000
parents b86956327ae6
children c5bac719313d
files packages/hal/cortexm/arch/current/ChangeLog packages/hal/cortexm/arch/current/src/hal_misc.c
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/cortexm/arch/current/ChangeLog
+++ b/packages/hal/cortexm/arch/current/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-03  Nick Garnett  <nickg@ecoscentric.com>
+
+	* src/hal_misc.c (hal_deliver_interrupt): Fix instrumentation call
+	to allow it to compile properly.
+
 2008-11-24  Simon Kallweit  <simon.kallweit@intefo.ch>
 
 	* include/hal_io.c: Fixed MASK_ macro.
--- a/packages/hal/cortexm/arch/current/src/hal_misc.c
+++ b/packages/hal/cortexm/arch/current/src/hal_misc.c
@@ -60,6 +60,12 @@
 
 #include <cyg/hal/drv_api.h>
 
+
+#if defined(CYGPKG_KERNEL_INSTRUMENT) &&        \
+    defined(CYGDBG_KERNEL_INSTRUMENT_INTR)
+#include <cyg/kernel/instrmnt.h>
+#endif
+
 //==========================================================================
 
 typedef cyg_uint32 cyg_isr(cyg_uint32 vector, CYG_ADDRWORD data);
@@ -340,7 +346,7 @@ void hal_deliver_interrupt( cyg_uint32 v
     
 #if defined(CYGPKG_KERNEL_INSTRUMENT) && \
     defined(CYGDBG_KERNEL_INSTRUMENT_INTR)
-    cyg_instrument(RAISE_INTR, vector, 0 );
+    CYG_INSTRUMENT_INTR(RAISE, vector, 0);
 #endif
 
     isr = (cyg_isr *)hal_interrupt_handlers[vector];