* remote-mips.c (mips_initialize): Updated to talk to VR4300 RISQ

monitor board.

The mips_initialize() code seemed to have a "funny" switch
statement. I also removed an unnecessary switch into debug monitor
mode just before the call to mips_initialize() in mips_load().

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab49887570e425e3266bf0bb2ca494f8a4abbebb..a13778992644638f08d952eda25e61a4dc46d903 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov  7 14:59:51 1995  James G. Smith  <jsmith@pasanda.cygnus.co.uk>
+
+       * remote-mips.c (mips_initialize): Updated to talk to VR4300 RISQ
+       monitor board.
+
 Mon Nov  6 11:44:11 1995  James G. Smith  <jsmith@pasanda.cygnus.co.uk>
 
        * config/mips/{tm-vr4300.h tm-vr4300el.h} (TARGET_MONITOR_PROMPT):

diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 32655996fd1964bfb1d81bcf449865af4261fb72..9fdf82a50d3d33e42887453f7b22f1cbb0d7f485 100644 (file)
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -1076,22 +1076,21 @@ mips_initialize ()
                                   the board. */
              }
            break;
-         case 4:
-           mips_error ("Failed to initialize.");
          }
-
-         if (mips_expect (TARGET_MONITOR_PROMPT))
-           break;
+       case 4:
+          mips_error ("Failed to initialize.");
        }
 
-      SERIAL_WRITE (mips_desc, "db tty0\015", sizeof "db tty0\015" - 1);
-      mips_expect ("db tty0\015\012"); /* Eat the echo */
-
-      SERIAL_WRITE (mips_desc, "\015", sizeof "\015" - 1);
-
-      if (mips_receive_packet (buff, 1, 3) < 0)
-       mips_error ("Failed to initialize (didn't receive packet).");
+      if (mips_expect (TARGET_MONITOR_PROMPT))
+       break;
     }
+  SERIAL_WRITE (mips_desc, "db tty0\015", sizeof "db tty0\015" - 1);
+  mips_expect ("db tty0\015\012"); /* Eat the echo */
+
+  SERIAL_WRITE (mips_desc, "\015", sizeof "\015" - 1);
+  
+  if (mips_receive_packet (buff, 1, 3) < 0)
+   mips_error ("Failed to initialize (didn't receive packet).");
 
   if (common_breakpoint ('b', -1, 0, NULL)) /* Clear all breakpoints */
     monitor_supports_breakpoints = 0; /* Failed, don't use it anymore */
@@ -2083,8 +2082,6 @@ mips_load (file, from_tty)
 
   mips_load_srec (file);
 
-  SERIAL_WRITE (mips_desc, "\015db tty0\015", sizeof "\015db tty0\015" - 1);
-
   mips_initialize ();
 
 /* Finally, make the PC point at the start address */