fix scrambled changelog

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

diff --git a/gdb/remote-utils.h b/gdb/remote-utils.h
index 0bd0e0dcea3b949a94dbac3cbc7e42389ce55737..cae5d5e238d7d7a961acb98c0dbbd0940b7d8a24 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,10 @@
 #ifndef REMOTE_UTILS_H
 #define REMOTE_UTILS_H
 
-#include "serial.h"
+struct target_ops;
+
 #include "target.h"
-#include "dcache.h"
+struct serial;
 
 /* Stuff that should be shared (and handled consistently) among the various
    remote targets.  */
@@ -36,7 +37,7 @@ struct _sr_settings
     int retries;
 
     char *device;
-    serial_t desc;
+    struct serial *desc;
 
   };
 
@@ -54,7 +55,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 +74,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) PARAMS ((void));
-    memxferfunc readfunc;
-    memxferfunc writefunc;
-    void (*checkin) PARAMS ((void));
+    int (*clear_all_breakpoints) (void);
+    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))
@@ -117,7 +110,6 @@ extern struct gr_settings *gr_settings;
 
 #define gr_expect_prompt()     sr_expect(gr_get_prompt())
 
-int gr_fetch_word (CORE_ADDR addr);
 int gr_multi_scan (char *list[], int passthrough);
 int sr_get_hex_digit (int ignore_space);
 int sr_pollchar (void);
@@ -132,7 +124,6 @@ void gr_generic_checkin (void);
 void gr_kill (void);
 void gr_mourn (void);
 void gr_prepare_to_store (void);
-void gr_store_word (CORE_ADDR addr, int word);
 void sr_expect (char *string);
 void sr_get_hex_byte (char *byt);
 void sr_scan_args (char *proto, char *args);