diff options
| author | Daniel Jacobowitz <drow@false.org> | 2006-02-10 22:01:43 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2006-02-10 22:01:43 +0000 |
| commit | 0ea3f30e219bd42259f09f68bcd605bf4ed4a1ea (patch) | |
| tree | 07c791175cea3abee634fa9ccec99e18031ed5cd /gdb/ser-unix.c | |
| parent | 121ce6e53dd5751c6938ab86cbec2742702d06eb (diff) | |
| download | gdb-0ea3f30e219bd42259f09f68bcd605bf4ed4a1ea.zip gdb-0ea3f30e219bd42259f09f68bcd605bf4ed4a1ea.tar.gz gdb-0ea3f30e219bd42259f09f68bcd605bf4ed4a1ea.tar.bz2 | |
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
Diffstat (limited to 'gdb/ser-unix.c')
| -rw-r--r-- | gdb/ser-unix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c index 4a40c36..7c10815 100644 --- a/gdb/ser-unix.c +++ b/gdb/ser-unix.c @@ -31,6 +31,7 @@ #include <sys/socket.h> #include <sys/time.h> +#include "gdb_select.h" #include "gdb_string.h" #ifdef HAVE_TERMIOS @@ -365,7 +366,7 @@ hardwire_send_break (struct serial *scb) the full length of time. I think that is OK. */ timeout.tv_sec = 0; timeout.tv_usec = 250000; - select (0, 0, 0, 0, &timeout); + gdb_select (0, 0, 0, 0, &timeout); status = ioctl (scb->fd, TIOCCBRK, 0); return status; } @@ -448,9 +449,9 @@ wait_for (struct serial *scb, int timeout) FD_SET (scb->fd, &readfds); if (timeout >= 0) - numfds = select (scb->fd + 1, &readfds, 0, 0, &tv); + numfds = gdb_select (scb->fd + 1, &readfds, 0, 0, &tv); else - numfds = select (scb->fd + 1, &readfds, 0, 0, 0); + numfds = gdb_select (scb->fd + 1, &readfds, 0, 0, 0); if (numfds <= 0) if (numfds == 0) |