change log for rtems (2011-07-24)
rtems-vc at rtems.org
rtems-vc at rtems.org
Sun Jul 24 20:12:18 UTC 2011
*joel* (on branch rtems-4-9-branch):
2011-07-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
* clock/ckinit.c: Correct back port.
M 1.64.2.6 c/src/lib/libbsp/sparc/leon3/ChangeLog
M 1.13.2.2 c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
diff -u rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.64.2.5 rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.64.2.6
--- rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.64.2.5 Mon Apr 25 14:40:17 2011
+++ rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog Sun Jul 24 14:45:39 2011
@@ -1,3 +1,7 @@
+2011-07-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+ * clock/ckinit.c: Correct back port.
+
2011-04-25 Jennifer Averett <jennifer.averett at OARcorp.com>
PR 1783/bsps
diff -u rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.13.2.1 rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.13.2.2
--- rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.13.2.1 Fri Mar 4 08:07:19 2011
+++ rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c Sun Jul 24 14:45:39 2011
@@ -6,7 +6,7 @@
* The tick frequency is directly programmed to the configured number of
* microseconds per tick.
*
- * COPYRIGHT (c) 1989-2006.
+ * COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* Modified for LEON3 BSP.
@@ -99,8 +99,8 @@
uint32_t clicks;
uint32_t usecs;
- if ( LEON_Is_interrupt_pending( LEON_INTERRUPT_TIMER1 ) ) {
- clicks = LEON_REG.Timer_Counter_1;
+ clicks = LEON3_Timer_Regs->timer[0].value;
+ if ( LEON_Is_interrupt_pending( clkirq ) ) {
usecs = (2*rtems_configuration_get_microseconds_per_tick() - clicks);
} else {
usecs = (rtems_configuration_get_microseconds_per_tick() - clicks);
*joel* (on branch rtems-4-9-branch):
2011-07-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
* Makefile.am, preinstall.am: Include stubs so all tests compile.
* include/tm27.h: New file.
M 1.13.2.4 c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
M 1.4.2.2 c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
M 1.2.2.2 c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h
M 1.1.2.2 c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am
diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.13.2.3 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.13.2.4
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog:1.13.2.3 Sun Dec 7 23:15:40 2008
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog Sun Jul 24 15:03:03 2011
@@ -1,3 +1,8 @@
+2011-07-24 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+ * Makefile.am, preinstall.am: Include stubs so all tests compile.
+ * include/tm27.h: New file.
+
2008-12-08 Ralf Corsépius <ralf.corsepius at rtems.org>
* bsp_specs: Backport from CVS-HEAD.
diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am:1.4.2.1 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am:1.4.2.2
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am:1.4.2.1 Wed Sep 24 02:34:19 2008
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am Sun Jul 24 15:03:03 2011
@@ -29,7 +29,10 @@
dist_project_lib_DATA += startup/linkcmds startup/linkcmds.memory
# Includes
-include_HEADERS = include/bsp.h
+include_HEADERS = include/bsp.h
+include_HEADERS += include/tm27.h
+
+include_HEADERS += ../../shared/include/coverhd.h
nodist_include_HEADERS = include/bspopts.h ../../shared/tod.h
include_bspdir = $(includedir)/bsp
@@ -47,6 +50,8 @@
irq_generic_SOURCES = ../../shared/src/irq-generic.c \
../../shared/src/irq-legacy.c
+timer_SOURCES = ../../shared/timerstub.c
+
tests_SOURCES = tests/tests.c startup/sd-card-init.c
# Network
@@ -60,7 +65,7 @@
# BSP library
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(irq_generic_SOURCES) \
- $(tests_SOURCES)
+ $(timer_SOURCES) $(tests_SOURCES)
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
diff -u /dev/null rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h:1.2.2.2
--- /dev/null Sun Jul 24 15:12:18 2011
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/include/tm27.h Sun Jul 24 15:03:03 2011
@@ -0,0 +1,32 @@
+/*
+ * tm27.h
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+#ifndef _RTEMS_TMTEST27
+#error "This is an RTEMS internal file you must not include directly."
+#endif
+
+#ifndef __tm27_h
+#define __tm27_h
+
+/*
+ * Define the interrupt mechanism for Time Test 27
+ */
+
+#define MUST_WAIT_FOR_INTERRUPT 0
+
+#define Install_tm27_vector( handler ) /* set_vector( (handler), 6, 1 ) */
+
+#define Cause_tm27_intr() /* XXX */
+
+#define Clear_tm27_intr() /* XXX */
+
+#define Lower_tm27_intr() /* empty */
+
+#endif
diff -u rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am:1.1.2.1 rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am:1.1.2.2
--- rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am:1.1.2.1 Wed Sep 24 12:16:08 2008
+++ rtems/c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am Sun Jul 24 15:03:03 2011
@@ -52,6 +52,14 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
+$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
+
+$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110724/16c97344/attachment-0001.html>
More information about the vc
mailing list