* monitor.c (#include "gdb_wait.h"): Removed.

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

diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index d64e94ac5399debffcdff890ec287360188894e9..0aecc3826ef7b9eb700d2cc2a3a34a465e9e4c28 100644 (file)
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -1,5 +1,5 @@
 /* Remote debugging for the ARM RDP interface.
-   Copyright 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -38,7 +38,6 @@
 
 #include "defs.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include "callback.h"
 #include "command.h"
@@ -167,10 +166,10 @@ static int timeout = 2;
 static char *commandline = NULL;
 
 static int
-remote_rdp_xfer_inferior_memory (CORE_ADDR memaddr,
-                                char *myaddr,
-                                int len,
-                                int write, struct target_ops *target);
+remote_rdp_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+                                int write, 
+                                struct mem_attrib *attrib,
+                                struct target_ops *target);
 
 
 /* Stuff for talking to the serial layer. */
@@ -696,7 +695,7 @@ rdp_set_command_line (char *command, char *args)
    */
 
   if (commandline != NULL)
-    free (commandline);
+    xfree (commandline);
 
   commandline = malloc (strlen (command) + strlen (args) + 2);
   if (commandline != NULL)
@@ -873,7 +872,7 @@ exec_swi (int swi, argsin *args)
        char *copy = alloca (args[2].n);
        int done = callback->read (callback, args[0].n, copy, args[2].n);
        if (done > 0)
-         remote_rdp_xfer_inferior_memory (args[1].n, copy, done, 1, 0);
+         remote_rdp_xfer_inferior_memory (args[1].n, copy, done, 1, 0, 0);
        args->n = args[2].n - done;
        return 1;
       }
@@ -905,10 +904,10 @@ exec_swi (int swi, argsin *args)
              commandline[255] = '\0';
            }
          remote_rdp_xfer_inferior_memory (args[0].n,
-                                          commandline, len + 1, 1, 0);
+                                          commandline, len + 1, 1, 0, 0);
        }
       else
-       remote_rdp_xfer_inferior_memory (args[0].n, "", 1, 1, 0);
+       remote_rdp_xfer_inferior_memory (args[0].n, "", 1, 1, 0, 0);
       return 1;
 
     default:
@@ -955,6 +954,7 @@ handle_swi (void)
                                               buf,
                                               len,
                                               0,
+                                              0,
                                               0);
            }
          else
@@ -970,7 +970,7 @@ handle_swi (void)
          break;
 
        default:
-         error ("Unimplented SWI argument");
+         error ("Unimplemented SWI argument");
        }
 
       type = type >> 2;
@@ -1241,13 +1241,17 @@ remote_rdp_prepare_to_store (void)
   /* Do nothing, since we can store individual regs */
 }
 
+/* Transfer LEN bytes between GDB address MYADDR and target address
+   MEMADDR.  If WRITE is non-zero, transfer them to the target,
+   otherwise transfer them from the target.  TARGET is unused.
+
+   Returns the number of bytes transferred. */
+
 static int
-remote_rdp_xfer_inferior_memory (memaddr, myaddr, len, write, target)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int write;
-     struct target_ops *target;        /* ignored */
+remote_rdp_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+                                int write, 
+                                struct mem_attrib *attrib ATTRIBUTE_UNUSED,
+                                struct target_ops *target ATTRIBUTE_UNUSED)
 {
   /* I infer from D Taylor's code that there's a limit on the amount
      we can transfer in one chunk.. */