2001-09-27 Joel Sherrill <joel@OARcorp.com>

* 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

@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+	* shmsupp/lock.c: Renamed delay() to rtems_bsp_delay().
 
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

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: \

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 */
     }
 }
 

c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog

@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+	* shmsupp/lock.c: Renamed delay() to rtems_bsp_delay().
 
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

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 ) \
   { \
   }
 

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 */
    }
 }