use remote-utils facilities for baud_rate

[deliverable/binutils-gdb.git] / gdb / ser-unix.c

diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index b147c73606f52303afcb41fd79ce1cb915f48b9f..c39663f76803b7bafea3aca6440b22a3ee763598 100644 (file)
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -82,7 +82,7 @@ static int hardwire_readchar PARAMS ((serial_t scb, int timeout));
 static int rate_to_code PARAMS ((int rate));
 static int hardwire_setbaudrate PARAMS ((serial_t scb, int rate));
 static int hardwire_write PARAMS ((serial_t scb, const char *str, int len));
-static void hardwire_restore PARAMS ((serial_t scb));
+/* FIXME: static void hardwire_restore PARAMS ((serial_t scb)); */
 static void hardwire_close PARAMS ((serial_t scb));
 static int get_tty_state PARAMS ((serial_t scb, struct hardwire_ttystate *state));
 static int set_tty_state PARAMS ((serial_t scb, struct hardwire_ttystate *state));
@@ -109,6 +109,7 @@ get_tty_state(scb, state)
      struct hardwire_ttystate *state;
 {
 #ifdef HAVE_TERMIOS
+  extern int errno;
   pid_t new_process_group;
 
   if (tcgetattr(scb->fd, &state->termios) < 0)
@@ -117,9 +118,14 @@ get_tty_state(scb, state)
   if (!job_control)
     return 0;
 
+  /* Apparently, if a tty has no process group, then tcgetpgrp returns -1 with
+     errno == 0.   In this case, set the process group to -1 so that we know to
+     omit resetting it later.  */
   new_process_group = tcgetpgrp (scb->fd);
-  if (new_process_group == (pid_t)-1)
+  if ((new_process_group == (pid_t)-1)
+      && (errno != ENOTTY))
     return -1;
+  errno = 0;
   state->process_group = new_process_group;
   return 0;
 #endif
@@ -159,9 +165,11 @@ set_tty_state(scb, state)
   if (!job_control)
     return 0;
 
-  /* Need to ignore errors, at least if attach_flag is set.  */
-  tcsetpgrp (scb->fd, state->process_group);
-  return 0;
+  /* If the tty had no process group before, then do not reset it. */
+  if (state->process_group == -1)
+    return 0;
+  else
+    return tcsetpgrp (scb->fd, state->process_group);
 #endif
 
 #ifdef HAVE_TERMIO
@@ -177,9 +185,7 @@ set_tty_state(scb, state)
   if (!job_control)
     return 0;
 
-  /* Need to ignore errors, at least if attach_flag is set.  */
-  ioctl (scb->fd, TIOCSPGRP, &state->process_group);
-  return 0;
+  return ioctl (scb->fd, TIOCSPGRP, &state->process_group);
 #endif
 }
 
@@ -330,6 +336,55 @@ hardwire_flush_output (scb)
 #endif  
 }
 
+static int
+hardwire_flush_input (scb)
+     serial_t scb;
+{
+#ifdef HAVE_TERMIOS
+  return tcflush (scb->fd, TCIFLUSH);
+#endif
+
+#ifdef HAVE_TERMIO
+  return ioctl (scb->fd, TCFLSH, 0);
+#endif
+
+#ifdef HAVE_SGTTY
+  /* This flushes both input and output, but we can't do better.  */
+  return ioctl (scb->fd, TIOCFLUSH, 0);
+#endif  
+}
+
+static int
+hardwire_send_break (scb)
+     serial_t scb;
+{
+#ifdef HAVE_TERMIOS
+  return tcsendbreak (scb->fd, 0);
+#endif
+
+#ifdef HAVE_TERMIO
+  return ioctl (scb->fd, TCSBRK, 0);
+#endif
+
+#ifdef HAVE_SGTTY
+  {
+    int status;
+    struct timeval timeout;
+
+    status = ioctl (scb->fd, TIOCSBRK, 0);
+
+    /* Can't use usleep; it doesn't exist in BSD 4.2.  */
+    /* Note that if this select() is interrupted by a signal it will not wait
+       the full length of time.  I think that is OK.  */
+    timeout.tv_sec = 0;
+    timeout.tv_usec = 250000;
+    select (0, 0, 0, 0, &timeout);
+    status = ioctl (scb->fd, TIOCCBRK, 0);
+    return status;
+  }
+#endif  
+}
+
 static void
 hardwire_raw(scb)
      serial_t scb;
@@ -382,8 +437,6 @@ wait_for(scb, timeout)
      serial_t scb;
      int timeout;
 {
-  int numfds;
-
 #ifdef HAVE_SGTTY
   struct timeval tv;
   fd_set readfds;
@@ -397,6 +450,8 @@ wait_for(scb, timeout)
 
   while (1)
     {
+      int numfds;
+
       if (timeout >= 0)
        numfds = select(scb->fd+1, &readfds, 0, 0, &tv);
       else
@@ -445,8 +500,8 @@ wait_for(scb, timeout)
 
 /* Read a character with user-specified timeout.  TIMEOUT is number of seconds
    to wait, or -1 to wait forever.  Use timeout of 0 to effect a poll.  Returns
-   char if successful.  Returns -2 if timeout expired, EOF if line dropped
-   dead, or -3 for any other error (see errno in that case). */
+   char if successful.  Returns SERIAL_TIMEOUT if timeout expired, EOF if line
+   dropped dead, or SERIAL_ERROR for any other error (see errno in that case).  */
 
 static int
 hardwire_readchar(scb, timeout)
@@ -611,6 +666,8 @@ static struct serial_ops hardwire_ops =
   hardwire_readchar,
   hardwire_write,
   hardwire_flush_output,
+  hardwire_flush_input,
+  hardwire_send_break,
   hardwire_raw,
   hardwire_get_tty_state,
   hardwire_set_tty_state,
@@ -642,7 +699,10 @@ gdb_setpgid ()
     {
 #if defined (NEED_POSIX_SETPGID) || defined (HAVE_TERMIOS)
       /* Do all systems with termios have setpgid?  I hope so.  */
-      retval = setpgid (0, 0);
+      /* setpgid (0, 0) is supposed to work and mean the same thing as
+        this, but on Ultrix 4.2A it fails with EPERM (and
+        setpgid (getpid (), getpid ()) succeeds).  */
+      retval = setpgid (getpid (), getpid ());
 #else
 #if defined (TIOCGPGRP)
 #if defined(USG) && !defined(SETPGRP_ARGS)