This is the mail archive of the
ecos-patches@sourceware.org
mailing list for the eCos project.
Cortex-M, fix instrumentation
- From: Nick Garnett <nickg at ecoscentric dot com>
- To: ecos-patches at ecos dot sourceware dot org
- Date: 03 Dec 2008 15:54:34 +0000
- Subject: Cortex-M, fix instrumentation
Turning instrumentation on caused a compile error. Now fixed.
Index: arch/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/cortexm/arch/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -r1.4 ChangeLog
--- arch/current/ChangeLog 24 Nov 2008 15:43:50 -0000 1.4
+++ arch/current/ChangeLog 3 Dec 2008 15:52:01 -0000
@@ -1,5 +1,10 @@
+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.
2008-11-04 Simon Kallweit <simon.kallweit@intefo.ch>
Index: arch/current/src/hal_misc.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/cortexm/arch/current/src/hal_misc.c,v
retrieving revision 1.2
diff -u -5 -r1.2 hal_misc.c
--- arch/current/src/hal_misc.c 5 Nov 2008 09:59:41 -0000 1.2
+++ arch/current/src/hal_misc.c 3 Dec 2008 15:52:01 -0000
@@ -58,10 +58,16 @@
#include <cyg/hal/hal_arch.h> // HAL header
#include <cyg/hal/hal_intr.h> // HAL header
#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);
//==========================================================================
@@ -338,11 +344,11 @@
register cyg_isr *isr;
cyg_bool pendsvc = false;
#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];
// Call the ISR
--
Nick Garnett eCos Kernel Architect
eCosCentric Limited http://www.eCosCentric.com The eCos experts
Barnwell House, Barnwell Drive, Cambridge, UK. Tel: +44 1223 245571
Registered in England and Wales: Reg No: 4422071