summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-01-25 08:54:17 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-01-25 12:05:10 +0100
commit01b32d44a41e2959927dea4dafd786a11afc901b (patch)
treec88ef9ede5004d217a2a95604c21f0335b79d724
parent0aeeca4296dbff4f510ea5a090a6f8faa9590fe0 (diff)
downloadrtems-01b32d44a41e2959927dea4dafd786a11afc901b.tar.bz2
score: Delete obsolete CPU_TIMESTAMP_* defines
Update #2271.
-rw-r--r--cpukit/score/cpu/arm/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/bfin/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/epiphany/rtems/score/cpu.h4
-rw-r--r--cpukit/score/cpu/i386/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/lm32/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/m32c/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/m68k/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/mips/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/moxie/rtems/score/cpu.h4
-rw-r--r--cpukit/score/cpu/nios2/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/no_cpu/rtems/score/cpu.h68
-rw-r--r--cpukit/score/cpu/or1k/rtems/score/cpu.h4
-rw-r--r--cpukit/score/cpu/powerpc/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/sh/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/sparc/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/sparc64/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/v850/rtems/score/cpu.h5
-rw-r--r--testsuites/sptests/sp2038/init.c9
18 files changed, 2 insertions, 116 deletions
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index ae33b572af..089d429341 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -147,8 +147,6 @@
/* XXX Why 32? */
#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned (32)))
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
-
/*
* The interrupt mask disables only normal interrupts (IRQ).
*
diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/rtems/score/cpu.h
index ebcfe1e15e..82573834c6 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/rtems/score/cpu.h
@@ -320,8 +320,6 @@ extern "C" {
*/
#define CPU_STRUCTURE_ALIGNMENT
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
/**
* @defgroup CPUEndian Processor Dependent Endianness Support
*
diff --git a/cpukit/score/cpu/epiphany/rtems/score/cpu.h b/cpukit/score/cpu/epiphany/rtems/score/cpu.h
index d0cbb64b44..967b8021ba 100644
--- a/cpukit/score/cpu/epiphany/rtems/score/cpu.h
+++ b/cpukit/score/cpu/epiphany/rtems/score/cpu.h
@@ -813,10 +813,6 @@ void _CPU_Context_Initialize(
#endif
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC FALSE
-#define CPU_TIMESTAMP_USE_INT64 TRUE
-#define CPU_TIMESTAMP_USE_INT64_INLINE FALSE
-
typedef struct {
/* There is no CPU specific per-CPU state */
} CPU_Per_CPU_control;
diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/rtems/score/cpu.h
index 4f0cd6e6b0..8a495972e3 100644
--- a/cpukit/score/cpu/i386/rtems/score/cpu.h
+++ b/cpukit/score/cpu/i386/rtems/score/cpu.h
@@ -102,8 +102,6 @@ extern "C" {
#define CPU_STACK_GROWS_UP FALSE
#define CPU_STRUCTURE_ALIGNMENT
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
/*
* Does this port provide a CPU dependent IDLE task implementation?
*
diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/cpukit/score/cpu/lm32/rtems/score/cpu.h
index e783331cc7..1a6147565a 100644
--- a/cpukit/score/cpu/lm32/rtems/score/cpu.h
+++ b/cpukit/score/cpu/lm32/rtems/score/cpu.h
@@ -314,8 +314,6 @@ extern "C" {
*/
#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned (32)))
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
/**
* @defgroup CPUEndian Processor Dependent Endianness Support
*
diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/cpukit/score/cpu/m32c/rtems/score/cpu.h
index fdee5729ed..6819c821b0 100644
--- a/cpukit/score/cpu/m32c/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32c/rtems/score/cpu.h
@@ -336,8 +336,6 @@ extern "C" {
*/
#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned (2)))
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
-
/**
* @defgroup CPUEndian Processor Dependent Endianness Support
*
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index 7fcbac54a8..47a2d8edf5 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -101,8 +101,6 @@ extern "C" {
#define CPU_STACK_GROWS_UP FALSE
#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned (4)))
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
-
/*
* Define what is required to specify how the network to host conversion
* routines are handled.
diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/rtems/score/cpu.h
index ac589d2a68..bb897e151c 100644
--- a/cpukit/score/cpu/mips/rtems/score/cpu.h
+++ b/cpukit/score/cpu/mips/rtems/score/cpu.h
@@ -307,8 +307,6 @@ extern "C" {
#define CPU_STRUCTURE_ALIGNMENT
#endif
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
/*
* Define what is required to specify how the network to host conversion
* routines are handled.
diff --git a/cpukit/score/cpu/moxie/rtems/score/cpu.h b/cpukit/score/cpu/moxie/rtems/score/cpu.h
index 297316bfeb..8348d48763 100644
--- a/cpukit/score/cpu/moxie/rtems/score/cpu.h
+++ b/cpukit/score/cpu/moxie/rtems/score/cpu.h
@@ -285,10 +285,6 @@ extern "C" {
*/
#define CPU_STRUCTURE_ALIGNMENT
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
-#define CPU_TIMESTAMP_USE_INT64 FALSE
-#define CPU_TIMESTAMP_USE_INT64_INLINE FALSE
-
/*
* Define what is required to specify how the network to host conversion
* routines are handled.
diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/cpukit/score/cpu/nios2/rtems/score/cpu.h
index fdb9d8aaef..4bd1fe73e9 100644
--- a/cpukit/score/cpu/nios2/rtems/score/cpu.h
+++ b/cpukit/score/cpu/nios2/rtems/score/cpu.h
@@ -66,8 +66,6 @@ extern "C" {
#define CPU_STRUCTURE_ALIGNMENT __attribute__((section(".sdata"), aligned(32)))
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
#define CPU_BIG_ENDIAN FALSE
#define CPU_LITTLE_ENDIAN TRUE
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
index 49b2d65385..ab81e649ef 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h
@@ -336,74 +336,6 @@ extern "C" {
#define CPU_STRUCTURE_ALIGNMENT
/**
- * @defgroup CPUTimestamp Processor Dependent Timestamp Support
- *
- * This group assists in issues related to timestamp implementation.
- *
- * The port must choose exactly one of the following defines:
- * - #define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
- * - #define CPU_TIMESTAMP_USE_INT64 TRUE
- * - #define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
- *
- * Performance of int64_t versus struct timespec
- * =============================================
- *
- * On PowerPC/psim, inlined int64_t saves ~50 instructions on each
- * _Thread_Dispatch operation which results in a context switch.
- * This works out to be about 10% faster dispatches and 7.5% faster
- * blocking semaphore obtains. The following numbers are in instructions
- * and from tm02 and tm26.
- *
- * timespec int64 inlined int64
- * dispatch: 446 446 400
- * blocking sem obtain: 627 626 581
- *
- * On SPARC/sis, inlined int64_t shows the same percentage gains.
- * The following numbers are in microseconds and from tm02 and tm26.
- *
- * timespec int64 inlined int64
- * dispatch: 59 61 53
- * blocking sem obtain: 98 100 92
- *
- * Inlining appears to have a tendency to increase the size of
- * some executables.
- * Not inlining reduces the execution improvement but does not seem to
- * be an improvement on the PowerPC and SPARC. The struct timespec
- * and the executables with int64 not inlined are about the same size.
- *
- */
-/**@{**/
-
-/**
- * Selects the timestamp implementation using struct timespec.
- *
- * Port Specific Information:
- *
- * XXX document implementation including references if appropriate
- */
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
-
-/**
- * Selects the timestamp implementation using int64_t and no inlined methods.
- *
- * Port Specific Information:
- *
- * XXX document implementation including references if appropriate
- */
-#define CPU_TIMESTAMP_USE_INT64 TRUE
-
-/**
- * Selects the timestamp implementation using int64_t and inlined methods.
- *
- * Port Specific Information:
- *
- * XXX document implementation including references if appropriate
- */
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
-/** @} */
-
-/**
* @defgroup CPUEndian Processor Dependent Endianness Support
*
* This group assists in issues related to processor endianness.
diff --git a/cpukit/score/cpu/or1k/rtems/score/cpu.h b/cpukit/score/cpu/or1k/rtems/score/cpu.h
index 7d07de34b0..c9b833ca3d 100644
--- a/cpukit/score/cpu/or1k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/or1k/rtems/score/cpu.h
@@ -814,10 +814,6 @@ void _CPU_Context_Initialize(
#endif
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC FALSE
-#define CPU_TIMESTAMP_USE_INT64 TRUE
-#define CPU_TIMESTAMP_USE_INT64_INLINE FALSE
-
typedef struct {
/* There is no CPU specific per-CPU state */
} CPU_Per_CPU_control;
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
index c30b9dc967..5e822e4d7d 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
@@ -124,8 +124,6 @@ extern "C" {
#define CPU_STRUCTURE_ALIGNMENT \
__attribute__ ((aligned (PPC_STRUCTURE_ALIGNMENT)))
-#define CPU_TIMESTAMP_USE_STRUCT_TIMESPEC TRUE
-
/*
* Define what is required to specify how the network to host conversion
* routines are handled.
diff --git a/cpukit/score/cpu/sh/rtems/score/cpu.h b/cpukit/score/cpu/sh/rtems/score/cpu.h
index 6ae0a83771..bf1222029a 100644
--- a/cpukit/score/cpu/sh/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sh/rtems/score/cpu.h
@@ -251,8 +251,6 @@ extern "C" {
#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned(16)))
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
/*
* Define what is required to specify how the network to host conversion
* routines are handled.
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h
index 89c7dcd31b..2ea48533b0 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h
@@ -222,8 +222,6 @@ extern "C" {
*/
#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned (32)))
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
/**
* Define what is required to specify how the network to host conversion
* routines are handled.
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpu.h b/cpukit/score/cpu/sparc64/rtems/score/cpu.h
index ff56c7121a..29e33d5fee 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc64/rtems/score/cpu.h
@@ -186,8 +186,6 @@ extern "C" {
#define CPU_STRUCTURE_ALIGNMENT __attribute__ ((aligned (16)))
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
/*
* Define what is required to specify how the network to host conversion
* routines are handled.
diff --git a/cpukit/score/cpu/v850/rtems/score/cpu.h b/cpukit/score/cpu/v850/rtems/score/cpu.h
index c531d0c131..b2b9fc1e3c 100644
--- a/cpukit/score/cpu/v850/rtems/score/cpu.h
+++ b/cpukit/score/cpu/v850/rtems/score/cpu.h
@@ -315,11 +315,6 @@ extern "C" {
#define CPU_STRUCTURE_ALIGNMENT
/**
- * The v850 should use 64-bit timestamps and inline them.
- */
-#define CPU_TIMESTAMP_USE_INT64_INLINE TRUE
-
-/**
* @defgroup CPUEndian Processor Dependent Endianness Support
*
* This group assists in issues related to processor endianness.
diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
index e5a3906ee6..da7c23ef5d 100644
--- a/testsuites/sptests/sp2038/init.c
+++ b/testsuites/sptests/sp2038/init.c
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2011 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2011, 2016 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
- * Obere Lagerstr. 30
+ * Dornierstr. 4
* 82178 Puchheim
* Germany
* <rtems@embedded-brains.de>
@@ -28,9 +28,6 @@ const char rtems_test_name[] = "SP 2038";
/* forward declarations to avoid warnings */
rtems_task Init(rtems_task_argument argument);
-#define TEST_APPLICABLE \
- (CPU_TIMESTAMP_USE_INT64 == TRUE || CPU_TIMESTAMP_USE_INT64_INLINE == TRUE)
-
#define ASSERT_SC(sc) rtems_test_assert((sc) == RTEMS_SUCCESSFUL)
static const uint32_t sample_seconds [] = {
@@ -235,7 +232,6 @@ static void test_tod_to_seconds(void)
static void test_problem_year(void)
{
-#if TEST_APPLICABLE
rtems_status_code sc = RTEMS_SUCCESSFUL;
time_t zero = 0;
time_t one = 1;
@@ -268,7 +264,6 @@ static void test_problem_year(void)
ASSERT_SC(sc);
rtems_test_assert(memcmp(&now, problem, sizeof(now)) == 0);
}
-#endif /* TEST_APPLICABLE */
}
static void test_leap_year(void)