Backport from mainline:

        2005-03-25  Mark Mitchell  <mark@codesourcery.com>
	* ser-base.c (ser_unix_write): Rename to ...
	(ser_base_write): ... this.
	(ser_unix_nop_flush_output): Rename to ...
	(ser_base_flush_output): ... this.
	(ser_unix_flush_input): Rename to ...
	(ser_base_flush_input): ... this.
	(ser_unix_nop_send_break): Rename to ...
	(ser_base_send_break): ... this.
	(ser_unix_nop_drain_output): Rename to ...
	(ser_base_drain_output): ... this.
	(ser_unix_nop_raw): Rename to ...
	(ser_base_raw): ... this.
	(ser_unix_nop_get_tty_state): Rename to ...
	(ser_base_set_tty_state): ... this.
	(ser_unix_nop_noflush_set_tty_state): Rename to ...
	(ser_base_noflush_set_tty_state): ... this.
	(ser_unix_nop_print_tty_state): Rename to ...
	(ser_base_print_tty_state): ... this.
	(ser_unix_nop_setbaudrate): Rename to ...
	(ser_base_setbaudrate): ... this.
	(ser_unix_nop_setstopbits): Rename to ...
	(ser_base_setstopbits): ... this.
	(ser_unix_async): Rename to ...
	(ser_base_async): ... this.
	* ser-base.h (ser_unix_write): Rename to ...
	(ser_base_write): ... this.
	(ser_unix_nop_flush_output): Rename to ...
	(ser_base_flush_output): ... this.
	(ser_unix_flush_input): Rename to ...
	(ser_base_flush_input): ... this.
	(ser_unix_nop_send_break): Rename to ...
	(ser_base_send_break): ... this.
	(ser_unix_nop_drain_output): Rename to ...
	(ser_base_drain_output): ... this.
	(ser_unix_nop_raw): Rename to ...
	(ser_base_raw): ... this.
	(ser_unix_nop_get_tty_state): Rename to ...
	(ser_base_set_tty_state): ... this.
	(ser_unix_nop_noflush_set_tty_state): Rename to ...
	(ser_base_noflush_set_tty_state): ... this.
	(ser_unix_nop_print_tty_state): Rename to ...
	(ser_base_print_tty_state): ... this.
	(ser_unix_nop_setbaudrate): Rename to ...
	(ser_base_setbaudrate): ... this.
	(ser_unix_nop_setstopbits): Rename to ...
	(ser_base_setstopbits): ... this.
	(ser_unix_async): Rename to ...
	(ser_base_async): ... this.
	* ser-pipe.c (_initialize_ser_pipe): Update accordingly.
	* ser-tcp.c (_initialize_ser_tcp): Likewise.
	* ser-unix.c (hardwire_flush_input): Likewise.
	(_initializer_ser_hardwire): Likewise.

4 files changed, 86 insertions, 29 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 55aaed5a860..3c57708d4d7 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,62 @@
 2005-03-28  Mark Mitchell  <mark@codesourcery.com>
 
+	Backport from mainline:
+        2005-03-25  Mark Mitchell  <mark@codesourcery.com>
+	* ser-base.c (ser_unix_write): Rename to ...
+	(ser_base_write): ... this.
+	(ser_unix_nop_flush_output): Rename to ...
+	(ser_base_flush_output): ... this.
+	(ser_unix_flush_input): Rename to ...
+	(ser_base_flush_input): ... this.
+	(ser_unix_nop_send_break): Rename to ...
+	(ser_base_send_break): ... this.
+	(ser_unix_nop_drain_output): Rename to ...
+	(ser_base_drain_output): ... this.
+	(ser_unix_nop_raw): Rename to ...
+	(ser_base_raw): ... this.
+	(ser_unix_nop_get_tty_state): Rename to ...
+	(ser_base_set_tty_state): ... this.
+	(ser_unix_nop_noflush_set_tty_state): Rename to ...
+	(ser_base_noflush_set_tty_state): ... this.
+	(ser_unix_nop_print_tty_state): Rename to ...
+	(ser_base_print_tty_state): ... this.
+	(ser_unix_nop_setbaudrate): Rename to ...
+	(ser_base_setbaudrate): ... this.
+	(ser_unix_nop_setstopbits): Rename to ...
+	(ser_base_setstopbits): ... this.
+	(ser_unix_async): Rename to ...
+	(ser_base_async): ... this.
+	* ser-base.h (ser_unix_write): Rename to ...
+	(ser_base_write): ... this.
+	(ser_unix_nop_flush_output): Rename to ...
+	(ser_base_flush_output): ... this.
+	(ser_unix_flush_input): Rename to ...
+	(ser_base_flush_input): ... this.
+	(ser_unix_nop_send_break): Rename to ...
+	(ser_base_send_break): ... this.
+	(ser_unix_nop_drain_output): Rename to ...
+	(ser_base_drain_output): ... this.
+	(ser_unix_nop_raw): Rename to ...
+	(ser_base_raw): ... this.
+	(ser_unix_nop_get_tty_state): Rename to ...
+	(ser_base_set_tty_state): ... this.
+	(ser_unix_nop_noflush_set_tty_state): Rename to ...
+	(ser_base_noflush_set_tty_state): ... this.
+	(ser_unix_nop_print_tty_state): Rename to ...
+	(ser_base_print_tty_state): ... this.
+	(ser_unix_nop_setbaudrate): Rename to ...
+	(ser_base_setbaudrate): ... this.
+	(ser_unix_nop_setstopbits): Rename to ...
+	(ser_base_setstopbits): ... this.
+	(ser_unix_async): Rename to ...
+	(ser_base_async): ... this.
+	* ser-pipe.c (_initialize_ser_pipe): Update accordingly.
+	* ser-tcp.c (_initialize_ser_tcp): Likewise.
+	* ser-unix.c (hardwire_flush_input): Likewise.
+	(_initializer_ser_hardwire): Likewise.
+
+2005-03-28  Mark Mitchell  <mark@codesourcery.com>
+
 	Backport from mainline.
 	2005-03-22  Mark Mitchell  <mark@codesourcery.com>
 	* Makefile.in (SFILES): Add ser-base.c.
diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c
index c5129c766c5..b6bb8d5f4eb 100644
--- a/gdb/ser-pipe.c
+++ b/gdb/ser-pipe.c
@@ -145,18 +145,18 @@ _initialize_ser_pipe (void)
   ops->open = pipe_open;
   ops->close = pipe_close;
   ops->readchar = ser_unix_readchar;
-  ops->write = ser_unix_write;
-  ops->flush_output = ser_unix_nop_flush_output;
-  ops->flush_input = ser_unix_flush_input;
-  ops->send_break = ser_unix_nop_send_break;
-  ops->go_raw = ser_unix_nop_raw;
-  ops->get_tty_state = ser_unix_nop_get_tty_state;
-  ops->set_tty_state = ser_unix_nop_set_tty_state;
-  ops->print_tty_state = ser_unix_nop_print_tty_state;
-  ops->noflush_set_tty_state = ser_unix_nop_noflush_set_tty_state;
-  ops->setbaudrate = ser_unix_nop_setbaudrate;
-  ops->setstopbits = ser_unix_nop_setstopbits;
-  ops->drain_output = ser_unix_nop_drain_output;
-  ops->async = ser_unix_async;
+  ops->write = ser_base_write;
+  ops->flush_output = ser_base_flush_output;
+  ops->flush_input = ser_base_flush_input;
+  ops->send_break = ser_base_send_break;
+  ops->go_raw = ser_base_raw;
+  ops->get_tty_state = ser_base_get_tty_state;
+  ops->set_tty_state = ser_base_set_tty_state;
+  ops->print_tty_state = ser_base_print_tty_state;
+  ops->noflush_set_tty_state = ser_base_noflush_set_tty_state;
+  ops->setbaudrate = ser_base_setbaudrate;
+  ops->setstopbits = ser_base_setstopbits;
+  ops->drain_output = ser_base_drain_output;
+  ops->async = ser_base_async;
   serial_add_interface (ops);
 }
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index cb9ddd0ba21..f908d258b5f 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -216,18 +216,18 @@ _initialize_ser_tcp (void)
   ops->open = net_open;
   ops->close = net_close;
   ops->readchar = ser_unix_readchar;
-  ops->write = ser_unix_write;
-  ops->flush_output = ser_unix_nop_flush_output;
-  ops->flush_input = ser_unix_flush_input;
-  ops->send_break = ser_unix_nop_send_break;
-  ops->go_raw = ser_unix_nop_raw;
-  ops->get_tty_state = ser_unix_nop_get_tty_state;
-  ops->set_tty_state = ser_unix_nop_set_tty_state;
-  ops->print_tty_state = ser_unix_nop_print_tty_state;
-  ops->noflush_set_tty_state = ser_unix_nop_noflush_set_tty_state;
-  ops->setbaudrate = ser_unix_nop_setbaudrate;
-  ops->setstopbits = ser_unix_nop_setstopbits;
-  ops->drain_output = ser_unix_nop_drain_output;
-  ops->async = ser_unix_async;
+  ops->write = ser_base_write;
+  ops->flush_output = ser_base_flush_output;
+  ops->flush_input = ser_base_flush_input;
+  ops->send_break = ser_base_send_break;
+  ops->go_raw = ser_base_raw;
+  ops->get_tty_state = ser_base_get_tty_state;
+  ops->set_tty_state = ser_base_set_tty_state;
+  ops->print_tty_state = ser_base_print_tty_state;
+  ops->noflush_set_tty_state = ser_base_noflush_set_tty_state;
+  ops->setbaudrate = ser_base_setbaudrate;
+  ops->setstopbits = ser_base_setstopbits;
+  ops->drain_output = ser_base_drain_output;
+  ops->async = ser_base_async;
   serial_add_interface (ops);
 }
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index 4f709de2016..14df459b723 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -329,7 +329,7 @@ hardwire_flush_output (struct serial *scb)
 static int
 hardwire_flush_input (struct serial *scb)
 {
-  ser_unix_flush_input (scb);
+  ser_base_flush_input (scb);
 
 #ifdef HAVE_TERMIOS
   return tcflush (scb->fd, TCIFLUSH);
@@ -1062,7 +1062,7 @@ _initialize_ser_hardwire (void)
      the old TERMIOS/SGTTY/... timer code has been flushed. cagney
      1999-09-16. */
   ops->readchar = hardwire_readchar;
-  ops->write = ser_unix_write;
+  ops->write = ser_base_write;
   ops->flush_output = hardwire_flush_output;
   ops->flush_input = hardwire_flush_input;
   ops->send_break = hardwire_send_break;
@@ -1074,6 +1074,6 @@ _initialize_ser_hardwire (void)
   ops->setbaudrate = hardwire_setbaudrate;
   ops->setstopbits = hardwire_setstopbits;
   ops->drain_output = hardwire_drain_output;
-  ops->async = ser_unix_async;
+  ops->async = ser_base_async;
   serial_add_interface (ops);
 }