* Makefile.in (SFILES OBS): Add serial.[co] & ser-hardwire.[co].

	These implement a new serial line interface for talking to remote
	targets.
	* configure.in:  Link ser-hardwire.c to ser-unix.c for all hosts,
	EXCEPT go32, which gets ser-go32.c.
	* remote.c:  Use new serial interface.  More remote-xxx's to be
	converted later.
	* ser-bsd.c, ser-termios.c:  Removed.
	* serial.c:  New.  Implements common operations for all serial
	types.
	* ser-unix.c:  New.  Unix specific serial operations for various
	flavors of Unix (Posix, SysV, BSD).
	* serial.h:  Generic serial interface defs.
	* config/i386/go32.mh, config/i386/i386bsd.h,
	config/m68k/apollo68b.mh, config/sparc/sun4os4.mh:  Remove
	ser-bsd.o from XDEPFILES.  All the magic is now handled in
	configure.in.

1 files changed, 37 insertions, 42 deletions

diff --git a/gdb/serial.h b/gdb/serial.h
index 147873c51f2..767a91b3161 100644
--- a/gdb/serial.h
+++ b/gdb/serial.h
@@ -17,75 +17,70 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#ifdef __GO32__
+/* Terminal state pointer.  This is specific to each type of interface. */
 
-/* Then you use the asynctsr */
+typedef PTR ttystate;
 
-struct ttystate {
-	/* No members */
+struct _serial_t
+{
+  int fd;
+  struct serial_ops *ops;
+  ttystate ttystate;
+  int bufcnt;
+  unsigned char *bufp;
+  unsigned char buf[BUFSIZ];
 };
 
-#else
-#ifdef HAVE_TERMIO
-
-#include <termios.h>
-#include <unistd.h>
-
-struct ttystate
-{
-  int flags;			/* Flags from fcntl F_GETFL */
-  struct termios termios;	/* old tty driver settings */
+typedef struct _serial_t *serial_t;
+
+struct serial_ops {
+  char *name;
+  struct serial_ops *next;
+  int (*open) PARAMS ((serial_t, const char *name));
+  void (*close) PARAMS ((serial_t));
+  int (*readchar) PARAMS ((serial_t, int timeout));
+  int (*write) PARAMS ((serial_t, const char *str, int len));
+  void (*go_raw) PARAMS ((serial_t));
+  void (*restore) PARAMS ((serial_t));
+  int (*setbaudrate) PARAMS ((serial_t, int rate));
 };
 
-#else /* not HAVE_TERMIO */
+/* Add a new serial interface to the interface list */
 
-#include <sgtty.h>
+void serial_add_interface PARAMS ((struct serial_ops *optable));
 
-struct ttystate {
-  int flags;			/* Flags from fcntl F_GETFL */
-  struct sgttyb sgttyb;		/* old tty driver settings */
-};
+/* Try to open the serial device "name", returns a serial_t if ok, NULL if not.
+ */
 
-#endif /* not HAVE_TERMIO */
-#endif
-/* Return a sensible default name for a serial device, something which
-   can be used as an argument to serial_open.  */
-   
-const char *serial_default_name PARAMS ((void));
+serial_t serial_open PARAMS ((const char *name));
 
-/* Try to open the serial device "name", return 1 if ok, 0 if not.  */
+/* Internal open routine for specific I/O interface */
 
-int serial_open PARAMS ((const char *name));
+#define SERIAL_OPEN(SERIAL_T, NAME) (SERIAL_T)->ops->open((SERIAL_T), NAME)
 
 /* Turn the port into raw mode.  */
 
-void serial_raw PARAMS ((int fd, struct ttystate *oldstate));
-
-/* Turn the port into normal mode.  */
-
-void serial_normal PARAMS ((void));
+#define SERIAL_RAW(SERIAL_T) (SERIAL_T)->ops->go_raw((SERIAL_T))
 
 /* Read one char from the serial device with <TO>-second timeout.
    Returns char if ok, else EOF, -2 for timeout, -3 for anything else  */
 
-int serial_readchar PARAMS ((int to));
-
-/* Set the baudrate to the decimal value supplied, and return 1, or fail and
-   return 0.  */
+#define SERIAL_READCHAR(SERIAL_T, TIMEOUT) ((SERIAL_T)->ops->readchar((SERIAL_T), TIMEOUT))
 
-int serial_setbaudrate PARAMS ((int rate));
+/* Set the baudrate to the decimal value supplied.  Return 1 on failure,
+   0 otherwise.  */
 
-/* Return the next rate in the sequence, or return 0 for failure.  */
+#define SERIAL_SETBAUDRATE(SERIAL_T, RATE) ((SERIAL_T)->ops->setbaudrate((SERIAL_T), RATE))
 
 /* Write some chars to the device, returns 0 for failure.  See errno for
    details. */
 
-int serial_write PARAMS ((const char *str, int len));
+#define SERIAL_WRITE(SERIAL_T, STRING, LEN) ((SERIAL_T)->ops->write((SERIAL_T), STRING, LEN))
 
 /* Close the serial port */
 
-void serial_close PARAMS ((void));
+#define SERIAL_CLOSE(SERIAL_T) (SERIAL_T)->ops->close((SERIAL_T))
 
 /* Restore the serial port to the state saved in oldstate */
 
-void serial_restore PARAMS ((int desc, struct ttystate *oldstate));
+#define SERIAL_RESTORE(SERIAL_T) (SERIAL_T)->ops->restore((SERIAL_T))