chiark / gitweb /
realtime: allow suppression of use of the PICs watchdog feature
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sat, 8 Jan 2011 23:45:28 +0000 (23:45 +0000)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sat, 8 Jan 2011 23:45:28 +0000 (23:45 +0000)
hostside/realtime.c
hostside/realtime.h
hostside/startup.c

index 2a469eaa9b24a6d85f463d22522e4e6c22c1611f..4761d981a275f8596112299f049f6af5fe08d868 100644 (file)
@@ -10,6 +10,7 @@ const char *progname= "realtime";
 
 CommandInput cmdi;
 int picio_send_noise= 1;
+int disable_watchdog;
 
 static const char *device= "/dev/railway";
 static const char *logcopy_fn;
@@ -472,6 +473,7 @@ int main(int argc, const char **argv) {
       case 'm': sta_state= Sta_Manual;                   break;
       case 'V': simlog_full=1;                           break;
       case 'B': nononblock_stdin=1;                      break;
+      case 'W': disable_watchdog=1;                      break;
       case 'L': logcopy_fn= arg;                  arg=0; break;
       case 'S': simulate= arg;                    arg=0; break;
       case 'D':        debug_arg_spec(arg);              arg=0; break;
index 2affa20285c0833f88617c20149851853698b7be..83e53627d028592f3a3e7146d18e6b3c888fc75e 100644 (file)
@@ -108,6 +108,7 @@ extern AdjunctsAddr **adjaddrs;
 
 extern CommandInput cmdi;
 extern int picio_send_noise;
+extern int disable_watchdog;
 
 #define CIXF_U                 0x0000ffffu
 #define CIXF_FORCE             0x00010000u
index cab2995b9d20cc51a7969a547544c624ca6287e5..460c789d0208a18e5586b9883078ae03b366c70f 100644 (file)
@@ -152,7 +152,7 @@ static void sta_goto(StartupState new_state) {
   }
   if (piob.l) serial_transmit(&piob);
 
-  if (new_state >= Sta_Run) watchdog_start();
+  if (new_state >= Sta_Run && !disable_watchdog) watchdog_start();
   else watchdog_stop();
      
   toev_start(&sta_toev);