* dwarf2dbg.c (dwarf2_directive_file): Avoid signed/unsigned warning.

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

diff --git a/gdb/remote-mm.c b/gdb/remote-mm.c
index f4680317cdb7f09a17ca7c3fbb831d594ba38eb6..67727e2c81c79cb5a6b08fe2e58612dc611c2170 100644 (file)
--- a/gdb/remote-mm.c
+++ b/gdb/remote-mm.c
@@ -1,5 +1,6 @@
 /* Remote debugging interface for Am290*0 running MiniMON monitor, for GDB.
-   Copyright 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+   2001 Free Software Foundation, Inc.
    Originally written by Daniel Mann at AMD.
 
    This file is part of GDB.
@@ -41,6 +42,7 @@
 #include "terminal.h"
 #include "minimon.h"
 #include "target.h"
+#include "regcache.h"
 
 /* Offset of member MEMBER in a struct of type TYPE.  */
 #define offsetof(TYPE, MEMBER) ((int) &((TYPE *)0)->MEMBER)
@@ -49,7 +51,7 @@
 
 extern int stop_soon_quietly;  /* for wait_for_inferior */
 
-static void mm_resume ();
+static void mm_resume (ptid_t ptid, int step, enum target_signal sig)
 static void mm_fetch_registers ();
 static int fetch_register ();
 static void mm_store_registers ();
@@ -116,12 +118,6 @@ FILE *mm_stream;
 /* Called when SIGALRM signal sent due to alarm() timeout.  */
 #ifndef HAVE_TERMIO
 
-#ifndef __STDC__
-#ifndef volatile
-#define volatile
-/**/
-# endif
-#endif
 volatile int n_alarms;
 
 static void
@@ -527,7 +523,7 @@ mm_detach (char *args, int from_tty)
 ** Tell the remote machine to resume.  */
 
 static void
-mm_resume (int pid, int step, enum target_signal sig)
+mm_resume (ptid_t ptid, int step, enum target_signal sig)
 {
   if (sig != TARGET_SIGNAL_0)
     warning ("Can't send signals to a remote MiniMon system.");
@@ -551,8 +547,8 @@ mm_resume (int pid, int step, enum target_signal sig)
 ** Wait until the remote machine stops, then return,
    storing status in STATUS just as `wait' would.  */
 
-static int
-mm_wait (struct target_waitstatus *status)
+static ptid_t
+mm_wait (ptid_t ptid, struct target_waitstatus *status)
 {
   int i, result;
   int old_timeout = timeout;
@@ -696,7 +692,7 @@ halted:
 
   timeout = old_timeout;       /* Restore original timeout value */
   immediate_quit = old_immediate_quit;
-  return 0;
+  return inferior_ptid;
 }
 
 /******************************************************* REMOTE_FETCH_REGISTERS
@@ -1825,7 +1821,6 @@ init_mm_ops (void)
   mm_ops.to_thread_alive = 0;
   mm_ops.to_stop = 0;
   mm_ops.to_pid_to_exec_file = NULL;
-  mm_ops.to_core_file_to_sym_file = NULL;
   mm_ops.to_stratum = process_stratum;
   mm_ops.DONT_USE = 0;
   mm_ops.to_has_all_memory = 1;