From cbb5fc7072ce7c9f691c8d6ef3560245fab2a643 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 28 Sep 2001 13:25:55 +0000 Subject: 2001-09-27 Joel Sherrill * include/bsp.h: Renamed delay() to rtems_bsp_delay(). * shmsupp/lock.c: Renamed delay() to rtems_bsp_delay(). --- c/src/lib/libbsp/i960/cvme961/ChangeLog | 4 ++++ c/src/lib/libbsp/i960/cvme961/include/bsp.h | 2 +- c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c | 2 +- c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog | 4 ++++ c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h | 2 +- c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/c/src/lib/libbsp/i960/cvme961/ChangeLog b/c/src/lib/libbsp/i960/cvme961/ChangeLog index 14aa537c84..6cc5240f4c 100644 --- a/c/src/lib/libbsp/i960/cvme961/ChangeLog +++ b/c/src/lib/libbsp/i960/cvme961/ChangeLog @@ -1,3 +1,7 @@ +2001-09-27 Joel Sherrill + + * include/bsp.h: Renamed delay() to rtems_bsp_delay(). + * shmsupp/lock.c: Renamed delay() to rtems_bsp_delay(). 2001-09-27 Ralf Corsepius diff --git a/c/src/lib/libbsp/i960/cvme961/include/bsp.h b/c/src/lib/libbsp/i960/cvme961/include/bsp.h index 91e93a91cf..b914deeb31 100644 --- a/c/src/lib/libbsp/i960/cvme961/include/bsp.h +++ b/c/src/lib/libbsp/i960/cvme961/include/bsp.h @@ -71,7 +71,7 @@ extern "C" { * This is very dependent on the clock speed of the target. */ -#define delay( microseconds ) \ +#define rtems_bsp_delay( microseconds ) \ { register rtems_unsigned32 _delay=(microseconds); \ register rtems_unsigned32 _tmp = 0; /* initialized to avoid warning */ \ asm volatile( "0: \ diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c b/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c index a0fc5af95d..778556593b 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/lock.c @@ -52,7 +52,7 @@ void Shm_Lock( atomic_modify( SHM_LOCK_VALUE, &lq_cb->lock, oldlock ); if ( !(oldlock & SHM_LOCK_VALUE) ) return; - delay( 28 ); /* delay 28 microseconds */ + rtems_bsp_delay( 28 ); /* delay 28 microseconds */ } } diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog index c4b5e53e33..8db3d2c213 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog +++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog @@ -1,3 +1,7 @@ +2001-09-27 Joel Sherrill + + * include/bsp.h: Renamed delay() to rtems_bsp_delay(). + * shmsupp/lock.c: Renamed delay() to rtems_bsp_delay(). 2001-09-27 Ralf Corsepius diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h index 214850571a..aac1cfbd94 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h @@ -66,7 +66,7 @@ extern "C" { * This is very dependent on the clock speed of the target. */ -#define delay( microseconds ) \ +#define rtems_bsp_delay( microseconds ) \ { \ } diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c index 81d424a39e..54860a4e0f 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c @@ -62,7 +62,7 @@ void Shm_Lock( */ if ( lock_value ) - delay( 10 ); /* approximately 10 microseconds */ + rtems_bsp_delay( 10 ); /* approximately 10 microseconds */ } } -- cgit v1.2.3