diff options
19 files changed, 59 insertions, 39 deletions
diff --git a/c/src/exec/score/cpu/i386/i386types.h b/c/src/exec/score/cpu/i386/i386types.h index 33e06e49fd..dea5bf2737 100644 --- a/c/src/exec/score/cpu/i386/i386types.h +++ b/c/src/exec/score/cpu/i386/i386types.h @@ -44,7 +44,9 @@ typedef unsigned32 boolean; /* Boolean value */ typedef float single_precision; /* single precision float */ typedef double double_precision; /* double precision float */ -typedef void ( *i386_isr )( void ); +typedef void i386_isr; + +typedef i386_isr ( *i386_isr_entry )( void ); #ifdef __cplusplus } diff --git a/c/src/exec/score/cpu/i960/i960types.h b/c/src/exec/score/cpu/i960/i960types.h index eed649a043..5b1bfddb4c 100644 --- a/c/src/exec/score/cpu/i960/i960types.h +++ b/c/src/exec/score/cpu/i960/i960types.h @@ -44,7 +44,9 @@ typedef unsigned32 boolean; /* Boolean value */ typedef float single_precision; /* single precision float */ typedef double double_precision; /* double precision float */ -typedef void ( *i960_isr )( void ); +typedef void i960_isr; + +typedef void ( *i960_isr_entry )( void ); #ifdef __cplusplus } diff --git a/c/src/exec/score/cpu/m68k/m68ktypes.h b/c/src/exec/score/cpu/m68k/m68ktypes.h index 1c045bc242..b1aba06a02 100644 --- a/c/src/exec/score/cpu/m68k/m68ktypes.h +++ b/c/src/exec/score/cpu/m68k/m68ktypes.h @@ -44,7 +44,9 @@ typedef unsigned32 boolean; /* Boolean value */ typedef float single_precision; /* single precision float */ typedef double double_precision; /* double precision float */ -typedef void ( *m68k_isr )( void ); +typedef void m68k_isr; + +typedef void ( *m68k_isr_entry )( void ); #ifdef __cplusplus } diff --git a/c/src/exec/score/cpu/no_cpu/no_cputypes.h b/c/src/exec/score/cpu/no_cpu/no_cputypes.h index e7bb97919c..e3e350a54d 100644 --- a/c/src/exec/score/cpu/no_cpu/no_cputypes.h +++ b/c/src/exec/score/cpu/no_cpu/no_cputypes.h @@ -44,7 +44,8 @@ typedef unsigned32 boolean; /* Boolean value */ typedef float single_precision; /* single precision float */ typedef double double_precision; /* double precision float */ -typedef void ( *no_cpu_isr )( void ); +typedef void no_cpu_isr; +typedef void ( *no_cpu_isr_entry )( void ); #ifdef __cplusplus } diff --git a/c/src/exec/score/cpu/unix/unixtypes.h b/c/src/exec/score/cpu/unix/unixtypes.h index 4d0337ec0c..4c57ab8c64 100644 --- a/c/src/exec/score/cpu/unix/unixtypes.h +++ b/c/src/exec/score/cpu/unix/unixtypes.h @@ -44,7 +44,9 @@ typedef unsigned32 boolean; /* Boolean value */ typedef float single_precision; /* single precision float */ typedef double double_precision; /* double precision float */ -typedef void ( *unix_isr )( void ); +typedef void unix_isr; + +typedef unix_isr ( *unix_isr_entry )( void ); #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/i386/force386/include/bsp.h b/c/src/lib/libbsp/i386/force386/include/bsp.h index b9b050b3c6..3a184df0f9 100644 --- a/c/src/lib/libbsp/i386/force386/include/bsp.h +++ b/c/src/lib/libbsp/i386/force386/include/bsp.h @@ -142,7 +142,7 @@ BSP_EXTERN unsigned int Gdt_base; /* routines */ -i386_isr set_vector( +i386_isr_entry set_vector( rtems_isr_entry handler, rtems_vector_number vector, int type diff --git a/c/src/lib/libbsp/i386/force386/startup/setvec.c b/c/src/lib/libbsp/i386/force386/startup/setvec.c index 370178a8f5..e8195c0733 100644 --- a/c/src/lib/libbsp/i386/force386/startup/setvec.c +++ b/c/src/lib/libbsp/i386/force386/startup/setvec.c @@ -25,13 +25,13 @@ #include <rtems.h> #include <bsp.h> -i386_isr set_vector( /* returns old vector */ +i386_isr_entry set_vector( /* returns old vector */ rtems_isr_entry handler, /* isr routine */ rtems_vector_number vector, /* vector number */ int type /* RTEMS or RAW intr */ ) { - i386_isr previous_isr; + i386_isr_entry previous_isr; i386_IDT_slot idt; if ( type ) @@ -41,7 +41,7 @@ i386_isr set_vector( /* returns old vector */ idt = Interrupt_descriptor_table[ vector ]; - previous_isr = (i386_isr) + previous_isr = (i386_isr_entry) ((idt.offset_16_31 << 16) | idt.offset_0_15); /* build the IDT entry */ diff --git a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h index 7e4f423102..c2d3918e7f 100644 --- a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h +++ b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h @@ -149,13 +149,13 @@ extern "C" { extern rtems_configuration_table BSP_Configuration; -extern m68k_isr M68Kvec[]; /* vector table address */ +extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* functions */ void bsp_cleanup( void ); -m68k_isr set_vector( +m68k_isr_entry set_vector( rtems_isr_entry handler, rtems_vector_number vector, int type diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c index a0ec9b7e71..e66abc9ad2 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c @@ -75,11 +75,11 @@ int bsp_start( char **environp ) { - m68k_isr *monitors_vector_table; - int index; - void *vbr; + m68k_isr_entry *monitors_vector_table; + int index; + void *vbr; - monitors_vector_table = (m68k_isr *)0; /* Monitor Vectors are at 0 */ + monitors_vector_table = (m68k_isr_entry *)0; /* Monitor Vectors are at 0 */ m68k_set_vbr( monitors_vector_table ); for ( index=2 ; index<=255 ; index++ ) diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h index 826ab8cad2..68faeba68c 100644 --- a/c/src/lib/libbsp/m68k/idp/include/bsp.h +++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h @@ -56,13 +56,13 @@ extern rtems_configuration_table BSP_Configuration; -extern m68k_isr M68Kvec[]; /* vector table address */ +extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* functions */ void bsp_cleanup( void ); -m68k_isr set_vector( +m68k_isr_entry set_vector( rtems_isr_entry handler, rtems_vector_number vector, int type diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index 80d619ebe8..a0b738c53e 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -82,8 +82,8 @@ int bsp_start( char **environp ) { - m68k_isr *monitors_vector_table; - int index; + m68k_isr_entry *monitors_vector_table; + int index; duart_base = (unsigned char *)DUART_ADDR; @@ -91,9 +91,8 @@ int bsp_start( * Set the VBR here to the monitor's default. */ - monitors_vector_table = (m68k_isr *)0; /* This is where - you set vector base - register = 0 */ + monitors_vector_table = (m68k_isr_entry *)0; + /* This is where you set vector base register = 0 */ m68k_set_vbr( monitors_vector_table ); /* The vector interrupt table for the 680x0 is in appendix B-2 @@ -128,7 +127,7 @@ int bsp_start( Cpu_table.do_zero_of_workspace = TRUE; - Cpu_table.interrupt_vector_table = (m68k_isr *) &M68Kvec; + Cpu_table.interrupt_vector_table = (m68k_isr_entry *) &M68Kvec; Cpu_table.interrupt_stack_size = 4096; diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index f89a1b0461..939a09d41e 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -122,13 +122,13 @@ extern rtems_configuration_table BSP_Configuration; EXTERN volatile struct r_m681_info *_Read_m681; /* M68681 read registers */ EXTERN volatile struct w_m681_info *_Write_m681; /* M68681 write registers */ -extern m68k_isr M68Kvec[]; /* vector table address */ +extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* functions */ void bsp_cleanup( void ); -m68k_isr set_vector( +m68k_isr_entry set_vector( rtems_isr_entry handler, rtems_vector_number vector, int type diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index 514340d9ea..916b495520 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -76,10 +76,10 @@ int bsp_start( char **environp ) { - m68k_isr *monitors_vector_table; - int index; + m68k_isr_entry *monitors_vector_table; + int index; - monitors_vector_table = (m68k_isr *)0; /* 135Bug Vectors are at 0 */ + monitors_vector_table = (m68k_isr_entry *)0; /* 135Bug Vectors are at 0 */ m68k_set_vbr( monitors_vector_table ); for ( index=2 ; index<=255 ; index++ ) @@ -110,7 +110,7 @@ int bsp_start( Cpu_table.do_zero_of_workspace = TRUE; - Cpu_table.interrupt_vector_table = (m68k_isr *) &M68Kvec; + Cpu_table.interrupt_vector_table = (m68k_isr_entry *) &M68Kvec; Cpu_table.interrupt_stack_size = 4096; diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 0b3a7d76d8..9573965917 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -205,13 +205,13 @@ static volatile struct ipic_csr { extern rtems_configuration_table BSP_Configuration; -extern m68k_isr M68Kvec[]; /* vector table address */ +extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* functions */ void bsp_cleanup( void ); -m68k_isr set_vector( +m68k_isr_entry set_vector( rtems_isr_entry handler, rtems_vector_number vector, int type diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index fb137f7ebc..f7f2824554 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -81,14 +81,14 @@ int bsp_start( char **environp ) { - m68k_isr *monitors_vector_table; - int index; + m68k_isr_entry *monitors_vector_table; + int index; /* * 162Bug Vectors are at 0xFFE00000 */ - monitors_vector_table = (m68k_isr *)0xFFE00000; + monitors_vector_table = (m68k_isr_entry *)0xFFE00000; m68k_set_vbr( monitors_vector_table ); @@ -125,7 +125,7 @@ int bsp_start( Cpu_table.do_zero_of_workspace = TRUE; - Cpu_table.interrupt_vector_table = (m68k_isr *) &M68Kvec; + Cpu_table.interrupt_vector_table = (m68k_isr_entry *) &M68Kvec; Cpu_table.interrupt_stack_size = 4096; diff --git a/c/src/tests/mptests/mp14/node1/mp14.scn b/c/src/tests/mptests/mp14/node1/mp14.scn index 98202bc439..f57c4f47b3 100644 --- a/c/src/tests/mptests/mp14/node1/mp14.scn +++ b/c/src/tests/mptests/mp14/node1/mp14.scn @@ -35,4 +35,7 @@ p - indicates 100 iterations of s - indicates 100 iterations of rtems_semaphore_obtain and rtems_semaphore_release. -NOTE: The messages could be interspersed. +NOTES: 1. The messages could be interspersed. + 2. If one of the nodes exits first, the other may report + timeout errors on blocking directives. + diff --git a/c/src/tests/mptests/mp14/node2/mp14.scn b/c/src/tests/mptests/mp14/node2/mp14.scn index cd82f3c81b..d128c870e9 100644 --- a/c/src/tests/mptests/mp14/node2/mp14.scn +++ b/c/src/tests/mptests/mp14/node2/mp14.scn @@ -32,4 +32,7 @@ p - indicates 100 iterations of s - indicates 100 iterations of rtems_semaphore_obtain and rtems_semaphore_release. -NOTE: The messages could be interspersed. +NOTES: 1. The messages could be interspersed. + 2. If one of the nodes exits first, the other may report + timeout errors on blocking directives. + diff --git a/testsuites/mptests/mp14/node1/mp14.scn b/testsuites/mptests/mp14/node1/mp14.scn index 98202bc439..f57c4f47b3 100644 --- a/testsuites/mptests/mp14/node1/mp14.scn +++ b/testsuites/mptests/mp14/node1/mp14.scn @@ -35,4 +35,7 @@ p - indicates 100 iterations of s - indicates 100 iterations of rtems_semaphore_obtain and rtems_semaphore_release. -NOTE: The messages could be interspersed. +NOTES: 1. The messages could be interspersed. + 2. If one of the nodes exits first, the other may report + timeout errors on blocking directives. + diff --git a/testsuites/mptests/mp14/node2/mp14.scn b/testsuites/mptests/mp14/node2/mp14.scn index cd82f3c81b..d128c870e9 100644 --- a/testsuites/mptests/mp14/node2/mp14.scn +++ b/testsuites/mptests/mp14/node2/mp14.scn @@ -32,4 +32,7 @@ p - indicates 100 iterations of s - indicates 100 iterations of rtems_semaphore_obtain and rtems_semaphore_release. -NOTE: The messages could be interspersed. +NOTES: 1. The messages could be interspersed. + 2. If one of the nodes exits first, the other may report + timeout errors on blocking directives. + |