diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bcce28e0d8..fd098d03b2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep  8 21:05:18 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* serial.h:  Fix prototye for serial_raw().
+	* ser-bsd.c, ser-termios.c:  Fix args for serial_open() &
+	serial_write() to match prototypes.
+	* remote-st2000.c (get_reg_name):  Make *p be const.
+
 Tue Sep  8 17:24:52 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
 	* remote-nindy.c (nindy_fetch_registers): Make return type void,
diff --git a/gdb/remote-st2000.c b/gdb/remote-st2000.c
index 4fddb3cfc5..0c70ec05ca 100644
--- a/gdb/remote-st2000.c
+++ b/gdb/remote-st2000.c
@@ -399,7 +399,8 @@ get_reg_name (regno)
      int regno;
 {
   static char buf[50];
-  char *p, *b;
+  const char *p;
+  char *b;
 
   b = buf;
 
diff --git a/gdb/ser-bsd.c b/gdb/ser-bsd.c
index 6479ba1656..45db6cc408 100644
--- a/gdb/ser-bsd.c
+++ b/gdb/ser-bsd.c
@@ -67,7 +67,7 @@ static fd_set readfds;
 
 int
 serial_open(name)
-     char *name;
+     const char *name;
 {
   struct sgttyb sgttyb;
 
@@ -198,7 +198,7 @@ serial_setbaudrate(rate)
 
 int
 serial_write(str, len)
-     char *str;
+     const char *str;
      int len;
 {
   int cc;
diff --git a/gdb/ser-termios.c b/gdb/ser-termios.c
index 0a11f08229..881689f13c 100644
--- a/gdb/ser-termios.c
+++ b/gdb/ser-termios.c
@@ -70,7 +70,7 @@ static fd_set readfds;
 
 int
 serial_open(name)
-     char *name;
+     const char *name;
 {
   struct termios termios;
 
@@ -193,7 +193,7 @@ serial_setbaudrate(rate)
 
 int
 serial_write(str, len)
-     char *str;
+     const char *str;
      int len;
 {
   int cc;
diff --git a/gdb/serial.h b/gdb/serial.h
index 2944bb66ce..796f2d2b8c 100644
--- a/gdb/serial.h
+++ b/gdb/serial.h
@@ -17,44 +17,6 @@ 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.  */
 
-/* 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));
-
-/* Try to open the serial device "name", return 1 if ok, 0 if not.  */
-
-int serial_open PARAMS ((const char *name));
-
-/* Turn the port into raw mode.  */
-
-void serial_raw PARAMS ((void));
-
-/* Turn the port into normal mode.  */
-
-void serial_normal PARAMS ((void));
-
-/* Read one char from the serial device with <TO>-second timeout.
-   Return char, and set ok if ok.  */
-
-int serial_timedreadchar PARAMS ((int to, int *ok));
-
-/* Set the baudrate to the decimal value supplied, and return 1, or fail and
-   return 0.  */
-
-int serial_setbaudrate PARAMS ((int rate));
-
-/* Return the next rate in the sequence, or return 0 for failure.  */
-
-/* Write some chars to the device, returns 0 for failure.  See errno for
-   details. */
-
-int serial_write PARAMS ((const char *str , int len));
-
-/* Close the serial port */
-
-void serial_close PARAMS ((void));
-
 #ifdef HAVE_TERMIO
 
 #include <termios.h>
@@ -76,3 +38,40 @@ struct ttystate {
 };
 
 #endif /* not HAVE_TERMIO */
+/* 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));
+
+/* Try to open the serial device "name", return 1 if ok, 0 if not.  */
+
+int serial_open PARAMS ((const char *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));
+
+/* Read one char from the serial device with <TO>-second timeout.
+   Return char, and set ok if ok.  */
+
+int serial_timedreadchar PARAMS ((int to, int *ok));
+
+/* Set the baudrate to the decimal value supplied, and return 1, or fail and
+   return 0.  */
+
+int serial_setbaudrate PARAMS ((int rate));
+
+/* Return the next rate in the sequence, or return 0 for failure.  */
+
+/* Write some chars to the device, returns 0 for failure.  See errno for
+   details. */
+
+int serial_write PARAMS ((const char *str, int len));
+
+/* Close the serial port */
+
+void serial_close PARAMS ((void));