Changeset 5a513d4 in rtems

Timestamp:

01/18/05 05:25:48 (19 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

8dc9343

Parents:

7f1a915

Message:

2005-01-18 Ralf Corsepius <ralf.corsepius@…>

• Makefile.am: Use ../../shared/tod.h instead of include/tod.h.
• console/config.c: Remove typos from 2005-01-04 changes.
• include/tod.h: Remove.

Location:

c/src/lib/libbsp/powerpc/ppcn_60x

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• console/config.c (modified) (2 diffs)
• include/tod.h (deleted)

c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog

@@ +1 @@
+2005-01-18      Ralf Corsepius <ralf.corsepius@rtems.org>
+
+        * Makefile.am: Use ../../shared/tod.h instead of include/tod.h.
+        * console/config.c: Remove typos from 2005-01-04 changes.
+        * include/tod.h: Remove.
+
 2005-01-07      Ralf Corsepius <ralf.corsepius@rtems.org>
 

c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am

@@ -23 +23 @@
 
 nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
-include_HEADERS += include/tod.h
+include_HEADERS += ../../shared/tod.h
 include_HEADERS += include/nvram.h include/pci.h
 
@@ -92 +92 @@
 noinst_PROGRAMS += network.rel
 network_rel_SOURCES = network/amd79c970.c network/amd79c970.h
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) \
-    $(network_CPPFLAGS)
+network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
@@ -135 +134 @@
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
-$(PROJECT_INCLUDE)/tod.h: include/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h

c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c

@@ -438 +438 @@
          */
 
-        ulTemp = (uint32_t)Console_Port_Tbl[minor].pDeviceParams
+        ulTemp = (uint32_t)Console_Port_Tbl[minor].pDeviceParams;
 #if 1
         /*
@@ -456 +456 @@
          * apply a div 4 here rather than in hardware (using MCR bit 7).
          */
-        ultemp /= 4;
+        ulTemp /= 4;
 
         Console_Port_Tbl[minor].pDeviceParams = (void *)ulTemp;