From 934ec87c6b17ba28fa03d881f42e4756b14272f4 Mon Sep 17 00:00:00 2001
From: Stu Grossman <grossman@cygnus>
Date: Mon, 16 Oct 1995 18:41:17 +0000
Subject: [PATCH] 	* sparcl-tdep.c:  Cleanup serial error handling.

---
 gdb/ChangeLog     |  4 ++++
 gdb/sparcl-tdep.c | 47 +++++++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 29e03c0532..5b23373ba3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 16 11:27:06 1995  Stu Grossman  (grossman@cygnus.com)
+
+	* sparcl-tdep.c:  Cleanup serial error handling.
+
 Sun Oct 15 16:19:27 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* rs6000-tdep.c: Don't include a.out.h, improve some formatting.
diff --git a/gdb/sparcl-tdep.c b/gdb/sparcl-tdep.c
index 0d081ec643..b97496d31f 100644
--- a/gdb/sparcl-tdep.c
+++ b/gdb/sparcl-tdep.c
@@ -296,28 +296,37 @@ open_tty (name)
   return desc;
 }
 
+/* Read a single character from the remote end, masking it down to 7 bits. */
+
+static int
+readchar (desc, timeout)
+     serial_t desc;
+     int timeout;
+{
+  int ch;
+
+  ch = SERIAL_READCHAR (desc, timeout);
+
+  switch (ch)
+    {
+    case SERIAL_EOF:
+      error ("SPARClite remote connection closed");
+    case SERIAL_ERROR:
+      perror_with_name ("SPARClite communication error");
+    case SERIAL_TIMEOUT:
+      error ("SPARClite remote timeout");
+    default:
+      return ch;
+    }
+}
+
 static int
 send_resp (desc, c)
      serial_t desc;
      char c;
 {
-  int i;
-
   SERIAL_WRITE (desc, &c, 1);
-  i = SERIAL_READCHAR (desc, 2);
-
-  if (i >= 0)
-    return i;
-
-  switch (i)
-    {
-    case SERIAL_ERROR:
-      perror_with_name ("Remote communication error");
-    case SERIAL_TIMEOUT:
-      error ("Remote timeout");
-    case SERIAL_EOF:
-      error ("Remote connection closed");
-    }
+  return readchar (desc, 2);
 }
 
 static void
@@ -652,7 +661,7 @@ sparclite_serial_start (entry)
   store_unsigned_integer (buffer + 1, 4, entry);
 
   SERIAL_WRITE (remote_desc, buffer, 1 + 4);
-  i = SERIAL_READCHAR (remote_desc, 2);
+  i = readchar (remote_desc, 2);
   if (i != 0x55)
     error ("Can't start SparcLite.  Error code %d\n", i);
 }
@@ -684,9 +693,7 @@ sparclite_serial_write (from_bfd, from_sec, from_addr, to_addr, len)
     error ("Bad response from load command (0x%x)", i);
 
   SERIAL_WRITE (remote_desc, buffer, 4 + 4 + len);
-  i = SERIAL_READCHAR (remote_desc, 2);
-  if (i < 0)
-    error ("I/O error in serial code.  Return code %d\n", i);
+  i = readchar (remote_desc, 2);
 
   if (i != checksum)
     error ("Bad checksum from load command (0x%x)", i);