[ECOS] Re: LPC2xxx patch for support of vectored interrupt controller
Hans Rosenfeld
rosenfeld@grumpf.hope-2000.org
Wed Aug 22 13:47:00 GMT 2007
On Wed, Aug 22, 2007 at 01:12:16PM +0200, Andrew Lunn wrote:
> Could your produce a patch which contains all these changes and a
> ChangeLog entry in both the Kernel package and the HAL.
Done.
--
%SYSTEM-F-ANARCHISM, The operating system has been overthrown
-------------- next part --------------
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/var/current/ChangeLog,v
retrieving revision 1.7
diff -u -r1.7 ChangeLog
--- ChangeLog 30 Jul 2007 18:09:47 -0000 1.7
+++ ChangeLog 22 Aug 2007 13:34:11 -0000
@@ -1,3 +1,13 @@
+2007-08-22 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
+
+ * cdl/hal_arm_lpc2xxx.cdl: require interrupt priority 16 for
+ kernel test intr0/kintr0 interrupts
+
2007-08-17 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
* cdl/hal_arm_lpc2xxx.cdl: added VIC component to support
configuration of individual interrupt priorities
2007_07-10 Uwe Kindler <uwe_kindler@web.de>
* cdl/hal_arm_lpc2xxx.cdl: Added option
Index: hal_arm_lpc2xxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/lpc2xxx/var/current/cdl/hal_arm_lpc2xxx.cdl,v
retrieving revision 1.4
diff -u -r1.4 hal_arm_lpc2xxx.cdl
--- hal_arm_lpc2xxx.cdl 30 Jul 2007 18:09:47 -0000 1.4
+++ hal_arm_lpc2xxx.cdl 22 Aug 2007 13:37:42 -0000
@@ -66,6 +66,15 @@
implements CYGINT_HAL_ARM_ARCH_ARM7
implements CYGINT_HAL_ARM_THUMB_ARCH
+ requires { is_active(CYGNUM_KERNEL_INTR_TEST_PRIO_A)
+ implies CYGNUM_KERNEL_INTR_TEST_PRIO_A == 16 }
+
+ requires { is_active(CYGNUM_KERNEL_INTR_TEST_PRIO_B)
+ implies CYGNUM_KERNEL_INTR_TEST_PRIO_B == 16 }
+
+ requires { is_active(CYGNUM_KERNEL_INTR_TEST_PRIO_C)
+ implies CYGNUM_KERNEL_INTR_TEST_PRIO_C == 16 }
+
# Let the architectural HAL see this variant's files
define_proc {
puts $::cdl_header "#define CYGBLD_HAL_VAR_INTS_H <cyg/hal/hal_var_ints.h>"
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/ChangeLog,v
retrieving revision 1.143
diff -u -r1.143 ChangeLog
--- ChangeLog 2 Jul 2007 11:49:09 -0000 1.143
+++ ChangeLog 22 Aug 2007 13:39:40 -0000
@@ -1,3 +1,8 @@
+2007-08-22 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
+
+ * cdl/kernel.cdl, tests/intr0.cxx, tests/kintr0.c: added options
+ to configure priorities of the interrupts created by intr0 and kintr0
+
2007-07-02 Gary Thomas <gary@mlbassoc.com>
* src/debug/dbg_gdb.cxx:
Index: intr0.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/tests/intr0.cxx,v
retrieving revision 1.13
diff -u -r1.13 intr0.cxx
--- intr0.cxx 11 Aug 2006 09:29:31 -0000 1.13
+++ intr0.cxx 22 Aug 2007 13:40:08 -0000
@@ -97,7 +97,9 @@
static bool flash( void )
{
- Cyg_Interrupt intr0 = Cyg_Interrupt(CYGNUM_HAL_ISR_MIN, 0, (CYG_ADDRWORD)333, isr0, dsr0 );
+ Cyg_Interrupt intr0 = Cyg_Interrupt(CYGNUM_HAL_ISR_MIN,
+ CYGNUM_KERNEL_INTR_TEST_PRIO_A,
+ (CYG_ADDRWORD)333, isr0, dsr0 );
return true;
}
@@ -134,13 +136,15 @@
HAL_INTERRUPT_IN_USE( lvl1, in_use );
Cyg_Interrupt* intr0 = NULL;
if (!in_use)
- intr0 = new((void *)&intr0_obj[0]) Cyg_Interrupt( lvl1, 1, (CYG_ADDRWORD)777, isr0, dsr0 );
+ intr0 = new((void *)&intr0_obj[0]) Cyg_Interrupt( lvl1, CYGNUM_KERNEL_INTR_TEST_PRIO_B,
+ (CYG_ADDRWORD)777, isr0, dsr0 );
cyg_vector lvl2 = CYGNUM_HAL_ISR_MIN + ( 15 % CYGNUM_HAL_ISR_COUNT);
HAL_INTERRUPT_IN_USE( lvl2, in_use );
Cyg_Interrupt* intr1 = NULL;
if (!in_use && lvl1 != lvl2)
- intr1 = new((void *)&intr1_obj[0]) Cyg_Interrupt( lvl2, 1, 888, isr1, dsr1 );
+ intr1 = new((void *)&intr1_obj[0]) Cyg_Interrupt( lvl2, CYGNUM_KERNEL_INTR_TEST_PRIO_C,
+ 888, isr1, dsr1 );
// Check these functions at least exist
Cyg_Interrupt::disable_interrupts();
Index: kintr0.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/tests/kintr0.c,v
retrieving revision 1.12
diff -u -r1.12 kintr0.c
--- kintr0.c 11 Aug 2006 09:29:31 -0000 1.12
+++ kintr0.c 22 Aug 2007 13:40:44 -0000
@@ -103,8 +103,8 @@
cyg_handle_t handle;
cyg_interrupt intr;
- cyg_interrupt_create(CYGNUM_HAL_ISR_MIN, 0, (cyg_addrword_t)333,
- isr0, dsr0, &handle, &intr );
+ cyg_interrupt_create(CYGNUM_HAL_ISR_MIN, CYGNUM_KERNEL_INTR_TEST_PRIO_A,
+ (cyg_addrword_t)333, isr0, dsr0, &handle, &intr );
cyg_interrupt_delete(handle);
return true;
@@ -156,13 +156,14 @@
HAL_INTERRUPT_IN_USE( lvl1, in_use );
intr0 = 0;
if (!in_use)
- cyg_interrupt_create(lvl1, 1, (cyg_addrword_t)777, isr0, dsr0,
- &intr0, &intr_obj[0]);
+ cyg_interrupt_create(lvl1, CYGNUM_KERNEL_INTR_TEST_PRIO_B,
+ (cyg_addrword_t)777, isr0, dsr0, &intr0, &intr_obj[0]);
HAL_INTERRUPT_IN_USE( lvl2, in_use );
intr1 = 0;
if (!in_use && lvl1 != lvl2)
- cyg_interrupt_create(lvl2, 1, 888, isr1, dsr1, &intr1, &intr_obj[1]);
+ cyg_interrupt_create(lvl2, CYGNUM_KERNEL_INTR_TEST_PRIO_C,
+ 888, isr1, dsr1, &intr1, &intr_obj[1]);
// Check these functions at least exist
-------------- next part --------------
--
Before posting, please read the FAQ: http://ecos.sourceware.org/fom/ecos
and search the list archive: http://ecos.sourceware.org/ml/ecos-discuss
More information about the Ecos-discuss
mailing list