change log for rtems (2011-07-15)

rtems-vc at rtems.org rtems-vc at rtems.org
Fri Jul 15 15:11:26 UTC 2011


 *jennifer*:
2011-07-15	Jennifer Averett <Jennifer.Averett at OARcorp.com>

	* score/Makefile.am, score/preinstall.am,
	score/include/rtems/score/isr.h, score/include/rtems/score/percpu.h:
	Split isrlevel into its own file to avoid a circular dependancy in
	smp code.
	* score/include/rtems/score/isrlevel.h: New file.

M 1.2875  cpukit/ChangeLog
M  1.106  cpukit/score/Makefile.am
M   1.36  cpukit/score/include/rtems/score/isr.h
A    1.1  cpukit/score/include/rtems/score/isrlevel.h
M   1.12  cpukit/score/include/rtems/score/percpu.h
M   1.33  cpukit/score/preinstall.am

diff -u rtems/cpukit/ChangeLog:1.2874 rtems/cpukit/ChangeLog:1.2875
--- rtems/cpukit/ChangeLog:1.2874	Thu Jul 14 14:22:19 2011
+++ rtems/cpukit/ChangeLog	Fri Jul 15 09:36:36 2011
@@ -1,3 +1,11 @@
+2011-07-15	Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+	* score/Makefile.am, score/preinstall.am,
+	score/include/rtems/score/isr.h, score/include/rtems/score/percpu.h:
+	Split isrlevel into its own file to avoid a circular dependancy in
+	smp code.
+	* score/include/rtems/score/isrlevel.h: New file.
+
 2011-07-14      Gene Smith <gene.smith at siemens.com>
 
 	PR 1381/networking

diff -u rtems/cpukit/score/Makefile.am:1.105 rtems/cpukit/score/Makefile.am:1.106
--- rtems/cpukit/score/Makefile.am:1.105	Tue Jun 28 15:31:36 2011
+++ rtems/cpukit/score/Makefile.am	Fri Jul 15 09:36:36 2011
@@ -33,6 +33,7 @@
 include_rtems_score_HEADERS += include/rtems/score/protectedheap.h
 include_rtems_score_HEADERS += include/rtems/score/interr.h
 include_rtems_score_HEADERS += include/rtems/score/isr.h
+include_rtems_score_HEADERS += include/rtems/score/isrlevel.h
 include_rtems_score_HEADERS += include/rtems/score/object.h
 include_rtems_score_HEADERS += include/rtems/score/percpu.h
 include_rtems_score_HEADERS += include/rtems/score/priority.h

diff -u rtems/cpukit/score/include/rtems/score/isr.h:1.35 rtems/cpukit/score/include/rtems/score/isr.h:1.36
--- rtems/cpukit/score/include/rtems/score/isr.h:1.35	Fri Jun 17 10:40:09 2011
+++ rtems/cpukit/score/include/rtems/score/isr.h	Fri Jul 15 09:36:37 2011
@@ -41,12 +41,6 @@
 #endif
 
 /**
- *  The following type defines the control block used to manage
- *  the interrupt level portion of the status register.
- */
-typedef uint32_t   ISR_Level;
-
-/**
  *  The following type defines the type used to manage the vectors.
  */
 typedef uint32_t   ISR_Vector_number;

diff -u /dev/null rtems/cpukit/score/include/rtems/score/isrlevel.h:1.1
--- /dev/null	Fri Jul 15 10:11:26 2011
+++ rtems/cpukit/score/include/rtems/score/isrlevel.h	Fri Jul 15 09:36:37 2011
@@ -0,0 +1,43 @@
+/**
+ *  @file  rtems/score/isrlevel.h
+ *
+ *  This include file defines the ISR Level type.  It exists to
+ *  simplify include dependencies.  It is part of the ISR Handler.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  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_SCORE_ISR_LEVEL_h
+#define _RTEMS_SCORE_ISR_LEVEL_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  @addtogroup ScoreISR ISR Handler
+ */
+/**@{*/
+
+/**
+ *  The following type defines the control block used to manage
+ *  the interrupt level portion of the status register.
+ */
+typedef uint32_t   ISR_Level;
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+

diff -u rtems/cpukit/score/include/rtems/score/percpu.h:1.11 rtems/cpukit/score/include/rtems/score/percpu.h:1.12
--- rtems/cpukit/score/include/rtems/score/percpu.h:1.11	Fri Jun 17 10:40:09 2011
+++ rtems/cpukit/score/include/rtems/score/percpu.h	Fri Jul 15 09:36:37 2011
@@ -24,6 +24,7 @@
 #ifdef ASM
   #include <rtems/asm.h>
 #else
+  #include <rtems/score/isrlevel.h>
   #include <rtems/score/timestamp.h>
   #if defined(RTEMS_SMP)
     #include <rtems/score/smplock.h>

diff -u rtems/cpukit/score/preinstall.am:1.32 rtems/cpukit/score/preinstall.am:1.33
--- rtems/cpukit/score/preinstall.am:1.32	Tue May 17 14:57:12 2011
+++ rtems/cpukit/score/preinstall.am	Fri Jul 15 09:36:37 2011
@@ -99,6 +99,10 @@
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isr.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isr.h
 
+$(PROJECT_INCLUDE)/rtems/score/isrlevel.h: include/rtems/score/isrlevel.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isrlevel.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isrlevel.h
+
 $(PROJECT_INCLUDE)/rtems/score/object.h: include/rtems/score/object.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.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/20110715/ea88d718/attachment.html>


More information about the vc mailing list