change log for rtems (2011-04-27)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Apr 27 18:11:59 UTC 2011
*jennifer*:
2011-04-27 Jennifer Averett <Jennifer.Averett at OARcorp.com>
PR 1784
* sapi/src/exinit.c, score/Makefile.am, score/preinstall.am,
score/include/rtems/bspsmp.h, score/src/percpu.c, score/src/smp.c,
score/src/threadcreateidle.c: Split bspsmp.h into two files smp.h and
bspsmp.h
* score/include/rtems/score/smp.h: New file.
M 1.2806 cpukit/ChangeLog
M 1.59 cpukit/sapi/src/exinit.c
M 1.97 cpukit/score/Makefile.am
M 1.4 cpukit/score/include/rtems/bspsmp.h
A 1.1 cpukit/score/include/rtems/score/smp.h
M 1.29 cpukit/score/preinstall.am
M 1.5 cpukit/score/src/percpu.c
M 1.3 cpukit/score/src/smp.c
M 1.18 cpukit/score/src/threadcreateidle.c
diff -u rtems/cpukit/ChangeLog:1.2805 rtems/cpukit/ChangeLog:1.2806
--- rtems/cpukit/ChangeLog:1.2805 Mon Apr 25 10:06:41 2011
+++ rtems/cpukit/ChangeLog Wed Apr 27 12:18:58 2011
@@ -1,3 +1,12 @@
+2011-04-27 Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+ PR 1784
+ * sapi/src/exinit.c, score/Makefile.am, score/preinstall.am,
+ score/include/rtems/bspsmp.h, score/src/percpu.c, score/src/smp.c,
+ score/src/threadcreateidle.c: Split bspsmp.h into two files smp.h and
+ bspsmp.h
+ * score/include/rtems/score/smp.h: New file.
+
2011-04-25 Jennifer Averett <Jennifer.Averett at OARcorp.com>
* score/include/rtems/bspsmp.h: Did some prototype cleanup.
diff -u rtems/cpukit/sapi/src/exinit.c:1.58 rtems/cpukit/sapi/src/exinit.c:1.59
--- rtems/cpukit/sapi/src/exinit.c:1.58 Mon Apr 4 11:40:00 2011
+++ rtems/cpukit/sapi/src/exinit.c Wed Apr 27 12:18:59 2011
@@ -58,7 +58,7 @@
#endif
#if defined(RTEMS_SMP)
- #include <rtems/bspsmp.h>
+ #include <rtems/score/smp.h>
#include <rtems/score/percpu.h>
#endif
diff -u rtems/cpukit/score/Makefile.am:1.96 rtems/cpukit/score/Makefile.am:1.97
--- rtems/cpukit/score/Makefile.am:1.96 Thu Apr 21 14:05:14 2011
+++ rtems/cpukit/score/Makefile.am Wed Apr 27 12:18:59 2011
@@ -37,7 +37,7 @@
include/rtems/score/tqdata.h include/rtems/score/userext.h \
include/rtems/score/watchdog.h include/rtems/score/wkspace.h \
include/rtems/score/cpuopts.h include/rtems/score/basedefs.h \
- include/rtems/score/smplock.h
+ include/rtems/score/smplock.h include/rtems/score/smp.h
if HAS_PTHREADS
include_rtems_score_HEADERS += include/rtems/score/corespinlock.h \
diff -u rtems/cpukit/score/include/rtems/bspsmp.h:1.3 rtems/cpukit/score/include/rtems/bspsmp.h:1.4
--- rtems/cpukit/score/include/rtems/bspsmp.h:1.3 Mon Apr 25 10:06:41 2011
+++ rtems/cpukit/score/include/rtems/bspsmp.h Wed Apr 27 12:18:59 2011
@@ -44,44 +44,9 @@
extern "C" {
#endif
-/**
- * This defines the bit which indicates the interprocessor interrupt
- * has been requested so that RTEMS will reschedule on this CPU
- * because the currently executing thread needs to be switched out.
- */
-#define RTEMS_BSP_SMP_CONTEXT_SWITCH_NECESSARY 0x01
-
-/**
- * This defines the bit which indicates the interprocessor interrupt
- * has been requested so that RTEMS will reschedule on this CPU
- * because the currently executing thread has been sent a signal.
- */
-#define RTEMS_BSP_SMP_SIGNAL_TO_SELF 0x02
-
-/**
- * This defines the bit which indicates the interprocessor interrupt
- * has been requested so that this CPU will be shutdown. This is done
- * as part of rtems_executive_shutdown().
- */
-#define RTEMS_BSP_SMP_SHUTDOWN 0x04
-
-/**
- * This defines the bit which indicates the interprocessor interrupt
- * has been requested that the receiving CPU needs to perform a context
- * switch to the first task.
- */
-#define RTEMS_BSP_SMP_FIRST_TASK 0x08
#ifndef ASM
/**
- * @brief Number of CPUs in SMP System
- *
- * This variable is set during the SMP initialization sequence to
- * indicate the number of CPUs in this system.
- */
-SCORE_EXTERN uint32_t _SMP_Processor_count;
-
-/**
* @brief Maximum Number of CPUs in SMP System
*
* This variable is set during the SMP initialization sequence to
@@ -131,32 +96,6 @@
);
/**
- * @brief Make Request of Others CPUs
- *
- * This method is invoked by RTEMS when it needs to make a request
- * of the other CPUs. It should be implemented using some type of
- * interprocessor interrupt. CPUs not including the originating
- * CPU should receive the message.
- *
- * @param [in] message is message to send
- */
-void bsp_smp_broadcast_message(
- uint32_t message
-);
-
-/**
- * @brief Make Request of Others CPUs
- *
- * This method is invoked by XXX when it needs to make a request
- * of the other CPUs.
- *
- * @param [in] message is message to send
- */
-void rtems_smp_broadcast_message(
- uint32_t message
-);
-
-/**
* @brief Generate a Interprocessor Broadcast Interrupt
*
* This method is invoked when RTEMS wants to let all of the other
@@ -230,6 +169,12 @@
*/
void rtems_smp_process_interrupt(void);
+void bsp_smp_wait_for(
+ volatile unsigned int *address,
+ unsigned int desired,
+ int maximum_usecs
+);
+
#endif
#ifdef __cplusplus
diff -u /dev/null rtems/cpukit/score/include/rtems/score/smp.h:1.1
--- /dev/null Wed Apr 27 13:11:58 2011
+++ rtems/cpukit/score/include/rtems/score/smp.h Wed Apr 27 12:18:59 2011
@@ -0,0 +1,112 @@
+/**
+ * @file rtems/score/smp.h
+ *
+ * This include file defines the interface to the SuperCore
+ * SMP support that is used internally to RTEMS.
+ */
+
+/*
+ * 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_SMP_H
+#define _RTEMS_SCORE_SMP_H
+
+#if defined (RTEMS_SMP)
+#include <rtems/score/percpu.h>
+
+/**
+ * @defgroup SuperCore SMP Support
+ *
+ * This defines the interface of the SuperCore support
+ * code for SMP support.
+ */
+
+/**@{*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * This defines the bit which indicates the interprocessor interrupt
+ * has been requested so that RTEMS will reschedule on this CPU
+ * because the currently executing thread needs to be switched out.
+ */
+#define RTEMS_BSP_SMP_CONTEXT_SWITCH_NECESSARY 0x01
+
+/**
+ * This defines the bit which indicates the interprocessor interrupt
+ * has been requested so that RTEMS will reschedule on this CPU
+ * because the currently executing thread has been sent a signal.
+ */
+#define RTEMS_BSP_SMP_SIGNAL_TO_SELF 0x02
+
+/**
+ * This defines the bit which indicates the interprocessor interrupt
+ * has been requested so that this CPU will be shutdown. This is done
+ * as part of rtems_executive_shutdown().
+ */
+#define RTEMS_BSP_SMP_SHUTDOWN 0x04
+
+/**
+ * This defines the bit which indicates the interprocessor interrupt
+ * has been requested that the receiving CPU needs to perform a context
+ * switch to the first task.
+ */
+#define RTEMS_BSP_SMP_FIRST_TASK 0x08
+
+#ifndef ASM
+/**
+ * @brief Number of CPUs in SMP System
+ *
+ * This variable is set during the SMP initialization sequence to
+ * indicate the number of CPUs in this system.
+ */
+SCORE_EXTERN uint32_t _SMP_Processor_count;
+
+/**
+ * @brief Make Request of Others CPUs
+ *
+ * This method is invoked by RTEMS when it needs to make a request
+ * of the other CPUs. It should be implemented using some type of
+ * interprocessor interrupt. CPUs not including the originating
+ * CPU should receive the message.
+ *
+ * @param [in] message is message to send
+ */
+void _SMP_Broadcast_message(
+ uint32_t message
+);
+
+/**
+ * @brief Request Dispatch on Other Cores
+ *
+ * Send message to other cores requesting them to perform
+ * a thread dispatch operation.
+ */
+void _SMP_Request_other_cores_to_dispatch(void);
+
+/**
+ * @Brief Request Other Cores to Shutdown
+ *
+ * Send message to other cores requesting them to shutdown.
+ */
+void _SMP_Request_other_cores_to_shutdown(void);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+#endif
+/* end of include file */
diff -u rtems/cpukit/score/preinstall.am:1.28 rtems/cpukit/score/preinstall.am:1.29
--- rtems/cpukit/score/preinstall.am:1.28 Mon Apr 4 13:44:16 2011
+++ rtems/cpukit/score/preinstall.am Wed Apr 27 12:18:59 2011
@@ -199,6 +199,10 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smplock.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smplock.h
+$(PROJECT_INCLUDE)/rtems/score/smp.h: include/rtems/score/smp.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/smp.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/smp.h
+
if HAS_PTHREADS
$(PROJECT_INCLUDE)/rtems/score/corespinlock.h: include/rtems/score/corespinlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.h
diff -u rtems/cpukit/score/src/percpu.c:1.4 rtems/cpukit/score/src/percpu.c:1.5
--- rtems/cpukit/score/src/percpu.c:1.4 Mon Apr 4 11:40:00 2011
+++ rtems/cpukit/score/src/percpu.c Wed Apr 27 12:18:59 2011
@@ -19,7 +19,7 @@
#include <rtems/score/wkspace.h>
#include <rtems/score/wkspace.h>
#include <rtems/config.h>
-#include <rtems/bspsmp.h>
+#include <rtems/score/smp.h>
#include <string.h>
#if defined(RTEMS_SMP)
diff -u rtems/cpukit/score/src/smp.c:1.2 rtems/cpukit/score/src/smp.c:1.3
--- rtems/cpukit/score/src/smp.c:1.2 Thu Apr 21 14:05:15 2011
+++ rtems/cpukit/score/src/smp.c Wed Apr 27 12:18:59 2011
@@ -15,6 +15,7 @@
#include <rtems/system.h>
#include <rtems/bspsmp.h>
+#include <rtems/score/smp.h>
#include <rtems/score/thread.h>
#if defined(RTEMS_SMP)
diff -u rtems/cpukit/score/src/threadcreateidle.c:1.17 rtems/cpukit/score/src/threadcreateidle.c:1.18
--- rtems/cpukit/score/src/threadcreateidle.c:1.17 Wed Mar 16 15:05:06 2011
+++ rtems/cpukit/score/src/threadcreateidle.c Wed Apr 27 12:18:59 2011
@@ -30,7 +30,7 @@
#include <rtems/score/userext.h>
#include <rtems/score/wkspace.h>
#include <rtems/config.h>
-#include <rtems/bspsmp.h>
+#include <rtems/score/smp.h>
static inline void _Thread_Create_idle_helper(
uint32_t name_u32,
*jennifer*:
2011-04-27 Jennifer Averett <Jennifer.Averett at OARcorp.com>
PR 1784
* sptests/spsize/size.c: Split bspsmp.h into two files smp.h and
bspsmp.h
M 1.183 testsuites/ChangeLog
M 1.73 testsuites/sptests/spsize/size.c
diff -u rtems/testsuites/ChangeLog:1.182 rtems/testsuites/ChangeLog:1.183
--- rtems/testsuites/ChangeLog:1.182 Thu Apr 21 14:05:33 2011
+++ rtems/testsuites/ChangeLog Wed Apr 27 12:20:35 2011
@@ -1,3 +1,9 @@
+2011-04-27 Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+ PR 1784
+ * sptests/spsize/size.c: Split bspsmp.h into two files smp.h and
+ bspsmp.h
+
2011-04-21 Jennifer Averett <Jennifer.Averett at OARcorp.com
PR 1777/cpukit
diff -u rtems/testsuites/sptests/spsize/size.c:1.72 rtems/testsuites/sptests/spsize/size.c:1.73
--- rtems/testsuites/sptests/spsize/size.c:1.72 Wed Mar 16 15:08:39 2011
+++ rtems/testsuites/sptests/spsize/size.c Wed Apr 27 12:20:35 2011
@@ -48,6 +48,9 @@
#include <rtems/score/tod.h>
#include <rtems/score/userext.h>
#include <rtems/score/wkspace.h>
+#if defined(RTEMS_SMP)
+ #include <rtems/score/smp.h>
+#endif
#include <stdlib.h>
#include <stdio.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/20110427/d7c131a6/attachment.html>
More information about the vc
mailing list