2000-02-25 Fernando Nasser <fnasser@cygnus.com>

        From: Thomas Zenker <thz@Lennartz-electronic.DE>
        * rdi-share/hsys.c: to compile under 4.4BSD derived systems (FreeBSD,
        NetBSD...) sys_errlist should not be declared in hsys.c.
        NEED_SYSERRLIST is set already by configure, so we can use it.
        * rdi-share/unixcomm.c: 4.4BSD derived systems define BSD, but are
        posix compliant and we should not work with the old compatibility
        stuff.  Because of that I undef BSD in case of FBSD etc and include
        sys/ioctl to get the flags.
        * rdi-share/unixcomm.c: If the TIOCEXCL flags exists set serial line
        for exclusive use.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 59dd921..ab7d544 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2000-02-25  Fernando Nasser  <fnasser@cygnus.com>
+
+       From: Thomas Zenker <thz@Lennartz-electronic.DE>
+       * rdi-share/hsys.c: to compile under 4.4BSD derived systems (FreeBSD,
+       NetBSD...) sys_errlist should not be declared in hsys.c.
+       NEED_SYSERRLIST is set already by configure, so we can use it.
+       * rdi-share/unixcomm.c: 4.4BSD derived systems define BSD, but are
+       posix compliant and we should not work with the old compatibility
+       stuff.  Because of that I undef BSD in case of FBSD etc and include
+       sys/ioctl to get the flags.
+       * rdi-share/unixcomm.c: If the TIOCEXCL flags exists set serial line
+       for exclusive use.
+
 2000-02-24  Kevin Buettner  <kevinb@redhat.com>
 
        * ppc-linux-tdep.c (ppc_sysv_abi_push_arguments): Put address

diff --git a/gdb/rdi-share/hsys.c b/gdb/rdi-share/hsys.c
index ef42a30..1d47a85 100644 (file)
--- a/gdb/rdi-share/hsys.c
+++ b/gdb/rdi-share/hsys.c
@@ -29,7 +29,7 @@
 #include "ardi.h"
 #include "buffers.h"
 #include "channels.h"        /* Channel interface. */
-#include "endian.h"
+#include "angel_endian.h"
 #include "logging.h"         /* Angel support functions. */
 #include "msgbuild.h"
 #include "sys.h"    
@@ -125,8 +125,10 @@ static void DebugCheckNullTermString(char *prefix, bool nl,
     }
 }
 
+#ifdef NEED_SYSERRLIST
 extern int sys_nerr;
 extern char *sys_errlist[];
+#endif
 
 static char *DebugStrError(int last_errno)
 {

diff --git a/gdb/rdi-share/unixcomm.c b/gdb/rdi-share/unixcomm.c
index 7c2183d..6891c0d 100644 (file)
--- a/gdb/rdi-share/unixcomm.c
+++ b/gdb/rdi-share/unixcomm.c
@@ -36,6 +36,11 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (bsdi)
+#undef BSD
+#include <sys/ioctl.h>
+#endif
+
 #ifdef sun
 # include <sys/ioccom.h>
 # ifdef __svr4__
@@ -68,6 +73,7 @@
 #define PP_TIMEOUT      1              /* seconds */
 
 #ifdef sun
+#define SERIAL_PREFIX "/dev/tty"
 #define SERPORT1   "/dev/ttya"
 #define SERPORT2   "/dev/ttyb"
 #define PARPORT1   "/dev/bpp0"
@@ -75,6 +81,7 @@
 #endif
 
 #ifdef __hpux
+#define SERIAL_PREFIX "/dev/tty"
 #define SERPORT1   "/dev/tty00"
 #define SERPORT2   "/dev/tty01"
 #define PARPORT1   "/dev/ptr_parallel"
@@ -82,13 +89,15 @@
 #endif
 
 #ifdef __linux__
-#define SERPORT1   "/dev/cua0"
-#define SERPORT2   "/dev/cua1"
+#define SERIAL_PREFIX "/dev/ttyS"
+#define SERPORT1   "/dev/ttyS0"
+#define SERPORT2   "/dev/ttyS1"
 #define PARPORT1   "/dev/par0"
 #define PARPORT2   "/dev/par1"
 #endif
 
 #if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (bsdi)
+#define SERIAL_PREFIX "/dev/cuaa"
 #define SERPORT1   "/dev/cuaa0"
 #define SERPORT2   "/dev/cuaa1"
 #define PARPORT1   "/dev/lpt0"
@@ -96,14 +105,12 @@
 #endif
 
 
-#define SERIAL_PREFIX "/dev/tty"
 #if defined(_WIN32) || defined (__CYGWIN32__) 
+#define SERIAL_PREFIX "com"
 #define SERPORT1   "com1"
 #define SERPORT2   "com2"
 #define PARPORT1   "lpt1"
 #define PARPORT2   "lpt2"
-#undef SERIAL_PREFIX
-#define SERIAL_PREFIX "com"
 #endif
 
 
@@ -251,6 +258,13 @@ extern int Unix_OpenSerial(const char *name)
         perror("open");
         return -1;
     }
+#ifdef TIOCEXCL
+    if (ioctl(serpfd, TIOCEXCL) < 0) {
+       close(serpfd);
+        perror("ioctl: TIOCEXCL");
+        return -1;
+    }
+#endif
 
     return 0;
 }
@@ -287,7 +301,14 @@ extern int Unix_ReadSerial(unsigned char *buf, int n, bool block)
         return -1;
     }
     else if (err > 0 && FD_ISSET(serpfd, &fdset))
-        return read(serpfd, buf, n);
+      {
+       int s;
+
+       s = read(serpfd, buf, n);
+       if (s < 0)
+         perror("read:");
+       return s;
+      }
     else /* err == 0 || FD_CLR(serpfd, &fdset) */
     {
         errno = ERRNO_FOR_BLOCKED_IO;
@@ -305,15 +326,6 @@ extern void Unix_ResetSerial(void)
     struct termios terminfo;
 
     tcgetattr(serpfd, &terminfo);
-#ifdef __CYGWIN32__
-    /* Expedient, but it works.  */
-    terminfo.c_iflag = 0;
-    terminfo.c_oflag = 0;
-    terminfo.c_cflag = 48;
-    terminfo.c_lflag = 0;
-    terminfo.c_cc[VMIN] = 0;
-    terminfo.c_cc[VTIME] = 1;
-#else
     terminfo.c_lflag &= ~(ICANON | ISIG | ECHO | IEXTEN);
     terminfo.c_iflag &= ~(IGNCR | INPCK | ISTRIP | ICRNL | BRKINT);
     terminfo.c_iflag |= (IXON | IXOFF | IGNBRK);
@@ -322,7 +334,6 @@ extern void Unix_ResetSerial(void)
     terminfo.c_cc[VMIN] = 1;
     terminfo.c_cc[VTIME] = 0;
     terminfo.c_oflag &= ~OPOST;
-#endif
     tcsetattr(serpfd, TCSAFLUSH, &terminfo);
 }