diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2004-05-21 20:23:44 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2004-05-21 20:23:44 +0000 |
commit | 54c8dbbf02ab898df1251a6323efffebe68c55e0 (patch) | |
tree | 32e0c38ddde06552627ea6acab0da40618c89575 /gnu/usr.bin/binutils/gdb/remote-utils.h | |
parent | 7069eb4ee48ce3c8978f86920c62292e57f239da (diff) |
Resolve conflicts for GDB 6.1. Add local patches.
ok deraadt@
Diffstat (limited to 'gnu/usr.bin/binutils/gdb/remote-utils.h')
-rw-r--r-- | gnu/usr.bin/binutils/gdb/remote-utils.h | 115 |
1 files changed, 54 insertions, 61 deletions
diff --git a/gnu/usr.bin/binutils/gdb/remote-utils.h b/gnu/usr.bin/binutils/gdb/remote-utils.h index d4fcd0eded3..cae5d5e238d 100644 --- a/gnu/usr.bin/binutils/gdb/remote-utils.h +++ b/gnu/usr.bin/binutils/gdb/remote-utils.h @@ -1,42 +1,45 @@ /* 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. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #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. */ -struct _sr_settings { - unsigned int timeout; +struct _sr_settings + { + unsigned int timeout; - int retries; + int retries; - char *device; - serial_t desc; + char *device; + struct serial *desc; -}; + }; extern struct _sr_settings sr_settings; @@ -52,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); \ } @@ -69,23 +72,16 @@ extern struct _sr_settings sr_settings; #define sr_check_open() { if (!sr_is_open()) \ error ("Remote device not open"); } -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)); -}; +struct gr_settings + { + char *prompt; + struct target_ops *ops; + 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)) @@ -114,29 +110,26 @@ extern struct gr_settings *gr_settings; #define gr_expect_prompt() sr_expect(gr_get_prompt()) -int gr_fetch_word PARAMS((CORE_ADDR addr)); -int gr_multi_scan PARAMS((char *list[], int passthrough)); -int sr_get_hex_digit PARAMS((int ignore_space)); -int sr_pollchar PARAMS((void)); -int sr_readchar PARAMS((void)); -int sr_timed_read PARAMS((char *buf, int n)); -long sr_get_hex_word PARAMS((void)); -void gr_close PARAMS((int quitting)); -void gr_create_inferior PARAMS((char *execfile, char *args, char **env)); -void gr_detach PARAMS((char *args, int from_tty)); -void gr_files_info PARAMS((struct target_ops *ops)); -void gr_generic_checkin PARAMS((void)); -void gr_kill PARAMS((void)); -void gr_mourn PARAMS((void)); -void gr_prepare_to_store PARAMS((void)); -void gr_store_word PARAMS((CORE_ADDR addr, int word)); -void sr_expect PARAMS((char *string)); -void sr_get_hex_byte PARAMS((char *byt)); -void sr_scan_args PARAMS((char *proto, char *args)); -void sr_write PARAMS((char *a, int l)); -void sr_write_cr PARAMS((char *s)); - -void gr_open PARAMS((char *args, int from_tty, - struct gr_settings *gr_settings)); -void gr_load_image PARAMS((char*, int from_tty)); +int gr_multi_scan (char *list[], int passthrough); +int sr_get_hex_digit (int ignore_space); +int sr_pollchar (void); +int sr_readchar (void); +int sr_timed_read (char *buf, int n); +long sr_get_hex_word (void); +void gr_close (int quitting); +void gr_create_inferior (char *execfile, char *args, char **env); +void gr_detach (char *args, int from_tty); +void gr_files_info (struct target_ops *ops); +void gr_generic_checkin (void); +void gr_kill (void); +void gr_mourn (void); +void gr_prepare_to_store (void); +void sr_expect (char *string); +void sr_get_hex_byte (char *byt); +void sr_scan_args (char *proto, char *args); +void sr_write (char *a, int l); +void sr_write_cr (char *s); + +void gr_open (char *args, int from_tty, struct gr_settings *gr_settings); +void gr_load_image (char *, int from_tty); #endif /* REMOTE_UTILS_H */ |