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

* include/bsp.h: Renamed delay() to rtems_bsp_delay().
2001-09-28 13:28:11 +00:00
parent cbb5fc7072
commit cf28209062
50 changed files with 129 additions and 27 deletions
--- 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 ='.
--- 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 ) \
  { \
  }

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

--- 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 ='.
--- 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: \
--- 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 ='.
--- 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);

 /*
--- 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 ='.
--- 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; \
    \
--- 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 ='.
--- 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)); \
--- 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 ='.
--- 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; \
    \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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: \
--- 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 ='.
--- 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 */ \
--- 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 ='.
--- 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 */ \
--- 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 ='.
--- 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)

 /*
--- 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 ='.
--- 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 )


--- 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 ='.
--- 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)

 /*
--- 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 ='.
--- 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 */

--- 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 ='.
--- 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 */