formatting cleanups

[deliverable/binutils-gdb.git] / gdb / remote-vx.c

diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index bb621a546d574724550e39e8e930bd5c6ed02e09..6824f80d4c07aa233becc28fbad51bc4c994c19a 100644 (file)
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -27,6 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "command.h"
 #include "symtab.h"
 #include "complaints.h"
+#include "gdbcmd.h"
 
 #include <string.h>
 #include <errno.h>
@@ -577,7 +578,8 @@ vx_run_files_info ()
 }
 
 static void
-vx_resume (step, siggnal)
+vx_resume (pid, step, siggnal)
+     int pid;
      int step;
      int siggnal;
 {
@@ -591,7 +593,7 @@ vx_resume (step, siggnal)
   bzero ((char *) &ptrace_in, sizeof (ptrace_in));
   bzero ((char *) &ptrace_out, sizeof (ptrace_out));
 
-  ptrace_in.pid = inferior_pid;
+  ptrace_in.pid = pid;
   ptrace_in.addr = 1;  /* Target side insists on this, or it panics.  */
 
   /* XXX change second param to be a proc number */
@@ -1031,8 +1033,9 @@ vx_open (args, from_tty)
     {
       if (*bootFile) {
        printf_filtered ("\t%s: ", bootFile);
-       if (catch_errors (symbol_stub, bootFile,
-               "Error while reading symbols from boot file:\n"))
+       if (catch_errors
+           (symbol_stub, bootFile,
+            "Error while reading symbols from boot file:\n", RETURN_MASK_ALL))
          puts_filtered ("ok\n");
       } else if (from_tty)
        printf ("VxWorks kernel symbols not loaded.\n");
@@ -1068,7 +1071,8 @@ vx_open (args, from_tty)
       /* Botches, FIXME:
         (1)  Searches the PATH, not the source path.
         (2)  data and bss are assumed to be at the usual offsets from text.  */
-      catch_errors (add_symbol_stub, (char *)pLoadFile, (char *)0);
+      catch_errors (add_symbol_stub, (char *)pLoadFile, (char *)0,
+                   RETURN_MASK_ALL);
 #endif
     }
   printf_filtered ("Done.\n");
@@ -1307,6 +1311,14 @@ struct target_ops vx_run_ops = {
 void
 _initialize_vx ()
 {
-  add_target (&vx_ops);
+  
+ add_show_from_set
+    (add_set_cmd ("vxworks-timeout", class_support, var_uinteger,
+                 (char *) &rpcTimeout.tv_sec,
+                 "Set seconds to wait for rpc calls to return.\n\
+Set the number of seconds to wait for rpc calls to return.", &setlist),
+     &showlist);
+
+   add_target (&vx_ops);
   add_target (&vx_run_ops);
 }