2005-02-11 Andrew Cagney <cagney@gnu.org>

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

diff --git a/gdb/remote-utils.c b/gdb/remote-utils.c
index 236a0ec1423dd03df47afc6eeb72443f029ef61c..d4775ad631e0016819503e920ee17c9638e161e3 100644 (file)
--- a/gdb/remote-utils.c
+++ b/gdb/remote-utils.c
@@ -1,6 +1,7 @@
 /* Generic support for remote debugging interfaces.
 
-   Copyright 1993, 1994, 1998 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1995, 1996, 1998, 2000, 2001
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -50,6 +51,7 @@
 #include "gdbcore.h"           /* for exec_bfd */
 #include "inferior.h"          /* for generic_mourn_inferior */
 #include "remote-utils.h"
+#include "regcache.h"
 
 
 void _initialize_sr_support (void);
@@ -83,8 +85,8 @@ usage (char *proto, char *junk)
   if (junk != NULL)
     fprintf_unfiltered (gdb_stderr, "Unrecognized arguments: `%s'.\n", junk);
 
-  error ("Usage: target %s [DEVICE [SPEED [DEBUG]]]\n\
-where DEVICE is the name of a device or HOST:PORT", proto, proto);
+  error (_("Usage: target %s [DEVICE [SPEED [DEBUG]]]\n\
+where DEVICE is the name of a device or HOST:PORT"), proto);
 
   return;
 }
@@ -154,19 +156,12 @@ gr_generic_checkin (void)
 void
 gr_open (char *args, int from_tty, struct gr_settings *gr)
 {
-  DCACHE *dcache;
-
   target_preopen (from_tty);
   sr_scan_args (gr->ops->to_shortname, args);
   unpush_target (gr->ops);
 
   gr_settings = gr;
 
-  if ((dcache = gr_get_dcache()) == NULL)
-    gr_set_dcache (dcache_init (gr->readfunc, gr->writefunc));
-  else
-    dcache_invd (dcache);
-
   if (sr_get_desc () != NULL)
     gr_close (0);
 
@@ -177,24 +172,24 @@ gr_open (char *args, int from_tty, struct gr_settings *gr)
   if (sr_get_device () == NULL)
     usage (gr->ops->to_shortname, NULL);
 
-  sr_set_desc (SERIAL_OPEN (sr_get_device ()));
+  sr_set_desc (serial_open (sr_get_device ()));
   if (!sr_get_desc ())
     perror_with_name ((char *) sr_get_device ());
 
   if (baud_rate != -1)
     {
-      if (SERIAL_SETBAUDRATE (sr_get_desc (), baud_rate) != 0)
+      if (serial_setbaudrate (sr_get_desc (), baud_rate) != 0)
        {
-         SERIAL_CLOSE (sr_get_desc ());
+         serial_close (sr_get_desc ());
          perror_with_name (sr_get_device ());
        }
     }
 
-  SERIAL_RAW (sr_get_desc ());
+  serial_raw (sr_get_desc ());
 
   /* If there is something sitting in the buffer we might take it as a
      response to a command, which would be bad.  */
-  SERIAL_FLUSH_INPUT (sr_get_desc ());
+  serial_flush_input (sr_get_desc ());
 
   /* default retries */
   if (sr_get_retries () == 0)
@@ -227,10 +222,10 @@ sr_readchar (void)
 {
   int buf;
 
-  buf = SERIAL_READCHAR (sr_get_desc (), sr_get_timeout ());
+  buf = serial_readchar (sr_get_desc (), sr_get_timeout ());
 
   if (buf == SERIAL_TIMEOUT)
-    error ("Timeout reading from remote system.");
+    error (_("Timeout reading from remote system."));
 
   if (sr_get_debug () > 0)
     printf_unfiltered ("%c", buf);
@@ -243,7 +238,7 @@ sr_pollchar (void)
 {
   int buf;
 
-  buf = SERIAL_READCHAR (sr_get_desc (), 0);
+  buf = serial_readchar (sr_get_desc (), 0);
   if (buf == SERIAL_TIMEOUT)
     buf = 0;
   if (sr_get_debug () > 0)
@@ -264,7 +259,7 @@ sr_expect (char *string)
 {
   char *p = string;
 
-  immediate_quit = 1;
+  immediate_quit++;
   while (1)
     {
       if (sr_readchar () == *p)
@@ -272,7 +267,7 @@ sr_expect (char *string)
          p++;
          if (*p == '\0')
            {
-             immediate_quit = 0;
+             immediate_quit--;
              return;
            }
        }
@@ -286,8 +281,8 @@ sr_write (char *a, int l)
 {
   int i;
 
-  if (SERIAL_WRITE (sr_get_desc (), a, l) != 0)
-    perror_with_name ("sr_write: Error writing to remote");
+  if (serial_write (sr_get_desc (), a, l) != 0)
+    perror_with_name (_("sr_write: Error writing to remote"));
 
   if (sr_get_debug () > 0)
     for (i = 0; i < l; i++)
@@ -344,7 +339,7 @@ sr_get_hex_digit (int ignore_space)
       else if (ch != ' ' || !ignore_space)
        {
          gr_expect_prompt ();
-         error ("Invalid hex digit from remote system.");
+         error (_("Invalid hex digit from remote system."));
        }
     }
 }
@@ -403,7 +398,7 @@ gr_close (int quitting)
 
   if (sr_is_open ())
     {
-      SERIAL_CLOSE (sr_get_desc ());
+      serial_close (sr_get_desc ());
       sr_set_desc (NULL);
     }
 
@@ -422,7 +417,7 @@ void
 gr_detach (char *args, int from_tty)
 {
   if (args)
-    error ("Argument given to \"detach\" when remotely debugging.");
+    error (_("Argument given to \"detach\" when remotely debugging."));
 
   if (sr_is_open ())
     gr_clear_all_breakpoints ();
@@ -476,10 +471,10 @@ gr_create_inferior (char *execfile, char *args, char **env)
   int entry_pt;
 
   if (args && *args)
-    error ("Can't pass arguments to remote process.");
+    error (_("Can't pass arguments to remote process."));
 
   if (execfile == 0 || exec_bfd == 0)
-    error ("No executable file specified");
+    error (_("No executable file specified"));
 
   entry_pt = (int) bfd_get_start_address (exec_bfd);
   sr_check_open ();
@@ -502,9 +497,7 @@ gr_create_inferior (char *execfile, char *args, char **env)
    pass non-matching data on.  */
 
 int
-gr_multi_scan (list, passthrough)
-     char *list[];
-     int passthrough;
+gr_multi_scan (char *list[], int passthrough)
 {
   char *swallowed = NULL;      /* holding area */
   char *swallowed_p = swallowed;       /* Current position in swallowed.  */
@@ -603,12 +596,13 @@ void
 _initialize_sr_support (void)
 {
 /* FIXME-now: if target is open... */
-  add_show_from_set (add_set_cmd ("remotedevice", no_class,
-                                 var_filename, (char *) &sr_settings.device,
-                                 "Set device for remote serial I/O.\n\
+  deprecated_add_show_from_set
+    (add_set_cmd ("remotedevice", no_class,
+                 var_filename, (char *) &sr_settings.device,
+                 "Set device for remote serial I/O.\n\
 This device is used as the serial port when debugging using remote\n\
 targets.", &setlist),
-                    &showlist);
+     &showlist);
 
   add_com ("remote <command>", class_obscure, sr_com,
           "Send a command to the remote monitor.");