diff packages/kernel/current/tests/intr0.cxx @ 86:6512add4f5d6 ecos-sw-2000-05-05

Merge from eCos master repository on 2000-05-05-07:47:05-BST
author jlarmour
date Fri, 05 May 2000 17:31:08 +0000
parents bf00f99aec69
children eb9fd8c04db3
line wrap: on
line diff
--- a/packages/kernel/current/tests/intr0.cxx
+++ b/packages/kernel/current/tests/intr0.cxx
@@ -87,7 +87,7 @@ static void dsr1(cyg_vector vector, cyg_
 
 static bool flash( void )
 {
-    Cyg_Interrupt intr0 = Cyg_Interrupt( 0, 0, (CYG_ADDRWORD)333, isr0, dsr0 );
+    Cyg_Interrupt intr0 = Cyg_Interrupt(CYGNUM_HAL_ISR_MIN, 0, (CYG_ADDRWORD)333, isr0, dsr0 );
 
     return true;
 }
@@ -120,13 +120,13 @@ void intr0_main( void )
 
     // Make sure the chosen levels are not already in use.
     int in_use;
-    cyg_vector lvl1 = 1 % (CYGNUM_HAL_ISR_COUNT);
+    cyg_vector lvl1 = (CYGNUM_HAL_ISR_MIN + 1) % (CYGNUM_HAL_ISR_COUNT);
     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 );
      
-    cyg_vector lvl2 = 15 % (CYGNUM_HAL_ISR_COUNT);
+    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)
@@ -149,7 +149,7 @@ void intr0_main( void )
     // instead of adding to it we could be in a big mess if the
     // vector is being used by something important.
         
-    cyg_vector v = 11 % CYGNUM_HAL_VSR_COUNT;
+    cyg_vector v = (CYGNUM_HAL_VSR_MIN + 11) % CYGNUM_HAL_VSR_COUNT;
     cyg_VSR *old_vsr, *new_vsr;
     Cyg_Interrupt::set_vsr( v, vsr0, &old_vsr );
     Cyg_Interrupt::get_vsr( v, &new_vsr );
@@ -179,7 +179,7 @@ void intr0_main( void )
         v1 = 12 % CYGNUM_HAL_ISR_COUNT;
     else /* NOTE TRAILING ELSE... */
 #endif
-    v1 = 6 % CYGNUM_HAL_ISR_COUNT;
+    v1 = (CYGNUM_HAL_ISR_MIN + 6) % CYGNUM_HAL_ISR_COUNT;
 
     Cyg_Interrupt::mask_interrupt(v1);
     Cyg_Interrupt::unmask_interrupt(v1);