change log for rtems (2010-12-16)

rtems-vc at rtems.org rtems-vc at rtems.org
Thu Dec 16 15:10:29 UTC 2010


 *sh*:
Added missing include file.

M    1.3  c/src/lib/libbsp/arm/lpc32xx/startup/bspreset.c

diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/startup/bspreset.c:1.2 rtems/c/src/lib/libbsp/arm/lpc32xx/startup/bspreset.c:1.3
--- rtems/c/src/lib/libbsp/arm/lpc32xx/startup/bspreset.c:1.2	Thu Dec 16 07:35:06 2010
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/startup/bspreset.c	Thu Dec 16 08:41:03 2010
@@ -20,6 +20,8 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
+#include <stdbool.h>
+
 #include <bspopts.h>
 #include <bsp/bootcard.h>
 #include <bsp/lpc32xx.h>


 *sh*:
2010-12-16	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* score/src/watchdognanoseconds.c: New file.
	* score/Makefile.am: Reflect change above.
	* score/include/rtems/score/watchdog.h, score/src/coretodget.c,
	score/src/coretodgetuptime.c: Do not allow NULL as nanoseconds since
	last tick handler pointer.

M 1.2664  cpukit/ChangeLog
M   1.90  cpukit/score/Makefile.am
M   1.31  cpukit/score/include/rtems/score/watchdog.h
M    1.5  cpukit/score/src/coretodget.c
M    1.6  cpukit/score/src/coretodgetuptime.c
A    1.1  cpukit/score/src/watchdognanoseconds.c

diff -u rtems/cpukit/ChangeLog:1.2663 rtems/cpukit/ChangeLog:1.2664
--- rtems/cpukit/ChangeLog:1.2663	Wed Dec  8 04:30:26 2010
+++ rtems/cpukit/ChangeLog	Thu Dec 16 08:50:11 2010
@@ -1,3 +1,11 @@
+2010-12-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* score/src/watchdognanoseconds.c: New file.
+	* score/Makefile.am: Reflect change above.
+	* score/include/rtems/score/watchdog.h, score/src/coretodget.c,
+	score/src/coretodgetuptime.c: Do not allow NULL as nanoseconds since
+	last tick handler pointer.
+
 2010-12-08	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* libnetworking/loop.h, libnetworking/net/if_loop.c,

diff -u rtems/cpukit/score/Makefile.am:1.89 rtems/cpukit/score/Makefile.am:1.90
--- rtems/cpukit/score/Makefile.am:1.89	Wed Nov 24 09:51:27 2010
+++ rtems/cpukit/score/Makefile.am	Thu Dec 16 08:50:12 2010
@@ -203,7 +203,8 @@
 ## WATCHDOG_C_FILES
 libscore_a_SOURCES += src/watchdog.c src/watchdogadjust.c \
     src/watchdogadjusttochain.c src/watchdoginsert.c src/watchdogremove.c \
-    src/watchdogtickle.c src/watchdogreport.c src/watchdogreportchain.c
+    src/watchdogtickle.c src/watchdogreport.c src/watchdogreportchain.c \
+    src/watchdognanoseconds.c
 
 ## USEREXT_C_FILES
 libscore_a_SOURCES += src/userextaddset.c \

diff -u rtems/cpukit/score/include/rtems/score/watchdog.h:1.30 rtems/cpukit/score/include/rtems/score/watchdog.h:1.31
--- rtems/cpukit/score/include/rtems/score/watchdog.h:1.30	Sat Jun 12 00:56:26 2010
+++ rtems/cpukit/score/include/rtems/score/watchdog.h	Thu Dec 16 08:50:12 2010
@@ -170,8 +170,8 @@
  *  This is a pointer to the optional BSP plugin to obtain the number
  *  of nanoseconds since the last clock tick.
  */
-SCORE_EXTERN Watchdog_Nanoseconds_since_last_tick_routine
-    _Watchdog_Nanoseconds_since_tick_handler;
+extern Watchdog_Nanoseconds_since_last_tick_routine
+  _Watchdog_Nanoseconds_since_tick_handler;
 
 /** @brief Per Ticks Watchdog List
  *
@@ -302,6 +302,13 @@
   Chain_Control     *header
 );
 
+/**
+ * @brief Default nanoseconds since last tick handler.
+ *
+ * @retval 0 Always.
+ */
+uint32_t _Watchdog_Nanoseconds_since_tick_default_handler( void );
+
 #ifndef __RTEMS_APPLICATION__
 #include <rtems/score/watchdog.inl>
 #endif

diff -u rtems/cpukit/score/src/coretodget.c:1.4 rtems/cpukit/score/src/coretodget.c:1.5
--- rtems/cpukit/score/src/coretodget.c:1.4	Mon Dec  8 13:41:31 2008
+++ rtems/cpukit/score/src/coretodget.c	Thu Dec 16 08:50:12 2010
@@ -45,11 +45,9 @@
   /* assume time checked for NULL by caller */
 
   /* _TOD_Now is the native current time */
-  nanoseconds = 0;
   _ISR_Disable( level );
     now = _TOD_Now;
-    if ( _Watchdog_Nanoseconds_since_tick_handler )
-      nanoseconds = (*_Watchdog_Nanoseconds_since_tick_handler)();
+    nanoseconds = (*_Watchdog_Nanoseconds_since_tick_handler)();
   _ISR_Enable( level );
 
   _Timestamp_Set( &offset, 0, nanoseconds );

diff -u rtems/cpukit/score/src/coretodgetuptime.c:1.5 rtems/cpukit/score/src/coretodgetuptime.c:1.6
--- rtems/cpukit/score/src/coretodgetuptime.c:1.5	Wed Dec 10 16:13:28 2008
+++ rtems/cpukit/score/src/coretodgetuptime.c	Thu Dec 16 08:50:12 2010
@@ -45,11 +45,9 @@
   /* assume time checked for NULL by caller */
 
   /* _TOD_Uptime is in native timestamp format */
-  nanoseconds = 0;
   _ISR_Disable( level );
     up = _TOD_Uptime;
-    if ( _Watchdog_Nanoseconds_since_tick_handler )
-      nanoseconds = (*_Watchdog_Nanoseconds_since_tick_handler)();
+    nanoseconds = (*_Watchdog_Nanoseconds_since_tick_handler)();
   _ISR_Enable( level );
 
   _Timestamp_Set( &offset, 0, nanoseconds );

diff -u /dev/null rtems/cpukit/score/src/watchdognanoseconds.c:1.1
--- /dev/null	Thu Dec 16 09:10:29 2010
+++ rtems/cpukit/score/src/watchdognanoseconds.c	Thu Dec 16 08:50:12 2010
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Obere Lagerstr. 30
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems at embedded-brains.de>
+ *
+ * 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$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/system.h>
+#include <rtems/score/watchdog.h>
+
+Watchdog_Nanoseconds_since_last_tick_routine
+  _Watchdog_Nanoseconds_since_tick_handler =
+    _Watchdog_Nanoseconds_since_tick_default_handler;
+
+uint32_t _Watchdog_Nanoseconds_since_tick_default_handler( void )
+{
+  return 0;
+}



--

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/20101216/d67d6627/attachment.html>


More information about the vc mailing list