X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fserial.c;h=791f12fcc4697afdc9e23a47ca385eba31521de4;hb=d8e34cd3ac4303e82ff9de51b7909b6ffde5b9c6;hp=7e182cf88016473f80bc8259addf9dde899846ce;hpb=677f415c03a33889e1f133003f2e3dc15368dcb3;p=platform%2Fupstream%2Fbinutils.git

diff --git a/gdb/serial.c b/gdb/serial.c
index 7e182cf..791f12f 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -1,115 +1,135 @@
 /* Generic serial interface routines
-   Copyright 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   Copyright (C) 1992-2014 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This file is part of GDB.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include <ctype.h>
 #include "serial.h"
-#include "gdb_string.h"
 #include "gdbcmd.h"
+#include "cli/cli-utils.h"
 
-/* Linked list of serial I/O handlers */
+extern void _initialize_serial (void);
 
-static struct serial_ops *serial_ops_list = NULL;
+/* Is serial being debugged?  */
 
-/* This is the last serial stream opened.  Used by connect command. */
+static unsigned int global_serial_debug_p;
 
-static serial_t last_serial_opened = NULL;
+typedef const struct serial_ops *serial_ops_p;
+DEF_VEC_P (serial_ops_p);
 
-/* Pointer to list of scb's. */
+/* Serial I/O handlers.  */
 
-static serial_t scb_base;
+VEC (serial_ops_p) *serial_ops_list = NULL;
 
-/* Non-NULL gives filename which contains a recording of the remote session,
-   suitable for playback by gdbserver. */
+/* Pointer to list of scb's.  */
 
-static char *serial_logfile = NULL;
-static GDB_FILE *serial_logfp = NULL;
+static struct serial *scb_base;
 
-static struct serial_ops *serial_interface_lookup PARAMS ((char *));
-static void serial_logchar PARAMS ((int, int, int));
-static char logbase_hex[] = "hex";
-static char logbase_octal[] = "octal";
-static char logbase_ascii[] = "ascii";
-static char *logbase_enums[] = {logbase_hex, logbase_octal, logbase_ascii, NULL};
-static char *serial_logbase = logbase_ascii;
+/* Non-NULL gives filename which contains a recording of the remote session,
+   suitable for playback by gdbserver.  */
 
+static char *serial_logfile = NULL;
+static struct ui_file *serial_logfp = NULL;
+
+static const struct serial_ops *serial_interface_lookup (const char *);
+static void serial_logchar (struct ui_file *stream,
+			    int ch_type, int ch, int timeout);
+static const char logbase_hex[] = "hex";
+static const char logbase_octal[] = "octal";
+static const char logbase_ascii[] = "ascii";
+static const char *const logbase_enums[] =
+{logbase_hex, logbase_octal, logbase_ascii, NULL};
+static const char *serial_logbase = logbase_ascii;
 
+
 static int serial_current_type = 0;
 
-/* Log char CH of type CHTYPE, with TIMEOUT */
+/* Log char CH of type CHTYPE, with TIMEOUT.  */
 
 /* Define bogus char to represent a BREAK.  Should be careful to choose a value
    that can't be confused with a normal char, or an error code.  */
 #define SERIAL_BREAK 1235
 
 static void
