From b450502905875e85aab17371f78bb6befe5a3059 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Thu, 21 Apr 2005 05:34:33 +0000 Subject: * configure.ac: On MinGW, define USE_WIN32API and link with -lws2_32. * ser-tcp.c (): Include, for Windows. (ETIMEDOUT): Define, for Windows. (ioctl): Likewise. (closesocket): Define, for POSIX. (net_open): Adjust for differences in socket functions between Windows and UNIX. (net_close): Likweise. (net_read_prim): New function. (net_write_prim): Likewise. (_initialize_ser_tcp): Initialize winsock. Fill in read_prim and write_prim. * ser-unix.h (ser_unix_readcchar): Remove. (ser_unix_read_prim): Declare. (ser_unix_write_prim): Likewise. * ser-unix.c (generic_readchar): Move to ser-base.c. (ser_unix_wait_for): Likewise. (do_unix_readchar): Likewise. (ser_unix_readchar): Likewise. (_initialize_ser_hardwire): Initialize read_prim and write_prim. (ser_unix_read_prim): New function. (ser_unix_write_prim): Likewise. * ser-base.h (generic_readchar): Declare. (ser_base_readchar): Likewise. * ser-base.c (): Include, for windows. (fd_event): Use the read primitive specified by the serial interface. (ser_base_wait_for): Moved from ser-unix.c (do_ser_base_read_char): Likewise. (generic_readchar): Likewise. (ser_base_readchar): Likewise. (ser_base_write): Use the write primitive specified by the serial interface. * ser-pipe.c (_initialize_ser_pipe): Use ser_base_readchar, not ser_unix_readchar. Initialize read_prim and write_prim. * serial.c (struct serial_ops): Add read_prim and write_prim. * configure: Regenerate. --- gdb/ser-base.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gdb/ser-base.h') diff --git a/gdb/ser-base.h b/gdb/ser-base.h index 5467fc8..8604629 100644 --- a/gdb/ser-base.h +++ b/gdb/ser-base.h @@ -25,6 +25,9 @@ struct serial; struct ui_file; +extern int generic_readchar (struct serial *scb, int timeout, + int (*do_readchar) (struct serial *scb, + int timeout)); extern void reschedule (struct serial *scb); extern int ser_base_flush_output (struct serial *scb); extern int ser_base_flush_input (struct serial *scb); @@ -46,5 +49,6 @@ extern int ser_base_drain_output (struct serial *scb); extern int ser_base_write (struct serial *scb, const char *str, int len); extern void ser_base_async (struct serial *scb, int async_p); +extern int ser_base_readchar (struct serial *scb, int timeout); #endif -- cgit v1.1