Updated to current source and removed warnings.

3 files changed, 22 insertions, 24 deletions

diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
index 54f072893c..3bca35e05f 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h \
   $(srcdir)/dmv170.h $(srcdir)/chain.h $(srcdir)/tod.h
@@ -28,8 +26,8 @@ EQ_FILES =
 
 SRCS=$(H_FILES) $(EQ_FILES)
 
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
index aa4f4df348..0e91696eac 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
@@ -73,7 +73,6 @@ extern "C" {
     asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
   } while (0)
 
-
 #define Clear_tm27_intr() \
   do { \
     unsigned32 _clicks = 0xffffffff; \
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
index 2c0d8a0b00..f7c504f9ed 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/dmv170.h
@@ -41,10 +41,16 @@
 extern "C" {
 #endif
 
-/* Note:  Move address defs to the linker files.                            */
-#define  DMV170_RTC_ADDRESS   0xf2c00000 /* Real Time clock Base Address*/
-#define  DUART_ADDR	0xf2800000  /* base address of the DUART(68681)     */
-#define  SCC_ADDR       0xfb000000  /* base address for the SCC (85C30)     */ 
+/* Note:  Move address defs to the linker files. XXX */
+
+/* Real Time Clock Base Address */
+#define  DMV170_RTC_ADDRESS   (unsigned char *)0xf2c00000
+
+/* base address of the DUART(68681) */
+#define  DUART_ADDR	0xf2800000
+
+/* base address for the SCC (85C30) */ 
+#define  SCC_ADDR       0xfb000000
 
 #define DMV170_LOCAL_CONTROL_STATUS_REG                   0xf2400000
 #define DMV170_TIMER0_COUNT_INTERVAL_REG                  0xf2400008
@@ -53,12 +59,11 @@ extern "C" {
 #define DMV170_TIMER_CONTROL_REG                          0xf2400020
 #define DMV170_CARD_RESORCE_REG                           0xf2400040
 
+#define DMV170_WRITE( _reg, _data ) \
+   *((volatile rtems_unsigned16 *)(_reg)) = (_data)
 
-#define DMV170_WRITE( reg,data) \
-   *((volatile rtems_unsigned16 *)(reg)) = (data)
-
-#define DMV170_READ( reg, data ) \
-   (data) = *((volatile rtems_unsigned16 *)(reg))
+#define DMV170_READ( _reg, _data ) \
+   (_data) = *((volatile rtems_unsigned16 *)(_reg))
 
 /*
  *  The following defines the bits in the Local Control and Status Register.
@@ -81,8 +86,11 @@ extern "C" {
 #define DMV170_EEPROM_DATA_HIGH                           0x0080
 #define DMV170_EEPROM_DATA_LOW                            0x0000
 
-/* Bits 8:10 68040 Transfer Modifer Codes represent the Transfer Modifier to be used on MAXPack Accesses. */
-/* Bit  11 68040 Transfer Type (TT) 0:TT are both low 1:TT are both high                                  */
+/* Bits 8-10: 68040 Transfer Modifer Codes represent the Transfer
+ *            Modifier to be used on MAXPack Accesses.
+ *
+ * Bit 11   : 68040 Transfer Type (TT) 0:TT are both low 1:TT are both high
+ */
 
 #define DMV170_USER_LINK0_STATUS_MASK                     0x1000
 #define DMV170_USER_LINK0_OPEN                            0x1000
@@ -206,10 +214,3 @@ extern "C" {
  
 #endif /* !_INCLUDE_DMV170_h */
 /* end of include file */
-
-
-
-
-
-
-