From 75f09e52dea753e8ff655fcd16088135cd894136 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 21 Feb 1996 14:43:34 +0000 Subject: Dispersal of internal thread handler resulted in IDLE thread becoming part of the Thread Handler. This required the name of the optional CPU dependent IDLE thread implementation to change. --- c/src/exec/score/cpu/hppa1.1/cpu.h | 6 +++--- c/src/exec/score/cpu/i386/cpu.h | 6 +++--- c/src/exec/score/cpu/i960/cpu.h | 11 ++++------- c/src/exec/score/cpu/m68k/cpu.h | 6 +++--- c/src/exec/score/cpu/no_cpu/cpu.c | 4 ++-- c/src/exec/score/cpu/no_cpu/cpu.h | 16 ++++++++-------- c/src/exec/score/cpu/powerpc/cpu.h | 12 ++++++------ c/src/exec/score/cpu/sparc/cpu.c | 4 ++-- c/src/exec/score/cpu/sparc/cpu.h | 16 ++++++++-------- c/src/exec/score/cpu/unix/cpu.c | 4 ++-- c/src/exec/score/cpu/unix/cpu.h | 16 ++++++++-------- 11 files changed, 49 insertions(+), 52 deletions(-) (limited to 'c/src/exec/score') diff --git a/c/src/exec/score/cpu/hppa1.1/cpu.h b/c/src/exec/score/cpu/hppa1.1/cpu.h index a2b430ca28..8c468ff59b 100644 --- a/c/src/exec/score/cpu/hppa1.1/cpu.h +++ b/c/src/exec/score/cpu/hppa1.1/cpu.h @@ -223,7 +223,7 @@ typedef struct { boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; /* * Control of external interrupts. @@ -278,10 +278,10 @@ void hppa_external_interrupt_spurious_handler(unsigned32, CPU_Interrupt_frame *) #define CPU_STACK_CHECK_SIZE (CPU_FRAME_SIZE * 2) /* - * extra stack required by system initialization thread + * extra stack required by the MPCI receive server thread */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 0 +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 0 /* * HPPA has 32 interrupts, then 32 external interrupts diff --git a/c/src/exec/score/cpu/i386/cpu.h b/c/src/exec/score/cpu/i386/cpu.h index a13040ad79..3a9a7da433 100644 --- a/c/src/exec/score/cpu/i386/cpu.h +++ b/c/src/exec/score/cpu/i386/cpu.h @@ -103,7 +103,7 @@ typedef struct { void (*idle_task)( void ); boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; unsigned32 interrupt_table_segment; void *interrupt_table_offset; @@ -134,10 +134,10 @@ EXTERN void *_CPU_Interrupt_stack_high; #define CPU_MODES_INTERRUPT_MASK 0x00000001 /* interrupt level in mode */ /* - * extra stack required by system initialization thread + * extra stack required by the MPCI receive server thread */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 1024 +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 1024 /* * i386 family supports 256 distinct vectors. diff --git a/c/src/exec/score/cpu/i960/cpu.h b/c/src/exec/score/cpu/i960/cpu.h index f08fa694b8..2ed819afb6 100644 --- a/c/src/exec/score/cpu/i960/cpu.h +++ b/c/src/exec/score/cpu/i960/cpu.h @@ -145,7 +145,7 @@ typedef struct { void (*idle_task)( void ); boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; #if defined(__i960CA__) || defined(__i960_CA__) || defined(__i960CA) i960ca_PRCB *Prcb; #endif @@ -173,13 +173,10 @@ EXTERN void *_CPU_Interrupt_stack_high; #define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp ) /* - * extra stack required by system initialization thread - * - * NOTE: Make sure this stays positive ... + * extra stack required by the MPCI receive server thread */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK \ - (CPU_STACK_MINIMUM_SIZE) +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK (CPU_STACK_MINIMUM_SIZE) /* * i960 family supports 256 distinct vectors. @@ -191,7 +188,7 @@ EXTERN void *_CPU_Interrupt_stack_high; /* * Minimum size of a thread's stack. * - * NOTE: See CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK + * NOTE: See CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK */ #define CPU_STACK_MINIMUM_SIZE 2048 diff --git a/c/src/exec/score/cpu/m68k/cpu.h b/c/src/exec/score/cpu/m68k/cpu.h index 6eb3aac708..f7678a820b 100644 --- a/c/src/exec/score/cpu/m68k/cpu.h +++ b/c/src/exec/score/cpu/m68k/cpu.h @@ -138,7 +138,7 @@ typedef struct { void (*idle_task)( void ); boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; m68k_isr *interrupt_vector_table; } rtems_cpu_table; @@ -166,10 +166,10 @@ extern char _VBR[]; #define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp ) /* - * extra stack required by system initialization thread + * extra stack required by the MPCI receive server thread */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 1024 +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 1024 /* * m68k family supports 256 distinct vectors. diff --git a/c/src/exec/score/cpu/no_cpu/cpu.c b/c/src/exec/score/cpu/no_cpu/cpu.c index fafed97667..ba533324ac 100644 --- a/c/src/exec/score/cpu/no_cpu/cpu.c +++ b/c/src/exec/score/cpu/no_cpu/cpu.c @@ -137,7 +137,7 @@ void _CPU_Install_interrupt_stack( void ) /*PAGE * - * _CPU_Internal_threads_Idle_thread_body + * _CPU_Thread_Idle_body * * NOTES: * @@ -152,7 +152,7 @@ void _CPU_Install_interrupt_stack( void ) * hook with caution. */ -void _CPU_Internal_threads_Idle_thread_body( void ) +void _CPU_Thread_Idle_body( void ) { for( ; ; ) diff --git a/c/src/exec/score/cpu/no_cpu/cpu.h b/c/src/exec/score/cpu/no_cpu/cpu.h index 8c60ea3ece..0247e49f5f 100644 --- a/c/src/exec/score/cpu/no_cpu/cpu.h +++ b/c/src/exec/score/cpu/no_cpu/cpu.h @@ -207,9 +207,9 @@ extern "C" { /* * Does this port provide a CPU dependent IDLE task implementation? * - * If TRUE, then the routine _CPU_Internal_threads_Idle_thread_body + * If TRUE, then the routine _CPU_Thread_Idle_body * must be provided and is the default IDLE thread body instead of - * _Internal_threads_Idle_thread_body. + * _CPU_Thread_Idle_body. * * If FALSE, then use the generic IDLE thread body if the BSP does * not provide one. @@ -343,7 +343,7 @@ typedef struct { void (*idle_task)( void ); boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; unsigned32 some_other_cpu_dependent_info; } rtems_cpu_table; @@ -401,11 +401,11 @@ EXTERN void (*_CPU_Thread_dispatch_pointer)(); /* * Amount of extra stack (above minimum stack size) required by - * system initialization thread. Remember that in a multiprocessor - * system the system intialization thread becomes the MP server thread. + * MPCI receive server thread. Remember that in a multiprocessor + * system this thread must exist and be able to process all directives. */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 0 +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 0 /* * This defines the number of entries in the ISR_Vector_table managed @@ -759,7 +759,7 @@ void _CPU_ISR_install_vector( void _CPU_Install_interrupt_stack( void ); /* - * _CPU_Internal_threads_Idle_thread_body + * _CPU_Thread_Idle_body * * This routine is the CPU dependent IDLE thread body. * @@ -767,7 +767,7 @@ void _CPU_Install_interrupt_stack( void ); * is TRUE. */ -void _CPU_Internal_threads_Idle_thread_body( void ); +void _CPU_Thread_Idle_body( void ); /* * _CPU_Context_switch diff --git a/c/src/exec/score/cpu/powerpc/cpu.h b/c/src/exec/score/cpu/powerpc/cpu.h index fc2868cccf..e55b2f9e75 100644 --- a/c/src/exec/score/cpu/powerpc/cpu.h +++ b/c/src/exec/score/cpu/powerpc/cpu.h @@ -234,9 +234,9 @@ struct CPU_Interrupt_frame; /* * Does this port provide a CPU dependent IDLE task implementation? * - * If TRUE, then the routine _CPU_Internal_threads_Idle_thread_body + * If TRUE, then the routine _CPU_Thread_Idle_body * must be provided and is the default IDLE thread body instead of - * _Internal_threads_Idle_thread_body. + * _CPU_Thread_Idle_body. * * If FALSE, then use the generic IDLE thread body if the BSP does * not provide one. @@ -441,7 +441,7 @@ typedef struct { void (*idle_task)( void ); boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; unsigned32 clicks_per_usec; /* Timer clicks per microsecond */ unsigned32 serial_per_sec; /* Serial clocks per second */ boolean serial_external_clock; @@ -530,11 +530,11 @@ EXTERN struct { /* * Amount of extra stack (above minimum stack size) required by - * system initialization thread. Remember that in a multiprocessor - * system the system intialization thread becomes the MP server thread. + * MPCI receive server thread. Remember that in a multiprocessor + * system this thread must exist and be able to process all directives. */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 0 +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 0 /* * This defines the number of entries in the ISR_Vector_table managed diff --git a/c/src/exec/score/cpu/sparc/cpu.c b/c/src/exec/score/cpu/sparc/cpu.c index 9f242d4a8f..23a93f176e 100644 --- a/c/src/exec/score/cpu/sparc/cpu.c +++ b/c/src/exec/score/cpu/sparc/cpu.c @@ -376,7 +376,7 @@ void _CPU_Context_Initialize( /*PAGE * - * _CPU_Internal_threads_Idle_thread_body + * _CPU_Thread_Idle_body * * Some SPARC implementations have low power, sleep, or idle modes. This * tries to take advantage of those models. @@ -392,7 +392,7 @@ void _CPU_Context_Initialize( #if defined(erc32) -void _CPU_Internal_threads_Idle_thread_body( void ) +void _CPU_Thread_Idle_body( void ) { while (1) { ERC32_MEC.Power_Down = 0; /* value is irrelevant */ diff --git a/c/src/exec/score/cpu/sparc/cpu.h b/c/src/exec/score/cpu/sparc/cpu.h index b6bcb91738..5c0a9a2ca2 100644 --- a/c/src/exec/score/cpu/sparc/cpu.h +++ b/c/src/exec/score/cpu/sparc/cpu.h @@ -145,9 +145,9 @@ extern "C" { /* * Does this port provide a CPU dependent IDLE task implementation? * - * If TRUE, then the routine _CPU_Internal_threads_Idle_thread_body + * If TRUE, then the routine _CPU_Thread_Idle_body * must be provided and is the default IDLE thread body instead of - * _Internal_threads_Idle_thread_body. + * _CPU_Thread_Idle_body. * * If FALSE, then use the generic IDLE thread body if the BSP does * not provide one. @@ -507,7 +507,7 @@ typedef struct { void (*idle_task)( void ); boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; } rtems_cpu_table; /* @@ -601,11 +601,11 @@ EXTERN unsigned8 _CPU_Trap_Table_area[ 8192 ] /* * Amount of extra stack (above minimum stack size) required by - * system initialization thread. Remember that in a multiprocessor - * system the system intialization thread becomes the MP server thread. + * MPCI receive server thread. Remember that in a multiprocessor + * system this thread must exist and be able to process all directives. */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 1024 +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 1024 /* * This defines the number of entries in the ISR_Vector_table managed @@ -898,13 +898,13 @@ void _CPU_ISR_install_vector( #if (CPU_PROVIDES_IDLE_THREAD_BODY == TRUE) /* - * _CPU_Internal_threads_Idle_thread_body + * _CPU_Thread_Idle_body * * Some SPARC implementations have low power, sleep, or idle modes. This * tries to take advantage of those models. */ -void _CPU_Internal_threads_Idle_thread_body( void ); +void _CPU_Thread_Idle_body( void ); #endif /* CPU_PROVIDES_IDLE_THREAD_BODY */ diff --git a/c/src/exec/score/cpu/unix/cpu.c b/c/src/exec/score/cpu/unix/cpu.c index e32410aa35..5578911b16 100644 --- a/c/src/exec/score/cpu/unix/cpu.c +++ b/c/src/exec/score/cpu/unix/cpu.c @@ -339,7 +339,7 @@ void _CPU_Install_interrupt_stack( void ) /*PAGE * - * _CPU_Internal_threads_Idle_thread_body + * _CPU_Thread_Idle_body * * Stop until we get a signal which is the logically the same thing * entering low-power or sleep mode on a real processor and waiting for @@ -347,7 +347,7 @@ void _CPU_Install_interrupt_stack( void ) * CPU cycles which is again similar to low power mode. */ -void _CPU_Internal_threads_Idle_thread_body( void ) +void _CPU_Thread_Idle_body( void ) { while (1) pause(); diff --git a/c/src/exec/score/cpu/unix/cpu.h b/c/src/exec/score/cpu/unix/cpu.h index df582ab44b..0f1be5283b 100644 --- a/c/src/exec/score/cpu/unix/cpu.h +++ b/c/src/exec/score/cpu/unix/cpu.h @@ -221,9 +221,9 @@ extern "C" { /* * Does this port provide a CPU dependent IDLE task implementation? * - * If TRUE, then the routine _CPU_Internal_threads_Idle_thread_body + * If TRUE, then the routine _CPU_Thread_Idle_body * must be provided and is the default IDLE thread body instead of - * _Internal_threads_Idle_thread_body. + * _CPU_Thread_Idle_body. * * If FALSE, then use the generic IDLE thread body if the BSP does * not provide one. @@ -471,7 +471,7 @@ typedef struct { void (*idle_task)( void ); boolean do_zero_of_workspace; unsigned32 interrupt_stack_size; - unsigned32 extra_system_initialization_stack; + unsigned32 extra_mpci_receive_server_stack; } rtems_cpu_table; /* @@ -542,11 +542,11 @@ EXTERN void (*_CPU_Thread_dispatch_pointer)(); /* * Amount of extra stack (above minimum stack size) required by - * system initialization thread. Remember that in a multiprocessor - * system the system intialization thread becomes the MP server thread. + * MPCI receive server thread. Remember that in a multiprocessor + * system this thread must exist and be able to process all directives. */ -#define CPU_SYSTEM_INITIALIZATION_THREAD_EXTRA_STACK 0 +#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 0 /* * This defines the number of entries in the ISR_Vector_table managed @@ -873,7 +873,7 @@ void _CPU_ISR_install_vector( void _CPU_Install_interrupt_stack( void ); /* - * _CPU_Internal_threads_Idle_thread_body + * _CPU_Thread_Idle_body * * This routine is the CPU dependent IDLE thread body. * @@ -881,7 +881,7 @@ void _CPU_Install_interrupt_stack( void ); * is TRUE. */ -void _CPU_Internal_threads_Idle_thread_body( void ); +void _CPU_Thread_Idle_body( void ); /* * _CPU_Context_switch -- cgit v1.2.3