[rtems commit] 2012-02-22 Ralf Cors épius <ralf.corsepius at rtems.org>

[Ralf Corsepius]

Module:    rtems
Branch:    master
Commit:    99aebcbc86b557621bdb2991c63a742a2f35c184
Changeset: http://git.rtems.org/rtems/commit/?id=99aebcbc86b557621bdb2991c63a742a2f35c184

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed Feb 22 09:14:37 2012 +0100

2012-02-22 Ralf Corsépius <ralf.corsepius at rtems.org>

	* nsecs/system.h: New (Split out from nsecs/init.c).
	* nsecs/init.c: Reflect nsecs/system.h having been split out.
	* nsecs/empty.c: Include "system.h".

---

 testsuites/samples/nsecs/empty.c  |    2 ++
 testsuites/samples/nsecs/init.c   |   20 ++++----------------
 testsuites/samples/nsecs/system.h |   16 ++++++++++++++++
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/testsuites/samples/nsecs/empty.c b/testsuites/samples/nsecs/empty.c
index 1713c45..0b7772e 100644
--- a/testsuites/samples/nsecs/empty.c
+++ b/testsuites/samples/nsecs/empty.c
@@ -12,6 +12,8 @@
 #include "config.h"
 #endif
 
+#include "system.h"
+
 /* put here hoping it won't get inlined */
 void dummy_function_empty_body_to_force_call(void) {}
 
diff --git a/testsuites/samples/nsecs/init.c b/testsuites/samples/nsecs/init.c
index 9199dd0..3431b76 100644
--- a/testsuites/samples/nsecs/init.c
+++ b/testsuites/samples/nsecs/init.c
@@ -12,8 +12,6 @@
  *  $Id$
  */
 
-#define CONFIGURE_INIT
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,6 +23,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/time.h>
+
+#define CONFIGURE_INIT
+#include "system.h"
+
 #include <rtems/score/timespec.h> /* _Timespec_Substract */
 
 #include "tmacros.h"
@@ -49,8 +51,6 @@ static void subtract_em(
   _Timespec_Subtract( start, stop, t );
 }
 
-/* body below .. hoping it isn't inlined */
-extern void dummy_function_empty_body_to_force_call(void);
 
 rtems_task Init(
   rtems_task_argument argument
@@ -143,15 +143,3 @@ rtems_task Init(
   exit(0);
 }
 
-
-#include <bsp.h> /* for device driver prototypes */
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MICROSECONDS_PER_TICK 1000
-#define CONFIGURE_MAXIMUM_TASKS            1
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <rtems/confdefs.h>
-
diff --git a/testsuites/samples/nsecs/system.h b/testsuites/samples/nsecs/system.h
new file mode 100644
index 0000000..a9d2ac6
--- /dev/null
+++ b/testsuites/samples/nsecs/system.h
@@ -0,0 +1,16 @@
+#ifndef SYSTEM_H
+#define SYSTEM_H
+
+#include <bsp.h> /* for device driver prototypes */
+
+extern void dummy_function_empty_body_to_force_call(void);
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MICROSECONDS_PER_TICK 1000
+#define CONFIGURE_MAXIMUM_TASKS            1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#include <rtems/confdefs.h>
+#endif