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

[platform/upstream/binutils.git] / gdb / remote-es.c

diff --git a/gdb/remote-es.c b/gdb/remote-es.c
index b2cabce..0500a14 100644 (file)
--- a/gdb/remote-es.c
+++ b/gdb/remote-es.c
@@ -1,5 +1,5 @@
 /* Memory-access and commands for remote es1800 processes, for GDB.
-   Copyright (C) 1988, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1992, 2001 Free Software Foundation, Inc.
 
    This file is added to GDB to make it possible to do debugging via an
    ES-1800 emulator. The code was originally written by Johan Holmberg
@@ -104,8 +104,8 @@
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "command.h"
+#include "symfile.h"
 #include "remote-utils.h"
 #include "gdbcore.h"
 #include "serial.h"
@@ -134,7 +134,7 @@ static void es1800_files_info (struct target_ops *);
 
 static int
 es1800_xfer_inferior_memory (CORE_ADDR, char *, int, int,
-                            struct target_ops *);
+                            struct mem_attrib *, struct target_ops *);
 
 static void es1800_prepare_to_store (void);
 
@@ -959,7 +959,9 @@ tohex (int nib)
 
 static int
 es1800_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
-                            int write, struct target_ops *tops)
+                            int write, 
+                            struct mem_attrib *attrib ATTRIBUTE_UNUSED,
+                            struct target_ops *target ATTRIBUTE_UNUSED)
 {
   int origlen = len;
   int xfersize;
@@ -1151,7 +1153,7 @@ verify_break (int vec)
        {
          memory_error (status, memaddress);
        }
-      return (STRCMP (instr, buf));
+      return (strcmp (instr, buf));
     }
   return (-1);
 }
@@ -1316,7 +1318,7 @@ es1800_load (char *filename, int from_tty)
       system (buf);
     }
 
-  symbol_file_command (filename, from_tty);    /* reading symbol table */
+  symbol_file_add_main (filename, from_tty);   /* reading symbol table */
   immediate_quit--;
 }