diff options
author | Jason Molenda <jmolenda@apple.com> | 2000-01-18 00:55:13 +0000 |
---|---|---|
committer | Jason Molenda <jmolenda@apple.com> | 2000-01-18 00:55:13 +0000 |
commit | c5394b80aefdea6b2f589723a4b79bcbc1942629 (patch) | |
tree | c53989048ae15966e62006aaee403659bde346bf /gdb/rdi-share | |
parent | 67a95c88f38aa938757c92389ba59bbc89e7fa79 (diff) | |
download | gdb-c5394b80aefdea6b2f589723a4b79bcbc1942629.zip gdb-c5394b80aefdea6b2f589723a4b79bcbc1942629.tar.gz gdb-c5394b80aefdea6b2f589723a4b79bcbc1942629.tar.bz2 |
import gdb-2000-01-17 snapshot
Diffstat (limited to 'gdb/rdi-share')
-rw-r--r-- | gdb/rdi-share/ardi.c | 9 | ||||
-rw-r--r-- | gdb/rdi-share/serdrv.c | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gdb/rdi-share/ardi.c b/gdb/rdi-share/ardi.c index d1dc191..43b8cf4 100644 --- a/gdb/rdi-share/ardi.c +++ b/gdb/rdi-share/ardi.c @@ -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 9a2992e..91f8f19 100644 --- a/gdb/rdi-share/serdrv.c +++ b/gdb/rdi-share/serdrv.c @@ -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 |