* Makefile.in (ALLDEPFILES): Remove alphanbsd-nat.c.

[deliverable/binutils-gdb.git] / gdb / remote-st.c

diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index cda69b6ae9eee546aea37157ee7d771c24b61ed0..c27ddebbf3be7e3dd7535f0698891de4a289d6dd 100644 (file)
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -1,6 +1,8 @@
 /* Remote debugging interface for Tandem ST2000 phone switch, for GDB.
 /* Remote debugging interface for Tandem ST2000 phone switch, for GDB.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000,
+   2001, 2002 Free Software Foundation, Inc.
+

    Contributed by Cygnus Support.  Written by Jim Kingdon for Cygnus.
 
    This file is part of GDB.
    Contributed by Cygnus Support.  Written by Jim Kingdon for Cygnus.
 
    This file is part of GDB.


@@ -76,8 +78,9 @@ printf_stdebug (char *pattern,...)
   vsprintf (buf, pattern, args);
   va_end (args);
 
   vsprintf (buf, pattern, args);
   va_end (args);
 

-  if (SERIAL_WRITE (st2000_desc, buf, strlen (buf)))
-    fprintf (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror (errno));
+  if (serial_write (st2000_desc, buf, strlen (buf)))
+    fprintf_unfiltered (gdb_stderr, "serial_write failed: %s\n",
+                       safe_strerror (errno));

 }
 
 /* Read a character from the remote system, doing all the fancy timeout
 }
 
 /* Read a character from the remote system, doing all the fancy timeout


@@ -88,7 +91,7 @@ readchar (int timeout)
 {
   int c;
 
 {
   int c;
 

-  c = SERIAL_READCHAR (st2000_desc, timeout);
+  c = serial_readchar (st2000_desc, timeout);

 
 #ifdef LOG_FILE
   putc (c & 0x7f, log_file);
 
 #ifdef LOG_FILE
   putc (c & 0x7f, log_file);


@@ -280,18 +283,18 @@ or target st2000 <host> <port>\n");
 
   st2000_close (0);
 
 
   st2000_close (0);
 

-  st2000_desc = SERIAL_OPEN (dev_name);
+  st2000_desc = serial_open (dev_name);

 
   if (!st2000_desc)
     perror_with_name (dev_name);
 
 
   if (!st2000_desc)
     perror_with_name (dev_name);
 

-  if (SERIAL_SETBAUDRATE (st2000_desc, baudrate))
+  if (serial_setbaudrate (st2000_desc, baudrate))

     {
     {

-      SERIAL_CLOSE (dev_name);
+      serial_close (dev_name);

       perror_with_name (dev_name);
     }
 
       perror_with_name (dev_name);
     }
 

-  SERIAL_RAW (st2000_desc);
+  serial_raw (st2000_desc);

 
   push_target (&st2000_ops);
 
 
   push_target (&st2000_ops);
 


@@ -316,15 +319,15 @@ or target st2000 <host> <port>\n");
 static void
 st2000_close (int quitting)
 {
 static void
 st2000_close (int quitting)
 {

-  SERIAL_CLOSE (st2000_desc);
+  serial_close (st2000_desc);

 
 #if defined (LOG_FILE)
   if (log_file)
     {
       if (ferror (log_file))
 
 #if defined (LOG_FILE)
   if (log_file)
     {
       if (ferror (log_file))

-       fprintf (stderr, "Error writing log file.\n");
+       fprintf_unfiltered (gdb_stderr, "Error writing log file.\n");

       if (fclose (log_file) != 0)
       if (fclose (log_file) != 0)

-       fprintf (stderr, "Error closing log file.\n");
+       fprintf_unfiltered (gdb_stderr, "Error closing log file.\n");

     }
 #endif
 }
     }
 #endif
 }


@@ -560,9 +563,8 @@ st2000_read_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
 
 static int
 st2000_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
 
 static int
 st2000_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,

-                            int write, 
-                            struct mem_attrib *attrib ATTRIBUTE_UNUSED,
-                            struct target_ops *target ATTRIBUTE_UNUSED)
+                            int write, struct mem_attrib *attrib,
+                            struct target_ops *target)

 {
   if (write)
     return st2000_write_inferior_memory (memaddr, myaddr, len);
 {
   if (write)
     return st2000_write_inferior_memory (memaddr, myaddr, len);


@@ -615,7 +617,7 @@ st2000_insert_breakpoint (CORE_ADDR addr, char *shadow)
        return 0;
       }
 
        return 0;
       }
 

-  fprintf (stderr, "Too many breakpoints (> 16) for STDBUG\n");
+  fprintf_unfiltered (gdb_stderr, "Too many breakpoints (> 16) for STDBUG\n");

   return 1;
 }
 
   return 1;
 }
 


@@ -634,7 +636,8 @@ st2000_remove_breakpoint (CORE_ADDR addr, char *shadow)
        return 0;
       }
 
        return 0;
       }
 

-  fprintf (stderr, "Can't find breakpoint associated with 0x%x\n", addr);
+  fprintf_unfiltered (gdb_stderr,
+                     "Can't find breakpoint associated with 0x%x\n", addr);

   return 1;
 }
 
   return 1;
 }
 


@@ -664,7 +667,7 @@ static void
 cleanup_tty (void)
 {
   printf ("\r\n[Exiting connect mode]\r\n");
 cleanup_tty (void)
 {
   printf ("\r\n[Exiting connect mode]\r\n");

-/*  SERIAL_RESTORE(0, &ttystate); */
+/*  serial_restore(0, &ttystate); */

 }
 
 #if 0
 }
 
 #if 0


@@ -699,7 +702,7 @@ connect_command (char *args, int fromtty)
       do
        {
          FD_SET (0, &readfds);
       do
        {
          FD_SET (0, &readfds);

-         FD_SET (DEPRECATED_SERIAL_FD (st2000_desc), &readfds);
+         FD_SET (deprecated_serial_fd (st2000_desc), &readfds);

          numfds = select (sizeof (readfds) * 8, &readfds, 0, 0, 0);
        }
       while (numfds == 0);
          numfds = select (sizeof (readfds) * 8, &readfds, 0, 0, 0);
        }
       while (numfds == 0);


@@ -734,7 +737,7 @@ connect_command (char *args, int fromtty)
            }
        }
 
            }
        }
 

-      if (FD_ISSET (DEPRECATED_SERIAL_FD (st2000_desc), &readfds))
+      if (FD_ISSET (deprecated_serial_fd (st2000_desc), &readfds))

        {
          while (1)
            {
        {
          while (1)
            {