diff --git a/gdb/ChangeLog b/gdb/ChangeLog index adc2c742c9..7cae9cc0b9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 6 21:41:13 1993 Stu Grossman (grossman@cygnus.com) + + * ser-go32.c: Format. (go32_open): Use proper return value. + + * configure.in: Undo conditional configdirs hack for sparclite. + Tue Apr 6 17:07:37 1993 Jim Wilson (wilson@sphagnum.cygnus.com) * symtab.c (list_symbols): When call break_command, pass both diff --git a/gdb/configure.in b/gdb/configure.in index d4b9b62d96..109004e2d4 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -1,14 +1,8 @@ -configdirs="doc testsuite" +configdirs="doc testsuite sparclite" srcname="GDB" srctrigger=main.c gdb_serial_driver=ser-unix.c -echo ${target} - -if [ "${target_cpu}" = "sparclite" ] ; then - configdirs = "$configdirs sparclite" -fi - # per-host: # Map host cpu into the config cpu subdirectory name. diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c index e2b3a93527..edfe4b44ee 100644 --- a/gdb/ser-go32.c +++ b/gdb/ser-go32.c @@ -80,6 +80,7 @@ dos_async_init() int i; ASYNC_STRUCT *a1; ASYNC_STRUCT *a2; + a1 = getivec(12); a2 = getivec(11); async = 0; @@ -87,23 +88,26 @@ dos_async_init() async = a1; if (a2) async = a2; + if (a1 && a2) - { - if (a1 < a2) - async = a1; - else - async = a2; - } + { + if (a1 < a2) + async = a1; + else + async = a2; + } + if (async == 0) - { - error("GDB can not connect to asynctsr program, check that it is installed\n\ + { + error("GDB can not connect to asynctsr program, check that it is installed\n\ and that serial I/O is not being redirected (perhaps by NFS)\n\n\ example configuration:\n\ C> mode com2:9600,n,8,1,p\n\ C> asynctsr 2\n\ C> gdb \n"); - } + } + iov = async->iov; outportb(com_ier, 0x0f); outportb(com_bfr, 0x03); @@ -200,7 +204,7 @@ go32_open (scb, name) const char *name; { scb->fd = dos_async_init(); - if (scb->fd) + if (!scb->fd) return 1; return 0;