* ltconfig, ltmain.sh: Upgrade to libtool 1.4a 1.641.2.256.

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

diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index d688770ffb9f7d870050461fd1f9c5c6af0cd5e8..55e1392642d75f2f872067146f14dd713f31dc77 100644 (file)
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -1,5 +1,6 @@
 /* Remote debugging interface for Tandem ST2000 phone switch, for GDB.
-   Copyright 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Contributed by Cygnus Support.  Written by Jim Kingdon for Cygnus.
 
    This file is part of GDB.
@@ -41,6 +42,7 @@
 #include "gdb_string.h"
 #include <sys/types.h>
 #include "serial.h"
+#include "regcache.h"
 
 extern struct target_ops st2000_ops;   /* Forward declaration */
 
@@ -283,7 +285,11 @@ or target st2000 <host> <port>\n");
   if (!st2000_desc)
     perror_with_name (dev_name);
 
-  SERIAL_SETBAUDRATE (st2000_desc, baudrate);
+  if (SERIAL_SETBAUDRATE (st2000_desc, baudrate))
+    {
+      SERIAL_CLOSE (dev_name);
+      perror_with_name (dev_name);
+    }
 
   SERIAL_RAW (st2000_desc);
 
@@ -337,7 +343,7 @@ st2000_detach (int from_tty)
 /* Tell the remote machine to resume.  */
 
 static void
-st2000_resume (int pid, int step, enum target_signal sig)
+st2000_resume (ptid_t ptid, int step, enum target_signal sig)
 {
   if (step)
     {
@@ -356,8 +362,8 @@ st2000_resume (int pid, int step, enum target_signal sig)
 /* Wait until the remote machine stops, then return,
    storing status in STATUS just as `wait' would.  */
 
-static int
-st2000_wait (struct target_waitstatus *status)
+static ptid_t
+st2000_wait (ptid_t ptid, struct target_waitstatus *status)
 {
   int old_timeout = timeout;
 
@@ -373,7 +379,7 @@ st2000_wait (struct target_waitstatus *status)
 
   timeout = old_timeout;
 
-  return 0;
+  return inferior_ptid;
 }
 
 /* Return the name of register number REGNO in the form input and output by
@@ -805,7 +811,6 @@ the speed to connect at in bits per second.";
   st2000_ops.to_thread_alive = 0;      /* thread alive */
   st2000_ops.to_stop = 0;      /* to_stop */
   st2000_ops.to_pid_to_exec_file = NULL;
-  st2000_run_ops.to_core_file_to_sym_file = NULL;
   st2000_ops.to_stratum = process_stratum;
   st2000_ops.DONT_USE = 0;     /* next */
   st2000_ops.to_has_all_memory = 1;