-serial_logchar (ch_type, ch, timeout)
-     int ch_type;
-     int ch;
-     int timeout;
+serial_logchar (struct ui_file *stream, int ch_type, int ch, int timeout)
 {
   if (ch_type != serial_current_type)
     {
-      fprintf_unfiltered (serial_logfp, "\n%c ", ch_type);
+      fprintf_unfiltered (stream, "\n%c ", ch_type);
       serial_current_type = ch_type;
     }
 
   if (serial_logbase != logbase_ascii)
-    fputc_unfiltered (' ', serial_logfp);
+    fputc_unfiltered (' ', stream);
 
   switch (ch)
     {
     case SERIAL_TIMEOUT:
-      fprintf_unfiltered (serial_logfp, "<Timeout: %d seconds>", timeout);
+      fprintf_unfiltered (stream, "<Timeout: %d seconds>", timeout);
       return;
     case SERIAL_ERROR:
-      fprintf_unfiltered (serial_logfp, "<Error: %s>", safe_strerror (errno));
+      fprintf_unfiltered (stream, "<Error: %s>", safe_strerror (errno));
       return;
     case SERIAL_EOF:
-      fputs_unfiltered ("<Eof>", serial_logfp);
+      fputs_unfiltered ("<Eof>", stream);
       return;
     case SERIAL_BREAK:
-      fputs_unfiltered ("<Break>", serial_logfp);
+      fputs_unfiltered ("<Break>", stream);
       return;
     default:
       if (serial_logbase == logbase_hex)
-	fprintf_unfiltered (serial_logfp, "%02x", ch & 0xff);
+	fprintf_unfiltered (stream, "%02x", ch & 0xff);
       else if (serial_logbase == logbase_octal)
-	fprintf_unfiltered (serial_logfp, "%03o", ch & 0xff);
+	fprintf_unfiltered (stream, "%03o", ch & 0xff);
       else
 	switch (ch)
 	  {
-	  case '\\':	fputs_unfiltered ("\\\\", serial_logfp); break;	
-	  case '\b':	fputs_unfiltered ("\\b", serial_logfp); break;	
-	  case '\f':	fputs_unfiltered ("\\f", serial_logfp); break;	
-	  case '\n':	fputs_unfiltered ("\\n", serial_logfp); break;	
-	  case '\r':	fputs_unfiltered ("\\r", serial_logfp); break;	
-	  case '\t':	fputs_unfiltered ("\\t", serial_logfp); break;	
-	  case '\v':	fputs_unfiltered ("\\v", serial_logfp); break;	
-	  default:	fprintf_unfiltered (serial_logfp, isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF); break;
+	  case '\\':
+	    fputs_unfiltered ("\\\\", stream);
+	    break;
+	  case '\b':
+	    fputs_unfiltered ("\\b", stream);
+	    break;
+	  case '\f':
+	    fputs_unfiltered ("\\f", stream);
+	    break;
+	  case '\n':
+	    fputs_unfiltered ("\\n", stream);
+	    break;
+	  case '\r':
+	    fputs_unfiltered ("\\r", stream);
+	    break;
+	  case '\t':
+	    fputs_unfiltered ("\\t", stream);
+	    break;
+	  case '\v':
+	    fputs_unfiltered ("\\v", stream);
+	    break;
+	  default:
+	    fprintf_unfiltered (stream,
+				isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF);
+	    break;
 	  }
     }
 }
 
 void
-serial_log_command (cmd)
-     const char *cmd;
+serial_log_command (struct target_ops *self, const char *cmd)
 {
   if (!serial_logfp)
     return;
@@ -120,132 +140,100 @@ serial_log_command (cmd)
   fputs_unfiltered (cmd, serial_logfp);
 
   /* Make sure that the log file is as up-to-date as possible,
-     in case we are getting ready to dump core or something. */
+     in case we are getting ready to dump core or something.  */
   gdb_flush (serial_logfp);
 }
 
-int
-serial_write (scb, str, len)
-     serial_t scb;
-     const char *str;
-     int len;
+
+static const struct serial_ops *
+serial_interface_lookup (const char *name)
 {
-  if (serial_logfp != NULL)
-    {
-      int count;
-
-      for (count = 0; count < len; count++)
-	serial_logchar ('w', str[count] & 0xff, 0);
+  const struct serial_ops *ops;
+  int i;
 
-      /* Make sure that the log file is as up-to-date as possible,
-	 in case we are getting ready to dump core or something. */
-      gdb_flush (serial_logfp);
-    }
+  for (i = 0; VEC_iterate (serial_ops_p, serial_ops_list, i, ops); ++i)
+    if (strcmp (name, ops->name) == 0)
+      return ops;
 
-  return (scb -> ops -> write (scb, str, len));
+  return NULL;
 }
 
-int
-serial_readchar (scb, timeout)
-     serial_t scb;
-     int timeout;
+void
+serial_add_interface (const struct serial_ops *optable)
 {
-  int ch;
-
-  ch = scb -> ops -> readchar (scb, timeout);
-  if (serial_logfp != NULL)
-    {
-      serial_logchar ('r', ch, timeout);
-
-      /* Make sure that the log file is as up-to-date as possible,
-	 in case we are getting ready to dump core or something. */
-      gdb_flush (serial_logfp);
-    }
-
-  return (ch);
+  VEC_safe_push (serial_ops_p, serial_ops_list, optable);
 }
 
