Changeset 74fe9ce in rtems

Timestamp:

Mar 15, 2018, 2:49:11 PM (4 years ago)

Author:

Joel Sherrill <joel@…>

Branches:

5, master

Children:

3200c300

Parents:

dce920ae

git-author:

Joel Sherrill <joel@…> (03/15/18 14:49:11)

git-committer:

Joel Sherrill <joel@…> (03/16/18 13:38:20)

Message:

rtems/bfin/bf533.h: Eliminate redefinition warning and add sanity check

Closes #3346.

File:

• cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h (modified) (1 diff)

cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h

@@ -332 +332 @@
 #define TIMER2_WIDTH           0xFFC0062CL
 
+/*
+ * These are defined in bsps/bfin/include/bf52x.h. Ensure those definitions
+ * are consistent with our expectations.
 #define TIMER_ENABLE           0xFFC00640L
 #define TIMER_DISABLE          0xFFC00644L
 #define TIMER_STATUS           0xFFC00648L
+*/
+#if ((TIMER_ENABLE != 0xFFC00640L) || \
+     (TIMER_DISABLE != 0xFFC00644L) || \
+     (TIMER_STATUS != 0xFFC00648L))
+#error "Timer register addresses are inconsistent"
+#endif
 
 /* Real Time Clock          Chapter 16 */