2009-01-16 Jennifer Averett <jennifer.averett@OARcorp.com>

	* Makefile.am, configure.ac: Add new test to test Watchdog display
	helper routines. These reach into the SuperCore.
	* spwatchdog/.cvsignore, spwatchdog/Makefile.am, spwatchdog/delay.c,
	spwatchdog/init.c, spwatchdog/prtime.c, spwatchdog/spwatchdog.scn,
	spwatchdog/system.h, spwatchdog/task1.c: New files.

11 files changed, 409 insertions, 2 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index fa424f90f6..2c63d11d48 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-16	Jennifer Averett <jennifer.averett@OARcorp.com>
+
+	* Makefile.am, configure.ac: Add new test to test Watchdog display
+	helper routines. These reach into the SuperCore.
+	* spwatchdog/.cvsignore, spwatchdog/Makefile.am, spwatchdog/delay.c,
+	spwatchdog/init.c, spwatchdog/prtime.c, spwatchdog/spwatchdog.scn,
+	spwatchdog/system.h, spwatchdog/task1.c: New files.
+
 2009-01-05	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* sp30/task1.c: Cast pointer to id as "void *" rather than task Id.
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 92dbf71f50..4c377936e3 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -8,8 +8,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \
     sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 sp29 \
     sp30 sp31 sp32 sp33 sp34 sp35 sp37 sp38 sp39 sp40 sp41 sp42 sp43 sp44 \
-    sp45 sp46 spsize spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 \
-    spfatal06 spfatal07 spfatal08 spfatal09
+    sp45 sp46 spsize spwatchdog spfatal01 spfatal02 spfatal03 spfatal04 \
+    spfatal05 spfatal06 spfatal07 spfatal08 spfatal09
 
 DIST_SUBDIRS = $(SUBDIRS) spfatal spfatal_support
 EXTRA_DIST = spfatal_support/init.c spfatal_support/system.h
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 64b3d2fefc..6a52531e26 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -71,6 +71,7 @@ sp43/Makefile
 sp44/Makefile
 sp45/Makefile
 sp46/Makefile
+spwatchdog/Makefile
 spsize/Makefile
 spfatal/Makefile
 spfatal01/Makefile
