diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-05-24 21:39:42 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1995-05-24 21:39:42 +0000 |
commit | 88d594a3d52cb5938521619bca0def8e5b040cf0 (patch) | |
tree | c687a29a2a3d62c87e496c4c4700183f17210a5c /c/src/lib/libbsp | |
parent | Forcing RCS revision to 1.2 I hope (diff) | |
download | rtems-88d594a3d52cb5938521619bca0def8e5b040cf0.tar.bz2 |
Fully tested on all in-house targets
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/clock/ckinit.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/include/bsp.h | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/startup/bspstart.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/idp/timer/timer.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/shmdr/poll.c | 29 | ||||
-rw-r--r-- | c/src/lib/libbsp/shmdr/shm.h | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/shmdr/shm_driver.h | 4 |
9 files changed, 41 insertions, 39 deletions
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c index 765e60c62c..115a5bd136 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c @@ -1,5 +1,5 @@ /* - * @(#)bspstart.c 1.13 - 95/04/25 + * @(#)bspstart.c 1.14 - 95/05/16 * */ @@ -24,7 +24,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * bspstart.c,v 1.2 1995/05/09 20:17:33 joel Exp */ #include <bsp.h> @@ -255,11 +255,11 @@ bsp_start(void) #ifdef hppa7200 /* - * Use DR0 if supported + * Use HPPA_DR0 if supported */ { int dr0; - HPPA_ASM_MFCPU(DR0, dr0); + HPPA_ASM_MFCPU(HPPA_DR0, dr0); cpu_number = (dr0 >> 4) & 0x7; } #else diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c b/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c index de62ec670d..69b458f099 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c @@ -18,9 +18,8 @@ */ #include <rtems.h> -#include "cpu.h" -#include "bsp.h" -#include "shm.h" +#include <bsp.h> +#include <shm.h> /* * Shm_Initialize_lock diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c index abee1418cc..b27e9bbe38 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c @@ -26,10 +26,9 @@ #include <stdlib.h> -#include "rtems.h" -#include "clockdrv.h" -#include "bsp.h" -#include "cpu.h" +#include <rtems.h> +#include <clockdrv.h> +#include <bsp.h> rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ volatile rtems_unsigned32 Clock_driver_ticks; diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h index ec8221f1f9..826ab8cad2 100644 --- a/c/src/lib/libbsp/m68k/idp/include/bsp.h +++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h @@ -8,11 +8,10 @@ #ifndef __IDP_BSP_H #define __IDP_BSP_H -#include "rtems.h" -#include "cpu.h" -#include "console.h" -#include "mc68230.h" -#include "mc68681.h" +#include <rtems.h> +#include <console.h> +#include <mc68230.h> +#include <mc68681.h> /* * Define the time limits for RTEMS Test Suite test durations. diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index 843a137485..80d619ebe8 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -20,10 +20,9 @@ * $Id$ */ -#include "rtems.h" -#include "bsp.h" -#include "cpu.h" -#include "libcsupport.h" +#include <rtems.h> +#include <bsp.h> +#include <libcsupport.h> unsigned char *duart_base; extern struct duart_regs duart_info; diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c index 176f393e45..6fa1ae206d 100644 --- a/c/src/lib/libbsp/m68k/idp/timer/timer.c +++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c @@ -27,10 +27,9 @@ */ -#include "rtems.h" -#include "cpu.h" -#include "bsp.h" -#include "mc68230.h" +#include <rtems.h> +#include <bsp.h> +#include <mc68230.h> #define TIMER_VECTOR 0x4D diff --git a/c/src/lib/libbsp/shmdr/poll.c b/c/src/lib/libbsp/shmdr/poll.c index 43f6711ff9..c833d49254 100644 --- a/c/src/lib/libbsp/shmdr/poll.c +++ b/c/src/lib/libbsp/shmdr/poll.c @@ -16,10 +16,11 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * poll.c,v 1.2 1995/05/09 20:22:57 joel Exp */ #include <rtems.h> +#include <rtems/sysstate.h> #include "shm.h" #include "clockdrv.h" @@ -29,12 +30,22 @@ void Shm_Poll() Clock_isr( 0 ); /* invoke standard clock ISR */ - /* enable_tracing(); */ - /* ticks += 1; */ - Shm_Lock( Shm_Local_receive_queue ); - tmpfront = Shm_Local_receive_queue->front; - Shm_Unlock( Shm_Local_receive_queue ); - if ( Shm_Convert(tmpfront) == Shm_Locked_queue_End_of_list ) return; - rtems_multiprocessing_announce(); - Shm_Interrupt_count++; + + /* + * Check for msgs only if we are "up" + * This avoids a race condition where we may get a clock + * interrupt before MPCI has completed its init + */ + + if (_System_state_Is_up(_System_state_Get())) + { + /* enable_tracing(); */ + /* ticks += 1; */ + Shm_Lock( Shm_Local_receive_queue ); + tmpfront = Shm_Local_receive_queue->front; + Shm_Unlock( Shm_Local_receive_queue ); + if ( Shm_Convert(tmpfront) == Shm_Locked_queue_End_of_list ) return; + rtems_multiprocessing_announce(); + Shm_Interrupt_count++; + } } diff --git a/c/src/lib/libbsp/shmdr/shm.h b/c/src/lib/libbsp/shmdr/shm.h index bee930138c..08ff6c3812 100644 --- a/c/src/lib/libbsp/shmdr/shm.h +++ b/c/src/lib/libbsp/shmdr/shm.h @@ -14,7 +14,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * shm.h,v 1.2 1995/05/09 20:23:03 joel Exp */ #ifndef __SHM_h @@ -24,8 +24,6 @@ extern "C" { #endif -#include <cpu.h> - /* The information contained in the Node Status, Locked Queue, and * Envelope Control Blocks must be maintained in a NEUTRAL format. * Currently the neutral format may be selected as big or little diff --git a/c/src/lib/libbsp/shmdr/shm_driver.h b/c/src/lib/libbsp/shmdr/shm_driver.h index bee930138c..08ff6c3812 100644 --- a/c/src/lib/libbsp/shmdr/shm_driver.h +++ b/c/src/lib/libbsp/shmdr/shm_driver.h @@ -14,7 +14,7 @@ * to the copyright license under the clause at DFARS 252.227-7013. This * notice must appear in all copies of this file and its derivatives. * - * $Id$ + * shm.h,v 1.2 1995/05/09 20:23:03 joel Exp */ #ifndef __SHM_h @@ -24,8 +24,6 @@ extern "C" { #endif -#include <cpu.h> - /* The information contained in the Node Status, Locked Queue, and * Envelope Control Blocks must be maintained in a NEUTRAL format. * Currently the neutral format may be selected as big or little |