summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu/no_cpu
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2014-02-13 15:43:03 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-02-17 08:46:38 +0100
commit0344ce0385fb2ff4f55d4154ae38b438c2168340 (patch)
treec183563bb9be2aea7c350af62321e928b58b44bd /cpukit/score/cpu/no_cpu
parentsmptests/smplock01: Use atomic operations (diff)
downloadrtems-0344ce0385fb2ff4f55d4154ae38b438c2168340.tar.bz2
score: Use atomic API for SMP lock
Use a ticket lock implementation based on atomic operations. Delete CPU port specific SMP lock implementations.
Diffstat (limited to 'cpukit/score/cpu/no_cpu')
-rw-r--r--cpukit/score/cpu/no_cpu/Makefile.am1
-rw-r--r--cpukit/score/cpu/no_cpu/preinstall.am4
-rw-r--r--cpukit/score/cpu/no_cpu/rtems/score/cpusmplock.h118
3 files changed, 0 insertions, 123 deletions
diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index 4c812575e9..9d89bc8c0f 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -8,7 +8,6 @@ include_rtems_score_HEADERS = rtems/score/cpu.h
include_rtems_score_HEADERS += rtems/score/no_cpu.h
include_rtems_score_HEADERS += rtems/score/cpu_asm.h
include_rtems_score_HEADERS += rtems/score/types.h
-include_rtems_score_HEADERS += rtems/score/cpusmplock.h
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_SOURCES = cpu.c cpu_asm.c
diff --git a/cpukit/score/cpu/no_cpu/preinstall.am b/cpukit/score/cpu/no_cpu/preinstall.am
index a46f8b0bfd..a56caeafd8 100644
--- a/cpukit/score/cpu/no_cpu/preinstall.am
+++ b/cpukit/score/cpu/no_cpu/preinstall.am
@@ -43,7 +43,3 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
-$(PROJECT_INCLUDE)/rtems/score/cpusmplock.h: rtems/score/cpusmplock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpusmplock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpusmplock.h
-
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpusmplock.h b/cpukit/score/cpu/no_cpu/rtems/score/cpusmplock.h
deleted file mode 100644
index 41e68af2ff..0000000000
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpusmplock.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file
- *
- * @ingroup ScoreSMPLockCPU
- *
- * @brief CPU SMP Lock Implementation
- */
-
-/*
- * Copyright (c) 2013 embedded brains GmbH
- *
- * 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.
- */
-
-#ifndef _RTEMS_SCORE_NO_CPU_SMPLOCK_H
-#define _RTEMS_SCORE_NO_CPU_SMPLOCK_H
-
-#include <rtems/score/cpu.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup ScoreSMPLockCPU CPU SMP Locks
- *
- * @ingroup ScoreSMPLock
- *
- * This example will implement a ticket lock.
- *
- * @{
- */
-
-/**
- * @brief CPU SMP lock control.
- */
-typedef struct {
- unsigned int next_ticket;
- unsigned int now_serving;
-} CPU_SMP_lock_Control;
-
-/**
- * @brief CPU SMP lock control initializer for static initialization.
- */
-#define CPU_SMP_LOCK_INITIALIZER { 0, 0 }
-
-/**
- * @brief Initializes a CPU SMP lock control.
- *
- * @param[out] lock The CPU SMP lock control.
- */
-static inline void _CPU_SMP_lock_Initialize( CPU_SMP_lock_Control *lock )
-{
- lock->next_ticket = 0;
- lock->now_serving = 0;
-}
-
-/**
- * @brief Acquires a CPU SMP lock.
- *
- * @param[in,out] lock The CPU SMP lock control.
- */
-static inline void _CPU_SMP_lock_Acquire( CPU_SMP_lock_Control *lock )
-{
-#if 0
- unsigned int my_ticket = _Atomic_Fetch_and_increment( &lock->next_ticket );
-
- while ( _Atomic_Load_and_acquire( &lock->now_serving ) != my_ticket ) {
- _Wait_some_time();
- }
-#endif
-}
-
-/**
- * @brief Releases a CPU SMP lock.
- *
- * @param[in,out] lock The CPU SMP lock control.
- */
-static inline void _CPU_SMP_lock_Release( CPU_SMP_lock_Control *lock )
-{
-#if 0
- _Atomic_Store_and_release( &lock->now_serving, lock->now_serving + 1 );
-#endif
-}
-
-/**
- * @brief Disables interrupts and acquires the CPU SMP lock.
- *
- * @param[in,out] lock The CPU SMP lock control.
- * @param[out] isr_cookie The ISR cookie.
- */
-#define _CPU_SMP_lock_ISR_disable_and_acquire( lock, isr_cookie ) \
- do { \
- _CPU_ISR_Disable( isr_cookie ); \
- _CPU_SMP_lock_Acquire( lock ); \
- } while (0)
-
-/**
- * @brief Releases the CPU SMP lock and enables interrupts.
- *
- * @param[in,out] lock The CPU SMP lock control.
- * @param[in] isr_cookie The ISR cookie.
- */
-#define _CPU_SMP_lock_Release_and_ISR_enable( lock, isr_cookie ) \
- do { \
- _CPU_SMP_lock_Release( lock ); \
- _CPU_ISR_Enable( isr_cookie ); \
- } while (0)
-
-/**@}*/
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _RTEMS_SCORE_NO_CPU_SMPLOCK_H */