diff options
| author | Jim Blandy <jimb@codesourcery.com> | 2007-10-12 20:14:57 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@codesourcery.com> | 2007-10-12 20:14:57 +0000 |
| commit | d41ebd5d4581711edf913325b602d70dbf98bc51 (patch) | |
| tree | b5e47739d34026984b6f9824cbdb68006913b71b | |
| parent | e03748586c49e8ad61ee2e4103668eb4ba3fc0e3 (diff) | |
| download | gdb-d41ebd5d4581711edf913325b602d70dbf98bc51.zip gdb-d41ebd5d4581711edf913325b602d70dbf98bc51.tar.gz gdb-d41ebd5d4581711edf913325b602d70dbf98bc51.tar.bz2 | |
* serial.h (struct serial_ops): Document read_prim to return zero
at EOF.
* ser-base.c (do_ser_base_readchar): Return SERIAL_EOF when
read_prim returns zero, not SERIAL_TIMEOUT.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/ser-base.c | 4 | ||||
| -rw-r--r-- | gdb/serial.h | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ed2abe5..21d2bc4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2007-10-12 Jim Blandy <jimb@codesourcery.com> + + * serial.h (struct serial_ops): Document read_prim to return zero + at EOF. + * ser-base.c (do_ser_base_readchar): Return SERIAL_EOF when + read_prim returns zero, not SERIAL_TIMEOUT. + 2007-10-12 Ulrich Weigand <uweigand@de.ibm.com> * alpha-mdebug-tdep.c: Include "gdb_string.h". diff --git a/gdb/ser-base.c b/gdb/ser-base.c index f0f5b57..8fdfd25 100644 --- a/gdb/ser-base.c +++ b/gdb/ser-base.c @@ -279,9 +279,7 @@ do_ser_base_readchar (struct serial *scb, int timeout) if (status <= 0) { if (status == 0) - /* 0 chars means timeout. (We may need to distinguish between EOF - & timeouts someday.) */ - return SERIAL_TIMEOUT; + return SERIAL_EOF; else /* Got an error from read. */ return SERIAL_ERROR; diff --git a/gdb/serial.h b/gdb/serial.h index 1fc502b..4260429 100644 --- a/gdb/serial.h +++ b/gdb/serial.h @@ -244,7 +244,7 @@ struct serial_ops interesting. */ void (*async) (struct serial *scb, int async_p); /* Perform a low-level read operation, reading (at most) COUNT - bytes into SCB->BUF. */ + bytes into SCB->BUF. Return zero at end of file. */ int (*read_prim)(struct serial *scb, size_t count); /* Perform a low-level write operation, writing (at most) COUNT bytes from BUF. */ |