summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i960
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-28 13:28:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-28 13:28:11 +0000
commitcf28209062c3c3e4247f5daf8aad2907a5494c3e (patch)
treebca00c93eb3f2f3ac5d904bf10568916df71d312 /c/src/lib/libbsp/i960
parent2001-09-27 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-cf28209062c3c3e4247f5daf8aad2907a5494c3e.tar.bz2
2001-09-27 Joel Sherrill <joel@OARcorp.com>
* include/bsp.h: Renamed delay() to rtems_bsp_delay().
Diffstat (limited to 'c/src/lib/libbsp/i960')
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/include/bsp.h2
2 files changed, 5 insertions, 1 deletions
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: \