X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fremote-es.c;h=7aa4e9c9c80b21d9c440d839fcea9dfeb0987894;hb=cb74cc240dfca14768005cd4ba34dc06283c2a7c;hp=d8f3da1faf42155b598d61c77689e71b02706d07;hpb=3a479851ff70446bd7ef968ee5ffabc0aa61a73e;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/remote-es.c b/gdb/remote-es.c
index d8f3da1faf..7aa4e9c9c8 100644
--- a/gdb/remote-es.c
+++ b/gdb/remote-es.c
@@ -20,8 +20,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GDB; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 /* Emulator communication protocol.
@@ -96,10 +96,10 @@ STP
 #include <sys/file.h>
 #include <errno.h>
 #include <ctype.h>
-#include <string.h>
 #include <setjmp.h>
 #include <fcntl.h>
 #include "defs.h"
+#include "gdb_string.h"
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
@@ -371,10 +371,13 @@ es1800_open (name, from_tty)
       perror_with_name ("fcntl serial");
     }
 
-  if (SERIAL_SETBAUDRATE (es1800_desc, baud_rate))
+  if (baud_rate != -1)
     {
-      SERIAL_CLOSE (es1800_desc);
-      perror_with_name (name);
+      if (SERIAL_SETBAUDRATE (es1800_desc, baud_rate))
+	{
+	  SERIAL_CLOSE (es1800_desc);
+	  perror_with_name (name);
+	}
     }
 
   SERIAL_RAW (es1800_desc);
@@ -2039,7 +2042,7 @@ es1800_child_detach (args, from_tty)
 
 /* Define the target subroutine names  */
 
-static struct target_ops es1800_ops =
+struct target_ops es1800_ops =
 {
   "es1800",			/* to_shortname */
 				/* to_longname */
@@ -2071,7 +2074,9 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",
   es1800_create_inferior,	/* to_create_inferior */
   NULL,				/* to_mourn_inferior */
   0,				/* to_can_run */
-  0,				/* notice_signals */
+  0,				/* to_notice_signals */
+  0,				/* to_thread_alive */
+  0,				/* to_stop */
   core_stratum,			/* to_stratum */
   0,				/* to_next */
   0,				/* to_has_all_memory */
@@ -2086,7 +2091,7 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",
 
 /* Define the target subroutine names  */
 
-static struct target_ops es1800_child_ops =
+struct target_ops es1800_child_ops =
 {
   "es1800_process",		/* to_shortname */
   				/* to_longname */
@@ -2119,6 +2124,8 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",
   es1800_mourn_inferior,	/* to_mourn_inferior */
   0,				/* to_can_run */
   0,				/* notice_signals */
+  0,				/* to_thread_alive */
+  0,				/* to_stop */
   process_stratum,		/* to_stratum */
   0,				/* to_next */
   1,				/* to_has_all_memory */