2003-02-12 Andrew Cagney <ac131313@redhat.com>

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

diff --git a/gdb/remote-utils.h b/gdb/remote-utils.h
index 75e852a7b438a2d6670b19c186001f9907df5bfd..3ca3bb4dcce3820d9c65bffda4e7419e43d756cf 100644 (file)
--- a/gdb/remote-utils.h
+++ b/gdb/remote-utils.h
@@ -1,6 +1,6 @@
 /* Generic support for remote debugging interfaces.
 
-   Copyright 1993 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,9 +22,8 @@
 #ifndef REMOTE_UTILS_H
 #define REMOTE_UTILS_H
 
-#include "serial.h"
 #include "target.h"
-#include "dcache.h"
+struct serial;
 
 /* Stuff that should be shared (and handled consistently) among the various
    remote targets.  */
@@ -36,7 +35,7 @@ struct _sr_settings
     int retries;
 
     char *device;
-    serial_t desc;
+    struct serial *desc;
 
   };
 
@@ -54,7 +53,7 @@ extern struct _sr_settings sr_settings;
 #define sr_get_device()                        (sr_settings.device)
 #define sr_set_device(newval) \
 { \
-    if (sr_settings.device) free(sr_settings.device); \
+    if (sr_settings.device) xfree (sr_settings.device); \
     sr_settings.device = (newval); \
 }
 
@@ -73,22 +72,14 @@ extern struct _sr_settings sr_settings;
 
 struct gr_settings
   {
-    /* This is our data cache. */
-    DCACHE *dcache;
     char *prompt;
     struct target_ops *ops;
     int (*clear_all_breakpoints) (void);
-    memxferfunc readfunc;
-    memxferfunc writefunc;
     void (*checkin) (void);
   };
 
 extern struct gr_settings *gr_settings;
 
-/* get and set dcache. */
-#define gr_get_dcache()                        (gr_settings->dcache)
-#define gr_set_dcache(newval)          (gr_settings->dcache = (newval))
-
 /* get and set prompt. */
 #define gr_get_prompt()                        (gr_settings->prompt)
 #define gr_set_prompt(newval)          (gr_settings->prompt = (newval))