diff --git a/testsuites/sptests/spwatchdog/.cvsignore b/testsuites/sptests/spwatchdog/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/spwatchdog/Makefile.am b/testsuites/sptests/spwatchdog/Makefile.am
new file mode 100644
index 0000000000..ca389bc7c8
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/Makefile.am
@@ -0,0 +1,27 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = spwatchdog.exe
+spwatchdog_exe_SOURCES = init.c task1.c system.h prtime.c delay.c
+
+dist_rtems_tests_DATA = spwatchdog.scn
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+spwatchdog_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(spwatchdog_exe_OBJECTS) $(spwatchdog_exe_LDADD)
+LINK_LIBS = $(spwatchdog_exe_LDLIBS)
+
+spwatchdog.exe$(EXEEXT): $(spwatchdog_exe_OBJECTS) $(spwatchdog_exe_DEPENDENCIES)
+	@rm -f spwatchdog.exe$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spwatchdog/delay.c b/testsuites/sptests/spwatchdog/delay.c
new file mode 100644
index 0000000000..eb1587bb62
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/delay.c
@@ -0,0 +1,31 @@
+/*  Delayed_resume
+ *
+ *  This routine is scheduled to be fired as a timer service routine.
+ *  When fired this subprogram resumes Task_1.
+ *
+ *  Input parameters:  NONE
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  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$
+ */
+
+#include "system.h"
+
+rtems_timer_service_routine Delayed_resume(
+  rtems_id  ignored_id,
+  void     *ignored_address
+)
+{
+  rtems_status_code status;
+
+  status = rtems_task_resume( Task_id[ 1 ] );
+  directive_failed_with_level( status, "rtems_task_resume of self", 1 );
+}
diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c
new file mode 100644
index 0000000000..b24f495bb7
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/init.c
@@ -0,0 +1,75 @@
+/*  Init
+ *
+ *  This routine is the XXX.
+ *
+ *  Input parameters:
+ *    argument - task argument
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 2008.
+ *  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$
+ */
+
+#define CONFIGURE_INIT
+#include "system.h"
+
+/* #define HAVE_MENU */
+
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  rtems_time_of_day  time;
+  rtems_status_code  status;
+
+   puts( "\n*** RTEMS WATCHDOG ***" );
+
+/*  XXXXXX
+  _Watchdog_Report_chain(
+   "_Watchdog_Ticks_chain",
+    & _Watchdog_Ticks_chain
+  );
+  puts( "*** END OF RTEMS WATCHDOG PROGRAM ***" );
+*/
+
+  build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );
+
+  status = rtems_clock_set( &time );
+  directive_failed( status, "rtems_clock_set" );
+
+  Task_name[ 1 ]  = rtems_build_name( 'T', 'A', '1', ' ' );
+  Timer_name[ 1 ] = rtems_build_name( 'T', 'M', '1', ' ' );
+
+  status = rtems_task_create(
+    Task_name[ 1 ],
+    1,
+    RTEMS_MINIMUM_STACK_SIZE * 2,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &Task_id[ 1 ]
+  );
+  directive_failed( status, "rtems_task_create of TA1" );
+
+  status = rtems_task_start( Task_id[ 1 ], Task_1, 0 );
+  directive_failed( status, "rtems_task_start of TA1" );
+
+  puts( "INIT - rtems_timer_create - creating timer 1" );
+  status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] );
+  directive_failed( status, "rtems_timer_create" );
+
+  printf( "INIT - timer 1 has id (0x%x)\n", Timer_id[ 1 ] );
+
+  status = rtems_task_delete( RTEMS_SELF );
+  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+
+
+  rtems_test_exit( 0 );
+}
diff --git a/testsuites/sptests/spwatchdog/prtime.c b/testsuites/sptests/spwatchdog/prtime.c
new file mode 100644
index 0000000000..18ce0b140d
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/prtime.c
@@ -0,0 +1,31 @@
+/*  Print_time
+ *
+ *  This routine prints the name of Task_1 and the current time of day.
+ *
+ *  Input parameters:  NONE
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  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$
+ */
+
+#include "system.h"
+
+void Print_time( void )
+{
+  rtems_time_of_day time;
+  rtems_status_code status;
+
+  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  directive_failed( status, "rtems_clock_get" );
+
+  put_name( Task_name[ 1 ], FALSE );
+  print_time( "- rtems_clock_get - ", &time, "\n" );
+}
diff --git a/testsuites/sptests/spwatchdog/spwatchdog.scn b/testsuites/sptests/spwatchdog/spwatchdog.scn
new file mode 100644
index 0000000000..3127f79896
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/spwatchdog.scn
@@ -0,0 +1,2 @@
+*** TEST WATCHDOG ***
+*** END OF TEST WATCHDOG ***
diff --git a/testsuites/sptests/spwatchdog/system.h b/testsuites/sptests/spwatchdog/system.h
new file mode 100644
index 0000000000..8b0a4794c1
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/system.h
@@ -0,0 +1,58 @@
+/*  system.h
+ *
+ *  This include file contains information that is included in every
+ *  function in the test set.
+ *
+ *  COPYRIGHT (c) 22.
+ *  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$
+ */
+
+#include <tmacros.h>
+
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
+rtems_timer_service_routine Delayed_resume(
+  rtems_id  ignored_id,
+  void     *ignored_address
+);
+
+void Print_time( void );
+
+rtems_task Task_1(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS           2
+#define CONFIGURE_MAXIMUM_TIMERS          2
+#define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_EXTRA_TASK_STACKS       (1 * RTEMS_MINIMUM_STACK_SIZE)
+
+#include <rtems/confdefs.h>
+
+/* global variables */
+
+TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
+TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
+
+TEST_EXTERN rtems_id   Timer_id[ 2 ];    /* array of timer ids */
+TEST_EXTERN rtems_name Timer_name[ 2 ];  /* array of timer names */
+
+/* end of include file */
diff --git a/testsuites/sptests/spwatchdog/task1.c b/testsuites/sptests/spwatchdog/task1.c
new file mode 100644
index 0000000000..a89e79243e
--- /dev/null
+++ b/testsuites/sptests/spwatchdog/task1.c
@@ -0,0 +1,172 @@
+/*  Task_1
+ *
+ *  This routine serves as a test task.  XXX
+ *
+ *  Input parameters:
+ *    argument - task argument
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 2009.
+ *  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$
+ */
+
+#include "system.h"
+
+rtems_task Task_1(
+  rtems_task_argument argument
+)
+{
+  rtems_id          tmid;
+  rtems_time_of_day time;
+  rtems_status_code status;
+
+/* Get id */
+
+  puts( "TA1 - rtems_timer_ident - identing timer 1" );
+  status = rtems_timer_ident( Timer_name[ 1 ], &tmid );
+  directive_failed( status, "rtems_timer_ident" );
+  printf( "TA1 - timer 1 has id (0x%x)\n", tmid );
+
+/* after which is allowed to fire */
+
+  Print_time();
+
+  puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
+  status = rtems_timer_fire_after(
+    tmid,
+    3 * TICKS_PER_SECOND,
+    Delayed_resume,
+    NULL
+  );
+  directive_failed( status, "rtems_timer_fire_after" );
+
+  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
+  status = rtems_task_suspend( RTEMS_SELF );
+  directive_failed( status, "rtems_task_suspend" );
+
+  Print_time();
+
+/* after which is reset and allowed to fire */
+
+  puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
+  status = rtems_timer_fire_after(
+    tmid,
+    3 * TICKS_PER_SECOND,
+    Delayed_resume,
+    NULL
+  );
+  directive_failed( status, "rtems_timer_fire_after" );
+
+  puts( "TA1 - rtems_task_wake_after - 1 second" );
+  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  directive_failed( status, "rtems_task_wake_after" );
+
+  Print_time();
+
+  puts( "TA1 - rtems_timer_reset - timer 1" );
+  status = rtems_timer_reset( tmid );
+  directive_failed( status, "rtems_timer_reset" );
+
+
+
+
+#if 0
+  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
+  status = rtems_task_suspend( RTEMS_SELF );
+  directive_failed( status, "rtems_task_suspend" );
+
+  Print_time();
+
+  rtems_test_pause();
+
+  /*
+   *  Reset the time since we do not know how long the user waited
+   *  before pressing <cr> at the pause.  This insures that the
+   *  actual output matches the screen.
+   */
+
+  build_time( &time, 12, 31, 1988, 9, 0, 7, 0 );
+
+  status = rtems_clock_set( &time );
+  directive_failed( status, "rtems_clock_set" );
+
+/* after which is canceled */
+
+  puts( "TA1 - rtems_timer_fire_after - timer 1 in 3 seconds" );
+  status = rtems_timer_fire_after(
+    tmid,
+    3 * TICKS_PER_SECOND,
+    Delayed_resume,
+    NULL
+  );
+  directive_failed( status, "rtems_timer_fire_after" );
+
+  puts( "TA1 - rtems_timer_cancel - timer 1" );
+  status = rtems_timer_cancel( tmid );
+  directive_failed( status, "rtems_timer_cancel" );
+
+/* when which is allowed to fire */
+
+  Print_time();
+
+  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  directive_failed( status, "rtems_clock_get" );
+
+  time.second += 3;
+
+  puts( "TA1 - rtems_timer_fire_when - timer 1 in 3 seconds" );
+  status = rtems_timer_fire_when( tmid, &time, Delayed_resume, NULL );
+  directive_failed( status, "rtems_timer_fire_when" );
+
+  puts( "TA1 - rtems_task_suspend( RTEMS_SELF )" );
+  status = rtems_task_suspend( RTEMS_SELF );
+  directive_failed( status, "rtems_task_suspend" );
+
+  Print_time();
+
+/* when which is canceled */
+
+  status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
+  directive_failed( status, "rtems_clock_get" );
+
+  time.second += 3;
+
+  puts( "TA1 - rtems_timer_fire_when - timer 1 in 3 seconds" );
+  status = rtems_timer_fire_when( tmid, &time, Delayed_resume, NULL );
+  directive_failed( status, "rtems_timer_fire_when" );
+
+  puts( "TA1 - rtems_task_wake_after - 1 second" );
+  status = rtems_task_wake_after( 1 * TICKS_PER_SECOND );
+  directive_failed( status, "rtems_task_wake_after" );
+
+  Print_time();
+
+  puts( "TA1 - rtems_timer_cancel - timer 1" );
+  status = rtems_timer_cancel( tmid );
+  directive_failed( status, "rtems_timer_cancel" );
+
+/* delete */
+  puts( "TA1 - rtems_task_wake_after - YIELD (only task at priority)" );
+  status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
+  directive_failed( status, "rtems_task_wake_after" );
+#endif
+
+  _Watchdog_Report_chain(
+   "_Watchdog_Ticks_chain",
+    & _Watchdog_Ticks_chain
+  );
+
+  puts( "TA1 - timer_deleting - timer 1" );
+  status = rtems_timer_delete( tmid );
+  directive_failed( status, "rtems_timer_delete" );
+
+  puts( "*** END OF RTEMS WATCHDOG PROGRAM ***" );
+  rtems_test_exit( 0 );
+}