[rtems commit] sptests/sp68: Avoid use of internal variables

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Apr 16 20:29:29 2015 +0200

sptests/sp68: Avoid use of internal variables

---

 testsuites/sptests/sp68/init.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/testsuites/sptests/sp68/init.c b/testsuites/sptests/sp68/init.c
index c378cfb..5642203 100644
--- a/testsuites/sptests/sp68/init.c
+++ b/testsuites/sptests/sp68/init.c
@@ -7,12 +7,13 @@
  */
 
 /*
- * Copyright (c) 2009
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems at embedded-brains.de>
+ * Copyright (c) 2009-2015 embedded brains GmbH.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems at embedded-brains.de>
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
@@ -25,8 +26,6 @@
 
 #include <tmacros.h>
 
-#include <rtems/rtems/timerimpl.h>
-
 const char rtems_test_name[] = "SP 68";
 
 /* forward declarations to avoid warnings */
@@ -69,6 +68,8 @@ static void *region_item;
 
 static rtems_interval start;
 
+static rtems_id timer_server_id;
+
 static volatile enum resource_type {
   SEMAPHORE = 0,
   MUTEX,
@@ -79,7 +80,7 @@ static volatile enum resource_type {
   TASK_WAKE_AFTER
 } resource_type;
 
-static const char *resource_type_desc [] = {
+static const char *const resource_type_desc [] = {
   "SEMAPHORE",
   "MUTEX",
   "MESSAGE QUEUE",
@@ -130,6 +131,7 @@ static void obtain_callback(rtems_id timer_id, void *arg)
         region, 1, RTEMS_WAIT, RTEMS_NO_TIMEOUT, &new_region_item);
       break;
     case EVENT:
+      timer_server_id = rtems_task_self();
       sc = rtems_event_receive(
         RTEMS_EVENT_0, RTEMS_EVENT_ALL | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
       break;
@@ -176,7 +178,7 @@ static void release_callback(rtems_id timer_id, void *arg)
       sc = rtems_message_queue_send(message_queue, buf, size);
       break;
     case EVENT:
-      sc = rtems_event_send(_Timer_server->thread->Object.id, RTEMS_EVENT_0);
+      sc = rtems_event_send(timer_server_id, RTEMS_EVENT_0);
       break;
     case BARRIER:
       sc = rtems_barrier_release(barrier, &released);