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

	* include/bsp.h: Renamed delay() to rtems_bsp_delay().

50 files changed, 129 insertions, 27 deletions

diff --git a/c/src/lib/libbsp/a29k/portsw/ChangeLog b/c/src/lib/libbsp/a29k/portsw/ChangeLog
index ee79b05675..2930671c64 100644
--- a/c/src/lib/libbsp/a29k/portsw/ChangeLog
+++ b/c/src/lib/libbsp/a29k/portsw/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/a29k/portsw/include/bsp.h b/c/src/lib/libbsp/a29k/portsw/include/bsp.h
index c32116eb81..d1c730abde 100644
--- a/c/src/lib/libbsp/a29k/portsw/include/bsp.h
+++ b/c/src/lib/libbsp/a29k/portsw/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/bare/ChangeLog b/c/src/lib/libbsp/bare/ChangeLog
index 1aa30cfd13..f99d10e8ab 100644
--- a/c/src/lib/libbsp/bare/ChangeLog
+++ b/c/src/lib/libbsp/bare/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/bare/include/bsp.h b/c/src/lib/libbsp/bare/include/bsp.h
index be532e02ea..765b906b89 100644
--- a/c/src/lib/libbsp/bare/include/bsp.h
+++ b/c/src/lib/libbsp/bare/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/h8300/h8sim/ChangeLog b/c/src/lib/libbsp/h8300/h8sim/ChangeLog
index 3e23d1c947..18e017a778 100644
--- a/c/src/lib/libbsp/h8300/h8sim/ChangeLog
+++ b/c/src/lib/libbsp/h8300/h8sim/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
index 0f17b92555..3aea35cf5f 100644
--- a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
+++ b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
@@ -60,7 +60,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/hppa1.1/simhppa/ChangeLog b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
index e0bfa0261b..8f1c66aa2f 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
index 9cf0c8c65e..046dc197c2 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
@@ -72,7 +72,7 @@ extern "C" {
  */
 
 extern void Clock_delay(rtems_unsigned32 microseconds);
-#define delay( microseconds ) \
+#define rtems_bsp_delay( microseconds ) \
         Clock_delay(microseconds);
 
 /*
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index 5827856f6c..28b19d5c6e 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
index 2145c3d269..e32917dd47 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
@@ -72,7 +72,7 @@ extern "C" {
  *  This is very dependent on the clock speed of the target.
  */
 
-#define delay( _microseconds ) \
+#define rtems_bsp_delay( _microseconds ) \
   { \
     rtems_unsigned32 _counter; \
     \
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 9dab63308a..0c223449b0 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h
index 703492bb4f..29f5a699b8 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h
@@ -166,7 +166,7 @@ extern int rtems_dec21140_driver_attach(struct rtems_bsdnet_ifconfig *, int);
 | Simple spin delay in microsecond units for device drivers.
 | This is very dependent on the clock speed of the target.
 +--------------------------------------------------------------------------*/
-#define delay(_microseconds) \
+#define rtems_bsp_delay(_microseconds) \
 { \
   rtems_unsigned32 _cnt = _microseconds; \
   asm volatile ("0: nop; mov %0,%0; loop 0b" : "=c"(_cnt) : "0"(_cnt)); \
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index e3b4ecfc66..b7b61a745f 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
index 104dd8d2bc..0514481253 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
@@ -115,7 +115,7 @@ extern void Wait_X_ms (unsigned);
  *  This is very dependent on the clock speed of the target.
  */
 
-#define delay( _microseconds ) \
+#define rtems_bsp_delay( _microseconds ) \
   { \
     rtems_unsigned32 _counter; \
     \
diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
index 67141bb165..f423294dc2 100644
--- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog
+++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
index 984e84c5d8..c87d14a124 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
+++ b/c/src/lib/libbsp/i960/rxgen960/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/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
index 386525e4c8..50146cd98c 100644
--- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog
+++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
index 2d7725081d..bede95fb53 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
@@ -85,7 +85,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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog
index 91176e12f6..60d43199a5 100644
--- a/c/src/lib/libbsp/m68k/efi332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi332/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/m68k/efi332/include/bsp.h b/c/src/lib/libbsp/m68k/efi332/include/bsp.h
index dbd6f9bde4..8d0e755bed 100644
--- a/c/src/lib/libbsp/m68k/efi332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/efi332/include/bsp.h
@@ -70,7 +70,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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog
index 3bc4bef9bf..5c013a8287 100644
--- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi68k/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h
index 647789c115..bcee50c305 100644
--- a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h
@@ -70,7 +70,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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index 8b086f4bbf..a8f33075de 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
index 341c30c1c7..e2e1ccdfc9 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
@@ -67,7 +67,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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index 457ed62ad8..5e0108e307 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index 94906a7066..5568bcd2e9 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68340/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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index ee25a39319..64ed45a848 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
index 4392bd4c50..8cbfc2b638 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
@@ -85,7 +85,7 @@ extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config, int a
  *  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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index f72baae73a..585d44118d 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index 36baf95c79..c8c558dc3d 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -70,7 +70,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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 1b0a7552ed..3c85f618f1 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
index 43764048bf..799b7597bd 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
@@ -67,7 +67,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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index 38aa2f2018..e009a014c8 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
index 72f502ba61..b80142aed8 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
@@ -81,7 +81,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=123; \
     asm volatile( "0: \
diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
index a781a0e0a7..36bdb446a0 100644
--- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog
+++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
index 446f822ded..d92602a385 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
@@ -64,7 +64,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/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog
index cd0e155f3b..c670d38669 100644
--- a/c/src/lib/libbsp/mips/p4000/ChangeLog
+++ b/c/src/lib/libbsp/mips/p4000/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/mips/p4000/include/bsp.h b/c/src/lib/libbsp/mips/p4000/include/bsp.h
index dc8489aeab..1c2c0edfd7 100644
--- a/c/src/lib/libbsp/mips/p4000/include/bsp.h
+++ b/c/src/lib/libbsp/mips/p4000/include/bsp.h
@@ -80,9 +80,10 @@ extern unsigned32 mips_get_timer( void );
  *        by code in the delay macro that is necessary for 64 bit mode.
  */
 
-#define delay( microseconds ) \
+#define rtems_bsp_delay( microseconds ) \
   { \
-     unsigned32 _end_clock = mips_get_timer() + microseconds * CLOCKS_PER_MICROSECOND; \
+     unsigned32 _end_clock = \
+          mips_get_timer() + microseconds * CLOCKS_PER_MICROSECOND; \
      _end_clock %= 0x100000000;  /* make sure result is 32 bits */ \
      \
      /* handle timer overflow, if necessary */ \
diff --git a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
index 9f38f89f96..f3fd73df2b 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
+++ b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/mips64orion/p4000/include/bsp.h b/c/src/lib/libbsp/mips64orion/p4000/include/bsp.h
index dc8489aeab..1c2c0edfd7 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/include/bsp.h
+++ b/c/src/lib/libbsp/mips64orion/p4000/include/bsp.h
@@ -80,9 +80,10 @@ extern unsigned32 mips_get_timer( void );
  *        by code in the delay macro that is necessary for 64 bit mode.
  */
 
-#define delay( microseconds ) \
+#define rtems_bsp_delay( microseconds ) \
   { \
-     unsigned32 _end_clock = mips_get_timer() + microseconds * CLOCKS_PER_MICROSECOND; \
+     unsigned32 _end_clock = \
+          mips_get_timer() + microseconds * CLOCKS_PER_MICROSECOND; \
      _end_clock %= 0x100000000;  /* make sure result is 32 bits */ \
      \
      /* handle timer overflow, if necessary */ \
diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog
index aaded6f386..de4ceda429 100644
--- a/c/src/lib/libbsp/sh/gensh1/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index ec4b4df4a1..734878645b 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -92,7 +92,7 @@ extern "C" {
  *  This is very dependent on the clock speed of the target.
  */
 
-#define delay( microseconds ) CPU_delay(microseconds)
+#define rtems_bsp_delay( microseconds ) CPU_delay(microseconds)
 #define sh_delay( microseconds ) CPU_delay(microseconds)
 
 /*
diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog
index 865df5a82f..d2c80937e9 100644
--- a/c/src/lib/libbsp/sh/gensh2/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
index 5bf802b51b..a18197a40f 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
@@ -108,7 +108,7 @@ extern "C" {
  *  This is very dependent on the clock speed of the target.
  */
 
-#define delay( microseconds ) CPU_delay(microseconds)
+#define rtems_bsp_delay( microseconds ) CPU_delay(microseconds)
 #define sh_delay( microseconds ) CPU_delay( microseconds )
 
 
diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog
index 1893dc4b76..fa5dcc4e7d 100644
--- a/c/src/lib/libbsp/sh/shsim/ChangeLog
+++ b/c/src/lib/libbsp/sh/shsim/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'CLEANFILES ='.
diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h
index ae72550213..f22dc64e2f 100644
--- a/c/src/lib/libbsp/sh/shsim/include/bsp.h
+++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h
@@ -82,7 +82,7 @@ extern "C" {
  * FIXME: Not applicable with gdb's simulator
  * Kept for sourcecode compatibility with other sh-BSPs 
  */
-#define delay( microseconds ) CPU_delay(microseconds)
+#define rtems_bsp_delay( microseconds ) CPU_delay(microseconds)
 #define sh_delay( microseconds ) CPU_delay(microseconds)
 
 /*
diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog
index 126d9f7455..02d03e5444 100644
--- a/c/src/lib/libbsp/sparc/erc32/ChangeLog
+++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
index 77f5ef97e6..e5bdbf221e 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
@@ -130,7 +130,7 @@ extern int rtems_erc32_sonic_driver_attach (struct rtems_bsdnet_ifconfig *config
 
 extern void Clock_delay(rtems_unsigned32 microseconds);
 
-#define delay( microseconds ) Clock_delay(microseconds)
+#define rtems_bsp_delay( microseconds ) Clock_delay(microseconds)
 
 /* Constants */
 
diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog
index 2fa31fb307..afb1631448 100644
--- a/c/src/lib/libbsp/sparc/leon/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	* include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
 2001-09-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/sparc/leon/include/bsp.h b/c/src/lib/libbsp/sparc/leon/include/bsp.h
index 1949441959..dc8a7c1eac 100644
--- a/c/src/lib/libbsp/sparc/leon/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon/include/bsp.h
@@ -123,7 +123,7 @@ extern "C" {
 
 extern void Clock_delay(rtems_unsigned32 microseconds);
 
-#define delay( microseconds ) Clock_delay(microseconds)
+#define rtems_bsp_delay( microseconds ) Clock_delay(microseconds)
 
 /* Constants */