summaryrefslogtreecommitdiff
path: root/gdb/rdi-share
diff options
context:
space:
mode:
authorJason Molenda <jsm@bugshack.cygnus.com>2000-01-18 00:55:13 +0000
committerJason Molenda <jsm@bugshack.cygnus.com>2000-01-18 00:55:13 +0000
commit3737fc11419f15ae6e62cc9bfbc045e70b6b4e4d (patch)
treebd191e1f9d4f39010488623b3f0da4fafd4e6c11 /gdb/rdi-share
parentfc40d2f38bbc9727fca36b079b035400de581f7a (diff)
downloadgdb-3737fc11419f15ae6e62cc9bfbc045e70b6b4e4d.tar.gz
import gdb-2000-01-17 snapshot
Diffstat (limited to 'gdb/rdi-share')
-rw-r--r--gdb/rdi-share/ardi.c13
-rw-r--r--gdb/rdi-share/serdrv.c8
2 files changed, 12 insertions, 9 deletions
diff --git a/gdb/rdi-share/ardi.c b/gdb/rdi-share/ardi.c
index 3805352150a..f536ce3fc33 100644
--- a/gdb/rdi-share/ardi.c
+++ b/gdb/rdi-share/ardi.c
@@ -11,8 +11,8 @@
* Angel Remote Debug Interface
*
*
- * $Revision: 1.6 $
- * $Date: 2000/01/05 11:22:21 $
+ * $Revision: 1.7 $
+ * $Date: 2000/01/12 17:26:37 $
*
* This file is based on /plg/pisd/rdi.c, but instead of using RDP it uses
* ADP messages.
@@ -320,9 +320,12 @@ static AdpErrs negotiate_params( const ParameterOptions *user_options )
time_t t;
- static volatile NegotiateState n_state = {
- FALSE, FALSE, FALSE, &accepted_config };
-
+ static volatile NegotiateState n_state;
+ n_state.negotiate_resp = FALSE;
+ n_state.negotiate_ack = FALSE;
+ n_state.link_check_resp = FALSE;
+ n_state.accepted_config = &accepted_config;
+
#ifdef DEBUG
angel_DebugPrint( "negotiate_params\n" );
#endif
diff --git a/gdb/rdi-share/serdrv.c b/gdb/rdi-share/serdrv.c
index a8e89ca4de5..a26e0ec91f0 100644
--- a/gdb/rdi-share/serdrv.c
+++ b/gdb/rdi-share/serdrv.c
@@ -8,8 +8,8 @@
/* -*-C-*-
*
- * $Revision: 1.6 $
- * $Date: 2000/01/06 14:01:53 $
+ * $Revision: 1.7 $
+ * $Date: 2000/01/12 12:53:29 $
*
*
* serdrv.c - Synchronous Serial Driver for Angel.
@@ -85,10 +85,10 @@ static struct writestate wstate;
* The set of parameter options supported by the device
*/
static unsigned int baud_options[] = {
-#ifdef B115200 || __hpux
+#if defined(B115200) || defined(__hpux)
115200,
#endif
-#ifdef B57600 || __hpux
+#if defined(B57600) || defined(__hpux)
57600,
#endif
38400, 19200, 9600