gdb/

[deliverable/binutils-gdb.git] / gdb / serial.c

diff --git a/gdb/serial.c b/gdb/serial.c
index fec836b4c31bf438b0246ef959b107eb971f26f0..7c8fbc2c76d92924b771dc3a3281e58147c51f71 100644 (file)
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -1,7 +1,7 @@
 /* Generic serial interface routines
 
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -27,30 +27,31 @@
 
 extern void _initialize_serial (void);
 
-/* Is serial being debugged? */
+/* Is serial being debugged?  */
 
 static int global_serial_debug_p;
 
-/* Linked list of serial I/O handlers */
+/* Linked list of serial I/O handlers.  */
 
 static struct serial_ops *serial_ops_list = NULL;
 
-/* This is the last serial stream opened.  Used by connect command. */
+/* This is the last serial stream opened.  Used by connect command.  */
 
 static struct serial *last_serial_opened = NULL;
 
-/* Pointer to list of scb's. */
+/* Pointer to list of scb's.  */
 
 static struct serial *scb_base;
 
 /* Non-NULL gives filename which contains a recording of the remote session,
-   suitable for playback by gdbserver. */
+   suitable for playback by gdbserver.  */
 
 static char *serial_logfile = NULL;
 static struct ui_file *serial_logfp = NULL;
 
 static struct serial_ops *serial_interface_lookup (const char *);
-static void serial_logchar (struct ui_file *stream, int ch_type, int ch, int timeout);
+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";
@@ -61,7 +62,7 @@ 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.  */
@@ -123,7 +124,8 @@ serial_logchar (struct ui_file *stream, int ch_type, int ch, int timeout)
            fputs_unfiltered ("\\v", stream);
            break;
          default:
-           fprintf_unfiltered (stream, isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF);
+           fprintf_unfiltered (stream,
+                               isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF);
            break;
          }
     }
@@ -141,7 +143,7 @@ serial_log_command (const char *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);
 }
 
@@ -165,7 +167,7 @@ serial_add_interface (struct serial_ops *optable)
   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.  */
 
 struct serial *
 serial_open (const char *name)
@@ -212,7 +214,7 @@ serial_open (const char *name)
   scb->bufp = scb->buf;
   scb->error_fd = -1;
 
-  /* `...->open (...)' would get expanded by an the open(2) syscall macro.  */
+  /* `...->open (...)' would get expanded by the open(2) syscall macro.  */
   if ((*scb->ops->open) (scb, open_name))
     {
       xfree (scb);
@@ -325,7 +327,7 @@ do_serial_close (struct serial *scb, int really_close)
       fputs_unfiltered ("\nEnd of log\n", serial_logfp);
       serial_current_type = 0;
 
-      /* XXX - What if serial_logfp == gdb_stdout or gdb_stderr? */
+      /* XXX - What if serial_logfp == gdb_stdout or gdb_stderr?  */
       ui_file_delete (serial_logfp);
       serial_logfp = NULL;
     }
@@ -340,7 +342,7 @@ do_serial_close (struct serial *scb, int really_close)
   if (scb->refcnt > 0)
     return;
 
-  /* ensure that the FD has been taken out of async mode */
+  /* ensure that the FD has been taken out of async mode.  */
   if (scb->async_handler != NULL)
     serial_async (scb, NULL, NULL);
 
@@ -383,7 +385,7 @@ serial_readchar (struct serial *scb, int timeout)
   int ch;
 
   /* FIXME: cagney/1999-10-11: Don't enable this check until the ASYNC
-     code is finished. */
+     code is finished.  */
   if (0 && serial_is_async_p (scb) && timeout < 0)
     internal_error (__FILE__, __LINE__,
                    _("serial_readchar: blocking read in async mode"));
@@ -394,7 +396,7 @@ serial_readchar (struct serial *scb, int timeout)
       serial_logchar (serial_logfp, '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. */
+         in case we are getting ready to dump core or something.  */
       gdb_flush (serial_logfp);
     }
   if (serial_debug_p (scb))
@@ -419,7 +421,7 @@ serial_write (struct serial *scb, const char *str, int len)
        serial_logchar (serial_logfp, 'w', str[count] & 0xff, 0);
 
       /* 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);
     }
   if (serial_debug_p (scb))
@@ -491,6 +493,12 @@ 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)
 {
@@ -555,7 +563,7 @@ int
 deprecated_serial_fd (struct serial *scb)
 {
   /* FIXME: should this output a warning that deprecated code is being
-     called? */
+     called?  */
   if (scb->fd < 0)
     {
       internal_error (__FILE__, __LINE__,
@@ -658,7 +666,9 @@ connect_command (char *args, int fromtty)
   dont_repeat ();
 
   if (args)
-    fprintf_unfiltered (gdb_stderr, "This command takes no args.  They have been ignored.\n");
+    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");
 
@@ -747,7 +757,8 @@ 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");
+  printf_unfiltered ("\"set serial\" must be followed "
+                    "by the name of a command.\n");
   help_list (serial_set_cmdlist, "set serial ", -1, gdb_stdout);
 }