s/typedef serial_t/struct serial */

[deliverable/binutils-gdb.git] / gdb / sparcl-tdep.c

diff --git a/gdb/sparcl-tdep.c b/gdb/sparcl-tdep.c
index 6df7e70a33da195ab8abd65949fb63c4c0567709..9c2cb6bf751af792ea57be73c508754e347fa5a9 100644 (file)
--- a/gdb/sparcl-tdep.c
+++ b/gdb/sparcl-tdep.c
@@ -1,5 +1,6 @@
 /* Target dependent code for the Fujitsu SPARClite for GDB, the GNU debugger.
-   Copyright 1994, 1995, 1996, 1999  Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1996, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,6 +24,7 @@
 #include "breakpoint.h"
 #include "target.h"
 #include "serial.h"
+#include "regcache.h"
 #include <sys/types.h>
 
 #if (!defined(__GO32__) && !defined(_WIN32)) || defined(__CYGWIN32__)
@@ -36,14 +38,14 @@
 static struct target_ops sparclite_ops;
 
 static char *remote_target_name = NULL;
-static serial_t remote_desc = NULL;
+static struct serial *remote_desc = NULL;
 static int serial_flag;
 #ifdef HAVE_SOCKETS
 static int udp_fd = -1;
 #endif
 
-static serial_t open_tty (char *name);
-static int send_resp (serial_t desc, char c);
+static struct serial *open_tty (char *name);
+static int send_resp (struct serial *desc, char c);
 static void close_tty (void * ignore);
 #ifdef HAVE_SOCKETS
 static int recv_udp_buf (int fd, unsigned char *buf, int len, int timeout);
@@ -257,10 +259,10 @@ sparclite_stopped_data_address (void)
     return 0;
 }
 \f
-static serial_t
+static struct serial *
 open_tty (char *name)
 {
-  serial_t desc;
+  struct serial *desc;
 
   desc = SERIAL_OPEN (name);
   if (!desc)
@@ -285,7 +287,7 @@ open_tty (char *name)
 /* Read a single character from the remote end, masking it down to 7 bits. */
 
 static int
-readchar (serial_t desc, int timeout)
+readchar (struct serial *desc, int timeout)
 {
   int ch;
   char s[10];
@@ -311,7 +313,7 @@ readchar (serial_t desc, int timeout)
 }
 
 static void
-debug_serial_write (serial_t desc, char *buf, int len)
+debug_serial_write (struct serial *desc, char *buf, int len)
 {
   char s[10];
 
@@ -329,7 +331,7 @@ debug_serial_write (serial_t desc, char *buf, int len)
 
 
 static int
-send_resp (serial_t desc, char c)
+send_resp (struct serial *desc, char c)
 {
   debug_serial_write (desc, &c, 1);
   return readchar (desc, remote_timeout);
@@ -413,7 +415,7 @@ sparclite_open (char *name, int from_tty)
   if (remote_target_name)
     xfree (remote_target_name);
 
-  remote_target_name = strsave (name);
+  remote_target_name = xstrdup (name);
 
   /* We need a 'serial' or 'udp' keyword to disambiguate host:port, which can
      mean either a serial port on a terminal server, or the IP address of a
@@ -836,7 +838,7 @@ sparclite_download (char *filename, int from_tty)
     download (remote_target_name, filename, from_tty, sparclite_udp_write,
              sparclite_udp_start);
 #else
-    abort ();                  /* sparclite_open should prevent this! */
+    internal_error (__FILE__, __LINE__, "failed internal consistency check");                  /* sparclite_open should prevent this! */
 #endif
   else
     download (remote_target_name, filename, from_tty, sparclite_serial_write,