Remove sanitized-out Magic Cap support, will never be released

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

diff --git a/gdb/serial.c b/gdb/serial.c
index c30fda69836965945f1e2af9d0075dffd29e682b..4bbc22dc43ab25889eb10dc2bd63cc9ca74766a0 100644 (file)
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -1,5 +1,5 @@
 /* Generic serial interface routines
-   Copyright 1992, 1993, 1996 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -42,7 +42,7 @@ static char *serial_logfile = NULL;
 static FILE *serial_logfp = NULL;
 
 static struct serial_ops *serial_interface_lookup PARAMS ((char *));
-static void serial_logchar PARAMS ((int ch, int timeout));
+static void serial_logchar PARAMS ((int chtype, int ch, int timeout));
 static char logbase_hex[] = "hex";
 static char logbase_octal[] = "octal";
 static char logbase_ascii[] = "ascii";
@@ -50,37 +50,26 @@ static char *logbase_enums[] = {logbase_hex, logbase_octal, logbase_ascii, NULL}
 static char *serial_logbase = logbase_ascii;
 
 \f
-static int serial_reading = 0;
-static int serial_writing = 0;
+static int serial_current_type = 0;
 
-void
-serial_log_command (cmd)
-     const char *cmd;
-{
-  if (!serial_logfp)
-    return;
-
-  if (serial_reading || serial_writing)
-    {
-      fputc_unfiltered ('\n', serial_logfp);
-      serial_reading = 0;
-      serial_writing = 0;
-    }
-  fprintf_unfiltered (serial_logfp, "c %s\n", cmd);
-  /* Make sure that the log file is as up-to-date as possible,
-     in case we are getting ready to dump core or something. */
-  fflush (serial_logfp);
-}
+/* 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, timeout)
+serial_logchar (chtype, ch, timeout)
+     int chtype;
      int ch;
      int timeout;
 {
+  if (chtype != serial_current_type)
+    {
+      fprintf_unfiltered (serial_logfp, "\n%c ", chtype);
+      serial_current_type = chtype;
+    }
+
   if (serial_logbase != logbase_ascii)
     fputc_unfiltered (' ', serial_logfp);
 
@@ -115,7 +104,24 @@ serial_logchar (ch, timeout)
          case '\v':    fputs_unfiltered ("\\v", serial_logfp); break;  
          default:      fprintf_unfiltered (serial_logfp, isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF); break;
          }
-       }
+    }
+}
+
+void
+serial_log_command (cmd)
+     const char *cmd;
+{
+  if (!serial_logfp)
+    return;
+
+  serial_current_type = 'c';
+
+  fputs_unfiltered ("\nc ", serial_logfp);
+  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. */
+  gdb_flush (serial_logfp);
 }
 
 int
@@ -124,28 +130,18 @@ serial_write (scb, str, len)
      const char *str;
      int len;
 {
-  int count;
-
   if (serial_logfp != NULL)
     {
-      if (serial_reading)
-       {
-         fputc_unfiltered ('\n', serial_logfp);
-         serial_reading = 0;
-       }
-      if (!serial_writing)
-       {
-         fputs_unfiltered ("w ", serial_logfp);
-         serial_writing = 1;
-       }
+      int count;
+
       for (count = 0; count < len; count++)
-       {
-         serial_logchar (str[count] & 0xff, 0);
-       }
+       serial_logchar ('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. */
-      fflush (serial_logfp);
+      gdb_flush (serial_logfp);
     }
+
   return (scb -> ops -> write (scb, str, len));
 }
 
@@ -159,21 +155,13 @@ serial_readchar (scb, timeout)
   ch = scb -> ops -> readchar (scb, timeout);
   if (serial_logfp != NULL)
     {
-      if (serial_writing)
-       {
-         fputc_unfiltered ('\n', serial_logfp);
-         serial_writing = 0;
-       }
-      if (!serial_reading)
-       {
-         fputs_unfiltered ("r ", serial_logfp);
-         serial_reading = 1;
-       }
-      serial_logchar (ch, timeout);
+      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. */
-      fflush (serial_logfp);
+      gdb_flush (serial_logfp);
     }
+
   return (ch);
 }
 
@@ -182,22 +170,8 @@ serial_send_break (scb)
      serial_t scb;
 {
   if (serial_logfp != NULL)
-    {
-      if (serial_reading)
-       {
-         fputc_unfiltered ('\n', serial_logfp);
-         serial_reading = 0;
-       }
-      if (!serial_writing)
-       {
-         fputs_unfiltered ("w ", serial_logfp);
-         serial_writing = 1;
-       }
-      serial_logchar (SERIAL_BREAK, 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. */
-      fflush (serial_logfp);
-    }
+    serial_logchar ('w', SERIAL_BREAK, 0);
+
   return (scb -> ops -> send_break (scb));
 }
 
@@ -238,7 +212,9 @@ serial_open (name)
        return scb;
       }
 
-  if (strcmp (name, "pc") == 0)
+  if (strcmp (name, "ocd") == 0)
+    ops = serial_interface_lookup ("ocd");
+  else if (strcmp (name, "pc") == 0)
     ops = serial_interface_lookup ("pc");
   else if (strchr (name, ':'))
     ops = serial_interface_lookup ("tcp");
@@ -272,11 +248,9 @@ serial_open (name)
 
   if (serial_logfile != NULL)
     {
-      serial_logfp = fopen (serial_logfile, "w");
+      serial_logfp = gdb_fopen (serial_logfile, "w");
       if (serial_logfp == NULL)
-       {
-         perror_with_name (serial_logfile);
-       }
+       perror_with_name (serial_logfile);
     }
 
   return scb;
@@ -321,7 +295,7 @@ serial_fdopen (fd)
 }
 
 void
-serial_close(scb, really_close)
+serial_close (scb, really_close)
      serial_t scb;
      int really_close;
 {
@@ -331,13 +305,10 @@ serial_close(scb, really_close)
 
   if (serial_logfp)
     {
-      if (serial_reading || serial_writing)
-       {
-         fputc_unfiltered ('\n', serial_logfp);
-         serial_reading = 0;
-         serial_writing = 0;
-       }
-      fclose (serial_logfp);
+      fputs_unfiltered ("\nEnd of log\n", serial_logfp);
+      serial_current_type = 0;
+
+      fclose (serial_logfp);   /* XXX - What if serial_logfp == stdout or stderr? */
       serial_logfp = NULL;
     }
 
@@ -530,8 +501,6 @@ serial_printf (va_alist)
 void
 _initialize_serial ()
 {
-  struct cmd_list_element *cmd;
-
 #if 0
   add_com ("connect", class_obscure, connect_command,
           "Connect the terminal directly up to the command monitor.\n\