-int
-serial_send_break (scb)
-     serial_t scb;
-{
-  if (serial_logfp != NULL)
-    serial_logchar ('w', SERIAL_BREAK, 0);
+/* Return the open serial device for FD, if found, or NULL if FD is
+   not already opened.  */
 
-  return (scb -> ops -> send_break (scb));
-}
-
-static struct serial_ops *
-serial_interface_lookup (name)
-     char *name;
+struct serial *
+serial_for_fd (int fd)
 {
-  struct serial_ops *ops;
+  struct serial *scb;
 
-  for (ops = serial_ops_list; ops; ops = ops->next)
-    if (strcmp (name, ops->name) == 0)
-      return ops;
+  for (scb = scb_base; scb; scb = scb->next)
+    if (scb->fd == fd)
+      return scb;
 
   return NULL;
 }
 
-void
-serial_add_interface(optable)
-     struct serial_ops *optable;
-{
-  optable->next = serial_ops_list;
-  serial_ops_list = optable;
-}
-
-/* Open up a device or a network socket, depending upon the syntax of NAME. */
+/* Open up a device or a network socket, depending upon the syntax of NAME.  */
 
-serial_t
-serial_open (name)
-     const char *name;
+struct serial *
+serial_open (const char *name)
 {
-  serial_t scb;
-  struct serial_ops *ops;
+  struct serial *scb;
+  const struct serial_ops *ops;
+  const char *open_name = name;
 
-  for (scb = scb_base; scb; scb = scb->next)
-    if (scb->name && strcmp (scb->name, name) == 0)
-      {
-	scb->refcnt++;
-	return scb;
-      }
-
-  if (strcmp (name, "ocd") == 0)
-    ops = serial_interface_lookup ("ocd");
-  else if (strcmp (name, "pc") == 0)
+  if (strcmp (name, "pc") == 0)
     ops = serial_interface_lookup ("pc");
-  else if (strchr (name, ':'))
-    ops = serial_interface_lookup ("tcp");
   else if (strncmp (name, "lpt", 3) == 0)
     ops = serial_interface_lookup ("parallel");
+  else if (strncmp (name, "|", 1) == 0)
+    {
+      ops = serial_interface_lookup ("pipe");
+      /* Discard ``|'' and any space before the command itself.  */
+      ++open_name;
+      open_name = skip_spaces_const (open_name);
+    }
+  /* Check for a colon, suggesting an IP address/port pair.
+     Do this *after* checking for all the interesting prefixes.  We
+     don't want to constrain the syntax of what can follow them.  */
+  else if (strchr (name, ':'))
+    ops = serial_interface_lookup ("tcp");
   else
     ops = serial_interface_lookup ("hardwire");
 
   if (!ops)
     return NULL;
 
-  scb = (serial_t)xmalloc (sizeof (struct _serial_t));
+  scb = XNEW (struct serial);
 
   scb->ops = ops;
 
   scb->bufcnt = 0;
   scb->bufp = scb->buf;
+  scb->error_fd = -1;
+  scb->refcnt = 1;
 
-  if (scb->ops->open(scb, name))
+  /* `...->open (...)' would get expanded by the open(2) syscall macro.  */
+  if ((*scb->ops->open) (scb, open_name))
     {
-      free (scb);
+      xfree (scb);
       return NULL;
     }
 
-  scb->name = strsave (name);
+  scb->name = xstrdup (name);
   scb->next = scb_base;
-  scb->refcnt = 1;
+  scb->debug_p = 0;
+  scb->async_state = 0;
+  scb->async_handler = NULL;
+  scb->async_context = NULL;
   scb_base = scb;
 
-  last_serial_opened = scb;
-
   if (serial_logfile != NULL)
     {
       serial_logfp = gdb_fopen (serial_logfile, "w");
@@ -256,78 +244,82 @@ serial_open (name)
   return scb;
 }
 
-serial_t
-serial_fdopen (fd)
-     const int fd;
-{
-  serial_t scb;
-  struct serial_ops *ops;
+/* Open a new serial stream using a file handle, using serial
+   interface ops OPS.  */
 
-  for (scb = scb_base; scb; scb = scb->next)
-    if (scb->fd == fd)
-      {
-	scb->refcnt++;
-	return scb;
-      }
+static struct serial *
+serial_fdopen_ops (const int fd, const struct serial_ops *ops)
+{
+  struct serial *scb;
 
-  ops = serial_interface_lookup ("hardwire");
+  if (!ops)
+    {
+      ops = serial_interface_lookup ("terminal");
+      if (!ops)
+ 	ops = serial_interface_lookup ("hardwire");
+    }
 
   if (!ops)
     return NULL;
 
-  scb = (serial_t)xmalloc (sizeof (struct _serial_t));
+  scb = XCNEW (struct serial);
 
   scb->ops = ops;
 
   scb->bufcnt = 0;
   scb->bufp = scb->buf;
-
-  scb->fd = fd;
+  scb->error_fd = -1;
+  scb->refcnt = 1;
 
   scb->name = NULL;
   scb->next = scb_base;
-  scb->refcnt = 1;
+  scb->debug_p = 0;
+  scb->async_state = 0;
+  scb->async_handler = NULL;
+  scb->async_context = NULL;
   scb_base = scb;
 
-  last_serial_opened = scb;
+  if ((ops->fdopen) != NULL)
+    (*ops->fdopen) (scb, fd);
+  else
+    scb->fd = fd;
 
   return scb;
 }
 
-void
-serial_close (scb, really_close)
-     serial_t scb;
-     int really_close;
+struct serial *
+serial_fdopen (const int fd)
 {
-  serial_t tmp_scb;
+  return serial_fdopen_ops (fd, NULL);
+}
 
-  last_serial_opened = NULL;
+static void
+do_serial_close (struct serial *scb, int really_close)
+{
+  struct serial *tmp_scb;
 
   if (serial_logfp)
     {
       fputs_unfiltered ("\nEnd of log\n", serial_logfp);
       serial_current_type = 0;
 
-      /* XXX - What if serial_logfp == gdb_stdout or gdb_stderr? */
-      gdb_fclose (serial_logfp); 
+      /* XXX - What if serial_logfp == gdb_stdout or gdb_stderr?  */
+      ui_file_delete (serial_logfp);
       serial_logfp = NULL;
     }
 
-/* This is bogus.  It's not our fault if you pass us a bad scb...!  Rob, you
-   should fix your code instead.  */
-
-  if (!scb)
-    return;
-
-  scb->refcnt--;
-  if (scb->refcnt > 0)
-    return;
+  /* ensure that the FD has been taken out of async mode.  */
+  if (scb->async_handler != NULL)
+    serial_async (scb, NULL, NULL);
 
   if (really_close)
     scb->ops->close (scb);
 
   if (scb->name)
-    free (scb->name);
+    xfree (scb->name);
+
+  /* For serial_is_open.  */
+  scb->bufp = NULL;
 
   if (scb_base == scb)
     scb_base = scb_base->next;
@@ -341,186 +333,366 @@ serial_close (scb, really_close)
 	break;
       }
 
-  free(scb);
+  serial_unref (scb);
 }
 
-#if 0
-/*
-The connect command is #if 0 because I hadn't thought of an elegant
-way to wait for I/O on two serial_t's simultaneously.  Two solutions
-came to mind:
-
-	1) Fork, and have have one fork handle the to user direction,
-	   and have the other hand the to target direction.  This
-	   obviously won't cut it for MSDOS.
+void
+serial_close (struct serial *scb)
+{
+  do_serial_close (scb, 1);
+}
 
-	2) Use something like select.  This assumes that stdin and
-	   the target side can both be waited on via the same
-	   mechanism.  This may not be true for DOS, if GDB is
-	   talking to the target via a TCP socket.
--grossman, 8 Jun 93
-*/
+void
+serial_un_fdopen (struct serial *scb)
+{
+  do_serial_close (scb, 0);
+}
 
-/* Connect the user directly to the remote system.  This command acts just like
-   the 'cu' or 'tip' command.  Use <CR>~. or <CR>~^D to break out.  */
+int
+serial_is_open (struct serial *scb)
+{
+  return scb->bufp != NULL;
+}
 
-static serial_t tty_desc;		/* Controlling terminal */
+void
+serial_ref (struct serial *scb)
+{
+  scb->refcnt++;
+}
 
-static void
-cleanup_tty(ttystate)
-     serial_ttystate ttystate;
+void
+serial_unref (struct serial *scb)
 {
-  printf_unfiltered ("\r\n[Exiting connect mode]\r\n");
-  SERIAL_SET_TTY_STATE (tty_desc, ttystate);
-  free (ttystate);
-  SERIAL_CLOSE (tty_desc);
+  --scb->refcnt;
+  if (scb->refcnt == 0)
+    xfree (scb);
 }
 
-static void
-connect_command (args, fromtty)
-     char	*args;
-     int	fromtty;
+int
+serial_readchar (struct serial *scb, int timeout)
 {
-  int c;
-  char cur_esc = 0;
-  serial_ttystate ttystate;
-  serial_t port_desc;		/* TTY port */
+  int ch;
 
-  dont_repeat();
+  /* FIXME: cagney/1999-10-11: Don't enable this check until the ASYNC
+     code is finished.  */
+  if (0 && serial_is_async_p (scb) && timeout < 0)
+    internal_error (__FILE__, __LINE__,
+		    _("serial_readchar: blocking read in async mode"));
 
-  if (args)
-    fprintf_unfiltered(gdb_stderr, "This command takes no args.  They have been ignored.\n");
-	
-  printf_unfiltered("[Entering connect mode.  Use ~. or ~^D to escape]\n");
+  ch = scb->ops->readchar (scb, timeout);
+  if (serial_logfp != NULL)
+    {
+      serial_logchar (serial_logfp, 'r', ch, timeout);
 
-  tty_desc = SERIAL_FDOPEN (0);
-  port_desc = last_serial_opened;
+      /* Make sure that the log file is as up-to-date as possible,
+         in case we are getting ready to dump core or something.  */
+      gdb_flush (serial_logfp);
+    }
+  if (serial_debug_p (scb))
+    {
+      fprintf_unfiltered (gdb_stdlog, "[");
+      serial_logchar (gdb_stdlog, 'r', ch, timeout);
+      fprintf_unfiltered (gdb_stdlog, "]");
+      gdb_flush (gdb_stdlog);
+    }
 
-  ttystate = SERIAL_GET_TTY_STATE (tty_desc);
+  return (ch);
+}
 
-  SERIAL_RAW (tty_desc);
-  SERIAL_RAW (port_desc);
+int
+serial_write (struct serial *scb, const void *buf, size_t count)
+{
+  if (serial_logfp != NULL)
+    {
+      const char *str = buf;
+      size_t c;
 
-  make_cleanup (cleanup_tty, ttystate);
+      for (c = 0; c < count; c++)
+	serial_logchar (serial_logfp, 'w', str[c] & 0xff, 0);
 
-  while (1)
+      /* Make sure that the log file is as up-to-date as possible,
+         in case we are getting ready to dump core or something.  */
+      gdb_flush (serial_logfp);
+    }
+  if (serial_debug_p (scb))
     {
-      int mask;
-
-      mask = SERIAL_WAIT_2 (tty_desc, port_desc, -1);
-
-      if (mask & 2)
-	{			/* tty input */
-	  char cx;
-
-	  while (1)
-	    {
-	      c = SERIAL_READCHAR(tty_desc, 0);
-
-	      if (c == SERIAL_TIMEOUT)
-		  break;
-
-	      if (c < 0)
-		perror_with_name("connect");
-
-	      cx = c;
-	      SERIAL_WRITE(port_desc, &cx, 1);
-
-	      switch (cur_esc)
-		{
-		case 0:
-		  if (c == '\r')
-		    cur_esc = c;
-		  break;
-		case '\r':
-		  if (c == '~')
-		    cur_esc = c;
-		  else
-		    cur_esc = 0;
-		  break;
-		case '~':
-		  if (c == '.' || c == '\004')
-		    return;
-		  else
-		    cur_esc = 0;
-		}
-	    }
+      const char *str = buf;
+      size_t c;
+
+      for (c = 0; c < count; c++)
+	{
+	  fprintf_unfiltered (gdb_stdlog, "[");
+	  serial_logchar (gdb_stdlog, 'w', str[c] & 0xff, 0);
+	  fprintf_unfiltered (gdb_stdlog, "]");
 	}
+      gdb_flush (gdb_stdlog);
+    }
 
-      if (mask & 1)
-	{			/* Port input */
-	  char cx;
+  return (scb->ops->write (scb, buf, count));
+}
 
-	  while (1)
-	    {
-	      c = SERIAL_READCHAR(port_desc, 0);
+void
+serial_printf (struct serial *desc, const char *format,...)
+{
+  va_list args;
+  char *buf;
+  va_start (args, format);
 
-	      if (c == SERIAL_TIMEOUT)
-		  break;
+  buf = xstrvprintf (format, args);
+  serial_write (desc, buf, strlen (buf));
 
-	      if (c < 0)
-		perror_with_name("connect");
+  xfree (buf);
+  va_end (args);
+}
 
-	      cx = c;
+int
+serial_drain_output (struct serial *scb)
+{
+  return scb->ops->drain_output (scb);
+}
 
-	      SERIAL_WRITE(tty_desc, &cx, 1);
-	    }
-	}
+int
+serial_flush_output (struct serial *scb)
+{
+  return scb->ops->flush_output (scb);
+}
+
+int
+serial_flush_input (struct serial *scb)
+{
+  return scb->ops->flush_input (scb);
+}
+
+int
+serial_send_break (struct serial *scb)
+{
+  if (serial_logfp != NULL)
+    serial_logchar (serial_logfp, 'w', SERIAL_BREAK, 0);
+
+  return (scb->ops->send_break (scb));
+}
+
+void
+serial_raw (struct serial *scb)
+{
+  scb->ops->go_raw (scb);
+}
+
+serial_ttystate
+serial_get_tty_state (struct serial *scb)
+{
+  return scb->ops->get_tty_state (scb);
+}
+
+serial_ttystate
+serial_copy_tty_state (struct serial *scb, serial_ttystate ttystate)
+{
+  return scb->ops->copy_tty_state (scb, ttystate);
+}
+
+int
+serial_set_tty_state (struct serial *scb, serial_ttystate ttystate)
+{
+  return scb->ops->set_tty_state (scb, ttystate);
+}
+
+void
+serial_print_tty_state (struct serial *scb,
+			serial_ttystate ttystate,
+			struct ui_file *stream)
+{
+  scb->ops->print_tty_state (scb, ttystate, stream);
+}
+
+int
+serial_noflush_set_tty_state (struct serial *scb,
+			      serial_ttystate new_ttystate,
+			      serial_ttystate old_ttystate)
+{
+  return scb->ops->noflush_set_tty_state (scb, new_ttystate, old_ttystate);
+}
+
+int
+serial_setbaudrate (struct serial *scb, int rate)
+{
+  return scb->ops->setbaudrate (scb, rate);
+}
+
+int
+serial_setstopbits (struct serial *scb, int num)
+{
+  return scb->ops->setstopbits (scb, num);
+}
+
+int
+serial_can_async_p (struct serial *scb)
+{
+  return (scb->ops->async != NULL);
+}
+
+int
+serial_is_async_p (struct serial *scb)
+{
+  return (scb->ops->async != NULL) && (scb->async_handler != NULL);
+}
+
+void
+serial_async (struct serial *scb,
+	      serial_event_ftype *handler,
+	      void *context)
+{
+  int changed = ((scb->async_handler == NULL) != (handler == NULL));
+
+  scb->async_handler = handler;
+  scb->async_context = context;
+  /* Only change mode if there is a need.  */
+  if (changed)
+    scb->ops->async (scb, handler != NULL);
+}
+
+void
+serial_debug (struct serial *scb, int debug_p)
+{
+  scb->debug_p = debug_p;
+}
+
+int
+serial_debug_p (struct serial *scb)
+{
+  return scb->debug_p || global_serial_debug_p;
+}
+
+#ifdef USE_WIN32API
+void
+serial_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
+{
+  if (scb->ops->wait_handle)
+    scb->ops->wait_handle (scb, read, except);
+  else
+    {
+      *read = (HANDLE) _get_osfhandle (scb->fd);
+      *except = NULL;
     }
 }
-#endif /* 0 */
 
-/* VARARGS */
 void
-#ifdef ANSI_PROTOTYPES
-serial_printf (serial_t desc, const char *format, ...)
-#else
-serial_printf (va_alist)
-     va_dcl
+serial_done_wait_handle (struct serial *scb)
+{
+  if (scb->ops->done_wait_handle)
+    scb->ops->done_wait_handle (scb);
+}
 #endif
+
+int
+serial_pipe (struct serial *scbs[2])
 {
-  va_list args;
-  char *buf;
-#ifdef ANSI_PROTOTYPES
-  va_start (args, format);
-#else
-  serial_t desc;
-  char *format;
+  const struct serial_ops *ops;
+  int fildes[2];
 
-  va_start (args);
-  desc = va_arg (args, serial_t);
-  format = va_arg (args, char *);
-#endif
+  ops = serial_interface_lookup ("pipe");
+  if (!ops)
+    {
+      errno = ENOSYS;
+      return -1;
+    }
 
-  vasprintf (&buf, format, args);
-  SERIAL_WRITE (desc, buf, strlen (buf));
+  if (gdb_pipe (fildes) == -1)
+    return -1;
 
-  free (buf);
-  va_end (args);
+  scbs[0] = serial_fdopen_ops (fildes[0], ops);
+  scbs[1] = serial_fdopen_ops (fildes[1], ops);
+  return 0;
+}
+
+/* Serial set/show framework.  */
+
+static struct cmd_list_element *serial_set_cmdlist;
+static struct cmd_list_element *serial_show_cmdlist;
+
+static void
+serial_set_cmd (char *args, int from_tty)
+{
+  printf_unfiltered ("\"set serial\" must be followed "
+		     "by the name of a command.\n");
+  help_list (serial_set_cmdlist, "set serial ", all_commands, gdb_stdout);
+}
+
+static void
+serial_show_cmd (char *args, int from_tty)
+{
+  cmd_show_list (serial_show_cmdlist, from_tty, "");
+}
+
+/* Baud rate specified for talking to serial target systems.  Default
+   is left as -1, so targets can choose their own defaults.  */
+/* FIXME: This means that "show serial baud" and gr_files_info can
+   print -1 or (unsigned int)-1.  This is a Bad User Interface.  */
+
+int baud_rate = -1;
+
+static void
+serial_baud_show_cmd (struct ui_file *file, int from_tty,
+		      struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("Baud rate for remote serial I/O is %s.\n"),
+		    value);
 }
 
 void
-_initialize_serial ()
+_initialize_serial (void)
 {
 #if 0
-  add_com ("connect", class_obscure, connect_command,
-	   "Connect the terminal directly up to the command monitor.\n\
-Use <CR>~. or <CR>~^D to break out.");
+  add_com ("connect", class_obscure, connect_command, _("\
+Connect the terminal directly up to the command monitor.\n\
+Use <CR>~. or <CR>~^D to break out."));
 #endif /* 0 */
 
-  add_show_from_set 
-    (add_set_cmd ("remotelogfile", no_class,
-		  var_filename, (char *) &serial_logfile,
-		  "Set filename for remote session recording.\n\
+  add_prefix_cmd ("serial", class_maintenance, serial_set_cmd, _("\
+Set default serial/parallel port configuration."),
+		  &serial_set_cmdlist, "set serial ",
+		  0/*allow-unknown*/,
+		  &setlist);
+
+  add_prefix_cmd ("serial", class_maintenance, serial_show_cmd, _("\
+Show default serial/parallel port configuration."),
+		  &serial_show_cmdlist, "show serial ",
+		  0/*allow-unknown*/,
+		  &showlist);
+
+  /* If target is open when baud changes, it doesn't take effect until
+     the next open (I think, not sure).  */
+  add_setshow_zinteger_cmd ("baud", no_class, &baud_rate, _("\
+Set baud rate for remote serial I/O."), _("\
+Show baud rate for remote serial I/O."), _("\
+This value is used to set the speed of the serial port when debugging\n\
+using remote targets."),
+			    NULL,
+			    serial_baud_show_cmd,
+			    &serial_set_cmdlist, &serial_show_cmdlist);
+
+  add_setshow_filename_cmd ("remotelogfile", no_class, &serial_logfile, _("\
+Set filename for remote session recording."), _("\
+Show filename for remote session recording."), _("\
 This file is used to record the remote session for future playback\n\
-by gdbserver.", 
-		  &setlist),
-     &showlist);
-
-  add_show_from_set 
-    (add_set_enum_cmd ("remotelogbase", no_class,
-		       logbase_enums, (char *) &serial_logbase,
-		       "Set numerical base for remote session logging",
-		       &setlist),
-     &showlist);
+by gdbserver."),
+			    NULL,
+			    NULL, /* FIXME: i18n: */
+			    &setlist, &showlist);
+
+  add_setshow_enum_cmd ("remotelogbase", no_class, logbase_enums,
+			&serial_logbase, _("\
+Set numerical base for remote session logging"), _("\
+Show numerical base for remote session logging"), NULL,
+			NULL,
+			NULL, /* FIXME: i18n: */
+			&setlist, &showlist);
+
+  add_setshow_zuinteger_cmd ("serial", class_maintenance,
+			     &global_serial_debug_p, _("\
+Set serial debugging."), _("\
+Show serial debugging."), _("\
+When non-zero, serial port debugging is enabled."),
+			     NULL,
+			     NULL, /* FIXME: i18n: */
+			     &setdebuglist, &showdebuglist);
 }