The set debug changes

[deliverable/binutils-gdb.git] / gdb / monitor.c

diff --git a/gdb/monitor.c b/gdb/monitor.c
index c9c6d5a47cc94b8d404ac05e1ddd4025b392a6a3..caf61508469f44f0a69e7d9c8fae283f591b30e2 100644 (file)
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -1,6 +1,5 @@
 /* Remote debugging interface for boot monitors, for GDB.
-   Copyright 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1999
-   Free Software Foundation, Inc.
+   Copyright 1990-1993, 1995-1997, 1999-2000 Free Software Foundation, Inc.
    Contributed by Cygnus Support.  Written by Rob Savoye for Cygnus.
    Resurrected from the ashes by Stu Grossman.
 
@@ -41,7 +40,7 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "wait.h"
+#include "gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_string.h"
@@ -912,6 +911,7 @@ monitor_supply_register (regno, valstr)
   unsigned char regbuf[MAX_REGISTER_RAW_SIZE];
   char *p;
 
+  val = 0;
   p = valstr;
   while (p && *p != '\0')
     {
@@ -2269,7 +2269,7 @@ monitor_stop ()
 
 static void
 monitor_rcmd (char *command,
-             struct gdb_file *outbuf)
+             struct ui_file *outbuf)
 {
   char *p;
   int resp_len;
@@ -2410,15 +2410,11 @@ When enabled, a hashmark \'#\' is displayed.",
                                  &setlist),
                     &showlist);
 
-#if 0
-  /* FIXME: cagney/1999-10-07: Wait until there is a generic ``set
-     debug ...'' rather than another ``set ...debug'' command. */
   add_show_from_set
-    (add_set_cmd ("monitordebug", no_class, var_zinteger,
+    (add_set_cmd ("monitor", no_class, var_zinteger,
                  (char *) &monitor_debug_p,
                  "Set debugging of remote monitor communication.\n\
 When enabled, communication between GDB and the remote monitor\n\
-is displayed.", &setlist),
-     &showlist);
-#endif
+is displayed.", &setdebuglist),
+     &showdebuglist);
 }