1 files changed, 5 insertions, 81 deletions

diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 755e308219..6ac77e4e63 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -66,8 +66,7 @@
  *  input and output file descriptors (0 and 1). These descriptors
  *  (and the standard error descriptor 2) must NOT be closed
  *  explicitely by this program at termination (in UNIX it is
- *  taken care of by the operating system itself; in VxWorks
- *  it is taken care of by the spawn driver part of the Emulator).
+ *  taken care of by the operating system itself).
  *
  *  END OF FILE
  *
@@ -75,12 +74,6 @@
  *  that there is no process at the other end of the connection
  *  having the connection open for writing (end-of-file).
  *
- *  HARDWARE WATCHDOG
- *
- *  When used with VxWorks(with CPU40), the hardware
- *  watchdog is enabled, making sure that the system reboots
- *  even if the heart port program malfunctions or the system
- *  is completely overloaded.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -93,9 +86,6 @@
 #include <fcntl.h>
 #include <process.h>
 #endif
-#ifdef VXWORKS
-#include "sys.h"
-#endif
 
 /*
  * Implement time correction using times() call even on Linuxes 
@@ -116,19 +106,7 @@
 #include <time.h>
 #include <errno.h>
 
-#ifdef VXWORKS
-#  include <vxWorks.h>
-#  include <ioLib.h>
-#  include <selectLib.h>
-#  include <netinet/in.h>
-#  include <rebootLib.h>
-#  include <sysLib.h> 
-#  include <taskLib.h>
-#  include <wdLib.h>
-#  include <taskHookLib.h>
-#  include <selectLib.h>
-#endif
-#if !defined(__WIN32__) && !defined(VXWORKS)
+#if !defined(__WIN32__)
 #  include <sys/types.h>
 #  include <netinet/in.h>
 #  include <sys/time.h>
@@ -550,8 +528,7 @@ kill_old_erlang(void){
 	CloseHandle(erlh);
     }
 }
-#elif !defined(VXWORKS)
-/* Unix eh? */
+#else
 static void 
 kill_old_erlang(void){
     pid_t pid;
@@ -570,7 +547,7 @@ kill_old_erlang(void){
 	}
     }
 }
-#endif /* Not on VxWorks */
+#endif
 
 #ifdef __WIN32__
 void win_system(char *command)
@@ -653,7 +630,7 @@ do_terminate(reason)
   case R_ERROR:
   case R_CLOSED:
   default:
-#if defined(__WIN32__) /* Not VxWorks */
+#if defined(__WIN32__)
     {
       if(!cmd[0]) {
 	char *command = get_env(HEART_COMMAND_ENV);
@@ -1026,59 +1003,6 @@ time_t timestamp(time_t *res)
     return r;
 }
 
-#elif defined(VXWORKS)
-
-static WDOG_ID watchdog_id;
-static volatile unsigned elapsed;
-static WIND_TCB *this_task;
-/* A simple variable is enough to lock the time update, as the
-   watchdog is run at interrupt level and never preempted. */
-static volatile int lock_time; 
-
-static void my_delete_hook(WIND_TCB *tcb) 
-{ 
-    if (tcb == this_task) {
-	wdDelete(watchdog_id);
-	watchdog_id = NULL;
-	taskDeleteHookDelete((FUNCPTR) &my_delete_hook);
-    }
-}
-
-static void my_wd_routine(int count)
-{
-    if (watchdog_id != NULL) {
-	++count;
-	if (!lock_time) {
-	    elapsed += count;
-	    count = 0;
-	}
-	wdStart(watchdog_id, sysClkRateGet(), 
-		(FUNCPTR) &my_wd_routine, count);
-    }
-}
-
-void init_timestamp(void)
-{
-    lock_time = 0;
-    elapsed = 0;
-    watchdog_id = wdCreate();
-    this_task = (WIND_TCB *) taskIdSelf();
-    taskDeleteHookAdd((FUNCPTR) &my_delete_hook);
-    wdStart(watchdog_id, sysClkRateGet(), 
-	    (FUNCPTR) &my_wd_routine, 0);
-}
-
-time_t timestamp(time_t *res)
-{
-    time_t r;
-    ++lock_time;
-    r = (time_t) elapsed;
-    --lock_time;
-    if (res != NULL)
-	*res = r;
-    return r;
-}
-   
 #elif defined(HAVE_GETHRTIME) 
 
 void init_timestamp(void)