* monitor.c: General gcc -Wall lint cleanup and reformat.

	(monitor_command): If no args, send an empty command.

1 files changed, 1022 insertions, 912 deletions

diff --git a/gdb/monitor.c b/gdb/monitor.c
index 1f72153..a44abf2 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -1,5 +1,5 @@
 /* Remote debugging interface for boot monitors, for GDB.
-   Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1995 Free Software Foundation, Inc.
    Contributed by Cygnus Support. Written by Rob Savoye for Cygnus.
 
 This file is part of GDB.
@@ -26,8 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This module talks to a debug monitor called 'MONITOR', which
    We communicate with MONITOR via either a direct serial line, or a TCP
    (or possibly TELNET) stream to a terminal multiplexor,
-   which in turn talks to the target board.
-*/
+   which in turn talks to the target board.  */
 
 #include "defs.h"
 #include "gdbcore.h"
@@ -59,8 +58,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define  CSTOPB  0x00000040
 #endif
 
-static const char hexchars[]="0123456789abcdef";
-static char *hex2mem();
+static const char hexchars[] = "0123456789abcdef";
+static char *hex2mem ();
 
 #define SWAP_TARGET_AND_HOST(buffer,len) 				\
   do									\
@@ -80,19 +79,29 @@ static char *hex2mem();
     }									\
   while (0)
 
-static void make_xmodem_packet();
-static void print_xmodem_packet();
-static void make_gdb_packet();
-static unsigned long ascii2hexword();
-static char *hexword2ascii();
-static int tohex();
-static int to_hex();
-static int from_hex();
+static void make_xmodem_packet ();
+static void print_xmodem_packet ();
+static void make_gdb_packet ();
+
+static void monitor_load_ascii_srec PARAMS ((char *file, int fromtty));
+
+static int monitor_make_srec PARAMS ((char *buffer, int type,
+				      CORE_ADDR memaddr,
+				      unsigned char *myaddr, int len));
+
+static unsigned long ascii2hexword ();
+static char *hexword2ascii ();
+static int tohex ();
+static int to_hex ();
+static int from_hex ();
 
 struct monitor_ops *current_monitor;
+
 extern struct cmd_list_element *setlist;
 extern struct cmd_list_element *unsetlist;
+
 struct cmd_list_element *showlist;
+
 extern char *version;
 extern char *host_name;
 extern char *target_name;
@@ -105,31 +114,32 @@ FILE *log_file;
 #endif
 
 static int timeout = 30;
+
 /* Having this larger than 400 causes us to be incompatible with m68k-stub.c
    and i386-stub.c.  Normally, no one would notice because it only matters
    for writing large chunks of memory (e.g. in downloads).  Also, this needs
    to be more than 400 if required to hold the registers (see below, where
    we round it up based on REGISTER_BYTES).  */
+
 #define PBUFSIZ 400
 
-/* 
- * Descriptor for I/O to remote machine.  Initialize it to NULL so that
- * monitor_open knows that we don't have a file open when the program starts.
- */
+/* Descriptor for I/O to remote machine.  Initialize it to NULL so
+   that monitor_open knows that we don't have a file open when the
+   program starts.  */
+
 serial_t monitor_desc = NULL;
 
 /* sets the download protocol, choices are srec, generic, boot */
 char *loadtype;
+
 static char *loadtype_str;
 static char *loadproto_str;
 static void set_loadtype_command();
 static void set_loadproto_command();
 static void monitor_load_srec();
-static int monitor_write_srec();
 
-/*
- * these definitions are for xmodem protocol
- */
+/* These definitions are for xmodem protocol. */
+
 #define SOH	0x01
 #define ACK	0x06
 #define NAK	0x15
@@ -214,55 +224,52 @@ set_loadproto_command (ignore, from_tty, c)
   error ("Load protocol \"%s\" does not exist.", (*(char **) c->var));
 }
 
-/*
- * printf_monitor -- send data to monitor.  Works just like printf.
- */
+/* printf_monitor -- send data to monitor.  Works just like printf. */
+
 static void
-printf_monitor(va_alist)
+printf_monitor (va_alist)
      va_dcl
 {
   va_list args;
   char *pattern;
   char buf[PBUFSIZ];
-  int i;
 
-  va_start(args);
+  va_start (args);
 
-  pattern = va_arg(args, char *);
+  pattern = va_arg (args, char *);
 
-  vsprintf(buf, pattern, args);
+  vsprintf (buf, pattern, args);
 
   debuglogs (1, "printf_monitor(), Sending: \"%s\".", buf);
 
-  if (strlen(buf) > PBUFSIZ)
+  if (strlen (buf) > PBUFSIZ)
     error ("printf_monitor(): string too long");
-  if (SERIAL_WRITE(monitor_desc, buf, strlen(buf)))
-    fprintf(stderr, "SERIAL_WRITE failed: %s\n", safe_strerror(errno));
+  if (SERIAL_WRITE(monitor_desc, buf, strlen (buf)))
+    fprintf (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror (errno));
 }
-/*
- * write_monitor -- send raw data to monitor.
- */
+
+/* Send raw data to monitor.  */
+
 static void
-write_monitor(data, len)
-     char data[];
+write_monitor (data, len)
+     char *data;
      int len;
 {
-  if (SERIAL_WRITE(monitor_desc, data, len))
-    fprintf(stderr, "SERIAL_WRITE failed: %s\n", safe_strerror(errno));
+  if (SERIAL_WRITE (monitor_desc, data, len))
+    fprintf (stderr, "SERIAL_WRITE failed: %s\n", safe_strerror(errno));
  
-  *(data + len+1) = '\0';
+  *(data + len + 1) = '\0';
   debuglogs (1, "write_monitor(), Sending: \"%s\".", data);
-
 }
 
-/*
- * debuglogs -- deal with debugging info to multiple sources. This takes
- *	two real args, the first one is the level to be compared against 
- *	the sr_get_debug() value, the second arg is a printf buffer and args
- *	to be formatted and printed. A CR is added after each string is printed.
- */
+/* Deal with debugging info to multiple sources. This takes two real
+   args, the first one is the level to be compared against the
+   sr_get_debug() value, the second arg is a printf buffer and args to
+   be formatted and printed. A CR is added after each string is
+   printed.  */
+
 void
-debuglogs(va_alist)
+debuglogs (va_alist)
      va_dcl
 {
   va_list args;
@@ -274,85 +281,95 @@ debuglogs(va_alist)
   va_start(args);
 
   level = va_arg(args, int);			/* get the debug level */
-  if ((level <0) || (level > 100)) {
-    error ("Bad argument passed to debuglogs(), needs debug level");
-    return;
-  }
+  if ((level < 0) || (level > 100))
+    {
+      error ("Bad argument passed to debuglogs(), needs debug level");
+      return;
+    }
       
-  pattern = va_arg(args, char *);		/* get the printf style pattern */
+  pattern = va_arg(args, char *);	/* get the printf style pattern */
 
   vsprintf(buf, pattern, args);			/* format the string */
   
   /* convert some characters so it'll look right in the log */
   p = newbuf;
-  for (i = 0 ; buf[i] != '\0'; i++) {
-    if (i > PBUFSIZ)
-      error ("Debug message too long");
-    switch (buf[i]) {
-    case '\n':					/* newlines */
-      *p++ = '\\';
-      *p++ = 'n';
-      continue;
-    case '\r':					/* carriage returns */
-      *p++ = '\\';
-      *p++ = 'r';
-      continue;
-    case '\033':				/* escape */
-      *p++ = '\\';
-      *p++ = 'e';
-      continue;
-    case '\t':					/* tab */
-      *p++ = '\\';
-      *p++ = 't';
-      continue;
-    case '\b':					/* backspace */
-      *p++ = '\\';
-      *p++ = 'b';
-      continue;
-    default:					/* no change */
-      *p++ = buf[i];
-    }
+  for (i = 0 ; buf[i] != '\0'; i++)
+    {
+      if (i > PBUFSIZ)
+	error ("Debug message too long");
+      switch (buf[i]) 
+	{
+	case '\n':					/* newlines */
+	  *p++ = '\\';
+	  *p++ = 'n';
+	  continue;
+	case '\r':					/* carriage returns */
+	  *p++ = '\\';
+	  *p++ = 'r';
+	  continue;
+	case '\033':				/* escape */
+	  *p++ = '\\';
+	  *p++ = 'e';
+	  continue;
+	case '\t':					/* tab */
+	  *p++ = '\\';
+	  *p++ = 't';
+	  continue;
+	case '\b':					/* backspace */
+	  *p++ = '\\';
+	  *p++ = 'b';
+	  continue;
+	default:					/* no change */
+	  *p++ = buf[i];
+	}
 
-    if (buf[i] < 26) {				/* modify control characters */
-      *p++ = '^';
-      *p++ = buf[i] + 'A';
-      continue;
-    }
-     if (buf[i] >= 128) {			/* modify control characters */
-      *p++ = '!';
-      *p++ = buf[i] + 'A';
-      continue;
+      /* modify control characters */
+      if (buf[i] < 26)
+	{
+	  *p++ = '^';
+	  *p++ = buf[i] + 'A';
+	  continue;
+	}
+
+      /* modify control characters */
+     if (buf[i] >= 128)
+       {
+	 *p++ = '!';
+	 *p++ = buf[i] + 'A';
+	 continue;
+       }
     }
- }
   *p = '\0';					/* terminate the string */
 
-  if (sr_get_debug() > level)
+  if (sr_get_debug () > level)
     printf_unfiltered ("%s\n", newbuf);
 
 #ifdef LOG_FILE					/* write to the monitor log */
-  if (log_file != 0x0) {
-    fputs (newbuf, log_file);
-    fputc ('\n', log_file);
-    fflush (log_file);
-  }
+  if (log_file != 0x0)
+    {
+      fputs (newbuf, log_file);
+      fputc ('\n', log_file);
+      fflush (log_file);
+    }
 #endif
 }
 
-/* readchar -- read a character from the remote system, doing all the fancy
- *	timeout stuff.
- */
+/* Read a character from the remote system, doing all the fancy
+   timeout stuff.  */
+
 static int
-readchar(timeout)
+readchar (timeout)
      int timeout;
 {
   int c;
 
-  c = SERIAL_READCHAR(monitor_desc, timeout);
+  c = SERIAL_READCHAR (monitor_desc, timeout);
 
-  if (sr_get_debug() > 5) {
-    putchar(c & 0x7f);
-    debuglogs (5, "readchar: timeout = %d\n", timeout);
-  }
+  if (sr_get_debug () > 5)
+    {
+      putchar (c & 0x7f);
+      debuglogs (5, "readchar: timeout = %d\n", timeout);
+    }
 
 #ifdef LOG_FILE
   if (isascii (c))
@@ -362,22 +379,22 @@ readchar(timeout)
   if (c >= 0)
     return c & 0x7f;
 
-  if (c == SERIAL_TIMEOUT) {
-    if (timeout == 0)
-      return c;		/* Polls shouldn't generate timeout errors */
-    error("Timeout reading from remote system.");
+  if (c == SERIAL_TIMEOUT)
+    {
+      if (timeout == 0)
+	return c;		/* Polls shouldn't generate timeout errors */
+      error ("Timeout reading from remote system.");
 #ifdef LOG_FILE
       fputs ("ERROR: Timeout reading from remote system", log_file);
 #endif
-  }
-  perror_with_name("remote-monitor");
+    }
+  perror_with_name ("remote-monitor");
 }
 
-/* 
- * expect --  scan input from the remote system, until STRING is found.
- *	If DISCARD is non-zero, then discard non-matching input, else print
- *	it out. Let the user break out immediately.
- */
+/* Scan input from the remote system, until STRING is found.  If
+   DISCARD is non-zero, then discard non-matching input, else print it
+   out. Let the user break out immediately.  */
+
 static void
 expect (string, discard)
      char *string;
@@ -386,32 +403,37 @@ expect (string, discard)
   char *p = string;
   int c;
 
-
   debuglogs (1, "Expecting \"%s\".", string);
 
   immediate_quit = 1;
-  while (1) {
-    c = readchar(timeout);
-    if (!isascii (c))
-      continue;
-    if (c == *p++) {
-      if (*p == '\0') {
-	immediate_quit = 0;
-	debuglogs (4, "Matched");
-	return;
-      }
-    } else {
-      if (!discard) {
-	putc_unfiltered (c);
+  while (1)
+    {
+      c = readchar (timeout);
+      if (!isascii (c))
+	continue;
+      if (c == *p++)
+	{
+	  if (*p == '\0')
+	    {
+	      immediate_quit = 0;
+	      debuglogs (4, "Matched");
+	      return;
+	    }
+	}
+      else
+	{
+	  if (!discard)
+	    {
+	      putc_unfiltered (c);
 #if 0
-	fwrite(string, 1, (p - 1) - string, stdout);
-	putchar((char)c);
-	fflush(stdout);
+	      fwrite(string, 1, (p - 1) - string, stdout);
+	      putchar ((char)c);
+	      fflush (stdout);
 #endif
-      }
-      p = string;
+	    }
+	  p = string;
+	}
     }
-  }
 }
 
 /* Keep discarding input until we see the MONITOR prompt.
@@ -428,82 +450,89 @@ expect (string, discard)
    Note that this includes abnormal exit, e.g. error().  This is
    necessary to prevent getting into states from which we can't
    recover.  */
+
 static void
-expect_prompt(discard)
+expect_prompt (discard)
      int discard;
 {
   expect (PROMPT, discard);
 }
 
-/*
- * junk -- ignore junk characters. Returns a 1 if junk, 0 otherwise
- */
+/* Ignore junk characters. Returns a 1 if junk, 0 otherwise.  */
+
 static int
-junk(ch)
+junk (ch)
      char ch;
 {
-  switch (ch) {
-  case '\0':
-  case ' ':
-  case '-':
-  case '\t':
-  case '\r':
-  case '\n':
-    if (sr_get_debug() > 5)
-      debuglogs (5, "Ignoring \'%c\'.", ch);
-    return 1;
-  default:
-    if (sr_get_debug() > 5)
-      debuglogs (5, "Accepting \'%c\'.", ch);
-    return 0;
-  }
+  switch (ch)
+    {
+    case '\0':
+    case ' ':
+    case '-':
+    case '\t':
+    case '\r':
+    case '\n':
+      if (sr_get_debug () > 5)
+	debuglogs (5, "Ignoring \'%c\'.", ch);
+      return 1;
+    default:
+      if (sr_get_debug () > 5)
+	debuglogs (5, "Accepting \'%c\'.", ch);
+      return 0;
+    }
 }
 
-/* 
- *  get_hex_digit -- Get a hex digit from the remote system & return its value.
- *		If ignore is nonzero, ignore spaces, newline & tabs.
- */
+/* Get a hex digit from the remote system & return its value.  If
+   ignore is nonzero, ignore spaces, newline & tabs.  */
+
 static int
-get_hex_digit(ignore)
+get_hex_digit (ignore)
      int ignore;
 {
   static int ch;
-  while (1) {
-    ch = readchar(timeout);
-    if (junk(ch))
-      continue;
-    if (sr_get_debug() > 4) {
-      debuglogs (4, "get_hex_digit() got a 0x%x(%c)", ch, ch);
-    } else {
+
+  while (1)
+    {
+      ch = readchar (timeout);
+      if (junk (ch))
+	continue;
+      if (sr_get_debug () > 4)
+	{
+	  debuglogs (4, "get_hex_digit() got a 0x%x(%c)", ch, ch);
+	}
+      else
+	{
 #ifdef LOG_FILE					/* write to the monitor log */
-      if (log_file != 0x0) {
-	fputs ("get_hex_digit() got a 0x", log_file);
-	fputc (ch, log_file);
-	fputc ('\n', log_file);
-	fflush (log_file);
-      }
+	  if (log_file != 0x0)
+	    {
+	      fputs ("get_hex_digit() got a 0x", log_file);
+	      fputc (ch, log_file);
+	      fputc ('\n', log_file);
+	      fflush (log_file);
+	    }
 #endif
-    }
+	}
 
-    if (ch >= '0' && ch <= '9')
-      return ch - '0';
-    else if (ch >= 'A' && ch <= 'F')
-      return ch - 'A' + 10;
-    else if (ch >= 'a' && ch <= 'f')
-      return ch - 'a' + 10;
-    else if (ch == ' ' && ignore)
-      ;
-    else {
-      expect_prompt(1);
-      debuglogs (4, "Invalid hex digit from remote system. (0x%x)", ch);
-      error("Invalid hex digit from remote system. (0x%x)", ch);
+      if (ch >= '0' && ch <= '9')
+	return ch - '0';
+      else if (ch >= 'A' && ch <= 'F')
+	return ch - 'A' + 10;
+      else if (ch >= 'a' && ch <= 'f')
+	return ch - 'a' + 10;
+      else if (ch == ' ' && ignore)
+	;
+      else
+	{
+	  expect_prompt (1);
+	  debuglogs (4, "Invalid hex digit from remote system. (0x%x)", ch);
+	  error ("Invalid hex digit from remote system. (0x%x)", ch);
+	}
     }
-  }
 }
 
-/* get_hex_byte -- Get a byte from monitor and put it in *BYT. 
- *	Accept any number leading spaces.
- */
+/* Get a byte from monitor and put it in *BYT. Accept any number of
+   leading spaces.  */
+
 static void
 get_hex_byte (byt)
      char *byt;
@@ -520,37 +549,42 @@ get_hex_byte (byt)
   debuglogs (4, "get_hex_byte() -- Read a 0x%x", val);
 }
 
-/* 
- * get_hex_word --  Get N 32-bit words from remote, each preceded by a space,
- *	and put them in registers starting at REGNO.
- */
+/* Get N 32-bit words from remote, each preceded by a space, and put
+   them in registers starting at REGNO.  */
+
 static int
 get_hex_word ()
 {
-  long val, newval;
+  long val;
   int i;
 
   val = 0;
 
 #if 0
-  if (HOST_BYTE_ORDER == BIG_ENDIAN) {
+  if (HOST_BYTE_ORDER == BIG_ENDIAN)
+    {
 #endif
-    for (i = 0; i < 8; i++)
-      val = (val << 4) + get_hex_digit (i == 0);
+      for (i = 0; i < 8; i++)
+	val = (val << 4) + get_hex_digit (i == 0);
 #if 0
-  } else {
-    for (i = 7; i >= 0; i--)
-      val = (val << 4) + get_hex_digit (i == 0);
-  }
+    }
+  else
+    {
+      for (i = 7; i >= 0; i--)
+	val = (val << 4) + get_hex_digit (i == 0);
+    }
 #endif
 
-  debuglogs (4, "get_hex_word() got a 0x%x for a %s host.", val, (HOST_BYTE_ORDER == BIG_ENDIAN) ? "big endian" : "little endian");
+  debuglogs (4, "get_hex_word() got a 0x%x for a %s host.",
+	     val,
+	     (HOST_BYTE_ORDER == BIG_ENDIAN) ? "big endian" : "little endian");
 
   return val;
 }
 
 /* This is called not only when we first attach, but also when the
    user types "run" after having attached.  */
+
 void
 monitor_create_inferior (execfile, args, env)
      char *execfile;
@@ -560,15 +594,15 @@ monitor_create_inferior (execfile, args, env)
   int entry_pt;
 
   if (args && *args)
-    error("Can't pass arguments to remote MONITOR process");
+    error ("Can't pass arguments to remote MONITOR process");
 
   if (execfile == 0 || exec_bfd == 0)
-    error("No exec file specified");
+    error ("No exec file specified");
 
   entry_pt = (int) bfd_get_start_address (exec_bfd);
 
-/* The "process" (board) is already stopped awaiting our commands, and
-   the program is already downloaded.  We just set its PC and go.  */
+  /* The "process" (board) is already stopped awaiting our commands, and
+     the program is already downloaded.  We just set its PC and go.  */
 
   clear_proceed_status ();
 
@@ -588,15 +622,14 @@ monitor_create_inferior (execfile, args, env)
   proceed ((CORE_ADDR)entry_pt, TARGET_SIGNAL_DEFAULT, 0);
 }
 
-/*
- * monitor_open -- open a connection to a remote debugger.
- *	NAME is the filename used for communication.
- */
+/* Open a connection to a remote debugger. NAME is the filename used
+   for communication.  */
+
 static int baudrate = 9600;
 static char dev_name[100];
 
 void
-monitor_open(args, name, from_tty)
+monitor_open (args, name, from_tty)
      char *args;
      char *name;
      int from_tty;
@@ -608,34 +641,36 @@ monitor_open(args, name, from_tty)
 `target %s HOST-NAME:PORT-NUMBER' to use a network connection.", name, name);
 
 /*  if (is_open) */
-    monitor_close(0);
+    monitor_close (0);
 
-  strcpy(dev_name, args);
-  monitor_desc = SERIAL_OPEN(dev_name);
+  strcpy (dev_name, args);
+  monitor_desc = SERIAL_OPEN (dev_name);
 
   if (monitor_desc == NULL)
-    perror_with_name(dev_name);
-
-  if (baud_rate != -1) {
-    if (SERIAL_SETBAUDRATE (monitor_desc, baud_rate)) {
-      SERIAL_CLOSE (monitor_desc);
-      perror_with_name (name);
+    perror_with_name (dev_name);
+
+  if (baud_rate != -1)
+    {
+      if (SERIAL_SETBAUDRATE (monitor_desc, baud_rate))
+	{
+	  SERIAL_CLOSE (monitor_desc);
+	  perror_with_name (name);
+	}
     }
-  }
   
-  SERIAL_RAW(monitor_desc);
+  SERIAL_RAW (monitor_desc);
 
   /* some systems only work with 2 stop bits */
 #if !defined(__GO32__) && !defined(GDB_TARGET_IS_PA_ELF)
   if (STOPBITS == 2) {
     if (!strchr (dev_name, ':')) {	/* don't set for a tcp connection */
-      temptempio = (TERMINAL *)SERIAL_GET_TTY_STATE(monitor_desc);
+      temptempio = (TERMINAL *) SERIAL_GET_TTY_STATE (monitor_desc);
 #ifdef HAVE_SGTTY
       temptempio->sg_cflag |= baud_rate | CSTOPB;
 #else
       temptempio->c_cflag |= baud_rate | CSTOPB;
 #endif
-      SERIAL_SET_TTY_STATE(monitor_desc, temptempio);
+      SERIAL_SET_TTY_STATE (monitor_desc, temptempio);
       debuglogs (4, "Set serial port to 2 stop bits");
     }
   }
@@ -647,78 +682,78 @@ monitor_open(args, name, from_tty)
     perror_with_name (LOG_FILE);
   fprintf_filtered (log_file, "GDB %s (%s", version, host_name);
   fprintf_filtered (log_file, " --target %s)\n", target_name);
-  fprintf_filtered (log_file, "Remote target %s connected to %s\n\n", TARGET_NAME, dev_name);
+  fprintf_filtered (log_file, "Remote target %s connected to %s\n\n",
+		    TARGET_NAME, dev_name);
 #endif
 
-  /* see if the target is alive. For a ROM monitor, we can just try to force the
-     prompt to print a few times. FOr the GDB remote protocol, the application
-     being debugged is sitting at a breakpoint and waiting for GDB to initialize
-     the connection. We force it to give us an empty packet to see if it's alive.
-     */
-  if (GDBPROTO) {
-    debuglogs (3, "Trying to ACK the target's debug stub");
-    printf_monitor (INIT_CMD);	/* ask for the last signal */
-    expect ("$S05#b8",0);		/* look for a response */
-    printf_monitor ("+");	/* ask for the last signal */
-    expect_prompt(1);		/* See if we get a prompt */
-  } else {
-    /* wake up the monitor and see if it's alive */
-    printf_monitor(INIT_CMD);
-    expect_prompt(1);		/* See if we get a prompt */
-
-    /* try again to be sure */
-    printf_monitor(INIT_CMD);
-    expect_prompt(1);		/* See if we get a prompt */
-  }
+  /* see if the target is alive. For a ROM monitor, we can just try to
+     force the prompt to print a few times. FOr the GDB remote
+     protocol, the application being debugged is sitting at a
+     breakpoint and waiting for GDB to initialize the connection. We
+     force it to give us an empty packet to see if it's alive.  */
+
+  if (GDBPROTO)
+    {
+      debuglogs (3, "Trying to ACK the target's debug stub");
+      printf_monitor (INIT_CMD);	/* ask for the last signal */
+      expect ("$S05#b8",0);		/* look for a response */
+      printf_monitor ("+");	/* ask for the last signal */
+      expect_prompt (1);		/* See if we get a prompt */
+    }
+  else
+    {
+      /* wake up the monitor and see if it's alive */
+      printf_monitor (INIT_CMD);
+      expect_prompt (1);		/* See if we get a prompt */
+
+      /* try again to be sure */
+      printf_monitor (INIT_CMD);
+      expect_prompt (1);		/* See if we get a prompt */
+    }
 
   if (from_tty)
-    printf("Remote target %s connected to %s\n", TARGET_NAME, dev_name);
+    printf ("Remote target %s connected to %s\n", TARGET_NAME, dev_name);
 }
 
-/*
- * monitor_close -- Close out all files and local state before this
- *	target loses control.
- */
+/* Close out all files and local state before this target loses
+   control.  */
 
 void
 monitor_close (quitting)
      int quitting;
 {
-  SERIAL_CLOSE(monitor_desc);
+  SERIAL_CLOSE (monitor_desc);
   monitor_desc = NULL;
 
   debuglogs (1, "monitor_close (quitting=%d)", quitting);
 
 #if defined (LOG_FILE)
-  if (log_file) {
-    if (ferror(log_file))
-      printf_filtered ("Error writing log file.\n");
-    if (fclose(log_file) != 0)
-      printf_filtered ("Error closing log file.\n");
-  }
+  if (log_file)
+    {
+      if (ferror (log_file))
+	printf_filtered ("Error writing log file.\n");
+      if (fclose (log_file) != 0)
+	printf_filtered ("Error closing log file.\n");
+    }
 #endif
 }
 
-/* 
- * monitor_detach -- terminate the open connection to the remote
- *	debugger. Use this when you want to detach and do something
- *	else with your gdb.
- */
+/* Terminate the open connection to the remote debugger.  Use this
+   when you want to detach and do something else with your gdb.  */
+
 void
 monitor_detach (from_tty)
      int from_tty;
 {
-
   debuglogs (1, "monitor_detach ()");
 
-  pop_target();		/* calls monitor_close to do the real work */
+  pop_target ();		/* calls monitor_close to do the real work */
   if (from_tty)
     printf ("Ending remote %s debugging\n", target_shortname);
 }
 
-/*
- * monitor_attach -- attach GDB to the target.
- */
+/* Attach GDB to the target.  */
+
 void
 monitor_attach (args, from_tty)
      char *args;
@@ -734,9 +769,8 @@ monitor_attach (args, from_tty)
   expect (GO_CMD, 1);
 }
   
-/*
- * monitor_resume -- Tell the remote machine to resume.
- */
+/* Tell the remote machine to resume.  */
+
 void
 monitor_resume (pid, step, sig)
      int pid, step;
@@ -744,17 +778,15 @@ monitor_resume (pid, step, sig)
 {
   debuglogs (1, "monitor_resume (step=%d, sig=%d)", step, sig);
 
-  if (step) {
+  if (step)
     printf_monitor (STEP_CMD);
-  } else {
+  else
     printf_monitor (CONT_CMD);
-  }
 }
 
-/*
- * monitor_wait -- Wait until the remote machine stops, then return,
- *          storing status in status just as `wait' would.
- */
+/* Wait until the remote machine stops, then return, storing status in
+   status just as `wait' would.  */
+
 int
 monitor_wait (pid, status)
      int pid;
@@ -769,14 +801,12 @@ monitor_wait (pid, status)
 
   timeout = 0;		/* Don't time out -- user program is running. */
 
-  expect_prompt(0);    /* Wait for prompt, outputting extraneous text */
+  expect_prompt (0);    /* Wait for prompt, outputting extraneous text */
   debuglogs (4, "monitor_wait(), got the prompt.");
 
   status->kind = TARGET_WAITKIND_STOPPED;
   status->value.sig = TARGET_SIGNAL_TRAP;
 
-
-
   timeout = old_timeout;
 
   return 0;
@@ -799,8 +829,8 @@ get_reg_name (regno)
   if (regno < 0)
     return ("");
 
-  for (p = REGNAMES(regno); *p; p++)
-    *b++ = tolower(*p);
+  for (p = REGNAMES (regno); *p; p++)
+    *b++ = tolower (*p);
 
   *b = '\000';
 
@@ -809,89 +839,90 @@ get_reg_name (regno)
   return buf;
 }
 
-/*
- * monitor_fetch_registers -- read the remote registers into the
- *	block regs.
- */
+/* Read the remote registers into the block regs.  */
+
 void
 monitor_fetch_registers (ignored)
      int ignored;
 {
   int regno, i;
-  char *p;
   unsigned char packet[PBUFSIZ];
   char regs[REGISTER_BYTES];
 
   debuglogs (1, "monitor_fetch_registers (ignored=%d)\n", ignored);
 
   memset (packet, 0, PBUFSIZ);
-  if (GDBPROTO) {
-    /* Unimplemented registers read as all bits zero.  */
-    memset (regs, 0, REGISTER_BYTES);
-    make_gdb_packet (packet, "g");
-    if (monitor_send_packet (packet) == 0)
-      error ("Couldn't transmit packet\n");
-    if (monitor_get_packet (packet) == 0)
-          error ("Couldn't receive packet\n");  
-    /* FIXME: read bytes from packet */
-    debuglogs (4, "monitor_fetch_registers: Got a \"%s\" back\n", packet);
-    for (regno = 0; regno <= PC_REGNUM+4; regno++) {
-      /* supply register stores in target byte order, so swap here */
-      /* FIXME: convert from ASCII hex to raw bytes */
-      i = ascii2hexword (packet + (regno * 8));
-      debuglogs (5, "Adding register %d = %x\n", regno, i);
-      SWAP_TARGET_AND_HOST (&i, 4);
-      supply_register (regno, (char *)&i);
+  if (GDBPROTO)
+    {
+      /* Unimplemented registers read as all bits zero.  */
+      memset (regs, 0, REGISTER_BYTES);
+      make_gdb_packet (packet, "g");
+      if (monitor_send_packet (packet) == 0)
+	error ("Couldn't transmit packet\n");
+      if (monitor_get_packet (packet) == 0)
+	error ("Couldn't receive packet\n");  
+      /* FIXME: read bytes from packet */
+      debuglogs (4, "monitor_fetch_registers: Got a \"%s\" back\n", packet);
+      for (regno = 0; regno <= PC_REGNUM+4; regno++)
+	{
+	  /* supply register stores in target byte order, so swap here */
+	  /* FIXME: convert from ASCII hex to raw bytes */
+	  i = ascii2hexword (packet + (regno * 8));
+	  debuglogs (5, "Adding register %d = %x\n", regno, i);
+	  SWAP_TARGET_AND_HOST (&i, 4);
+	  supply_register (regno, (char *)&i);
+	}
+    }
+  else
+    {
+      for (regno = 0; regno <= PC_REGNUM; regno++)
+	monitor_fetch_register (regno);
     }
-  } else {
-    for (regno = 0; regno <= PC_REGNUM; regno++)
-      monitor_fetch_register(regno);
-  }
 }
 
-/* 
- * monitor_fetch_register -- fetch register REGNO, or all registers if REGNO
- *	is -1. Returns errno value.
- */
+/* Fetch register REGNO, or all registers if REGNO is -1. Returns
+   errno value.  */
+
 void
 monitor_fetch_register (regno)
      int regno;
 {
-  int newval, val, j;
+  int val;
+  char *name;
 
   debuglogs (1, "monitor_fetch_register (reg=%s)", get_reg_name (regno));
 
-  if (regno < 0) {
+  if (regno < 0)
     monitor_fetch_registers ();
-  } else {
-    char *name = get_reg_name (regno);
-    if (STREQ(name, ""))
-      return;
-    printf_monitor (ROMCMD(GET_REG), name);	/* send the command */
-    expect (name, 1);				/* then strip the leading garbage */
-    if (*ROMDELIM(GET_REG) != 0) {		/* if there's a delimiter */
-      expect (ROMDELIM(GET_REG), 1);
-    }
-    
-    val =  get_hex_word();			/* get the value, ignore junk */
+  else
+    {
+      name = get_reg_name (regno);
+
+      if (STREQ (name, ""))
+	return;
 
+      printf_monitor (ROMCMD (GET_REG), name);	/* send the command */
+      expect (name, 1);				/* then strip the leading garbage */
+      if (*ROMDELIM (GET_REG) != 0)
+	expect (ROMDELIM (GET_REG), 1);
+    
+    val =  get_hex_word ();		/* get the value, ignore junk */
 
     /* supply register stores in target byte order, so swap here */
     SWAP_TARGET_AND_HOST (&val, 4);
     supply_register (regno, (char *) &val);
     
-    if (*ROMDELIM(GET_REG) != 0) {
-/***  expect (ROMRES(GET_REG)); ***/
-      printf_monitor (CMD_END);
+    if (*ROMDELIM(GET_REG) != 0)
+      {
+	/***  expect (ROMRES(GET_REG)); ***/
+	printf_monitor (CMD_END);
+      }
+      expect_prompt (1);
     }
-    expect_prompt (1);
-  }
-  return;
 }
 
-/*
- * monitor_store_registers - store the remote registers.
- */
+/* Store the remote registers.  */
+
 void
 monitor_store_registers (ignored)
      int ignored;
@@ -904,41 +935,44 @@ monitor_store_registers (ignored)
   
   debuglogs (1, "monitor_store_registers()");
 
-  if (GDBPROTO) {
-    memset (packet, 0, PBUFSIZ);
-    memset (buf, 0, PBUFSIZ);
-    buf[0] = 'G';
-
-    /* Unimplemented registers read as all bits zero.  */
-    /* FIXME: read bytes from packet */
-    for (regno = 0; regno < 41; regno++) { /* FIXME */
-      /* supply register stores in target byte order, so swap here */
-      /* FIXME: convert from ASCII hex to raw bytes */
-      i = (unsigned long)read_register (regno);
+  if (GDBPROTO)
+    {
+      memset (packet, 0, PBUFSIZ);
+      memset (buf, 0, PBUFSIZ);
+      buf[0] = 'G';
+
+      /* Unimplemented registers read as all bits zero.  */
+      /* FIXME: read bytes from packet */
+      for (regno = 0; regno < 41; regno++) /* FIXME */
+	{
+	  /* supply register stores in target byte order, so swap here */
+	  /* FIXME: convert from ASCII hex to raw bytes */
+	  i = (unsigned long)read_register (regno);
 #if 0
-      SWAP_TARGET_AND_HOST (&i, 4);
+	  SWAP_TARGET_AND_HOST (&i, 4);
 #endif
-      hexword2ascii (num, i);
-      strcpy (buf+(regno * 8)+1, num);
+	  hexword2ascii (num, i);
+	  strcpy (buf + (regno * 8) + 1, num);
+	}
+
+      *(buf + (regno * 8) + 2) = 0;
+      make_gdb_packet (packet, buf);
+      if (monitor_send_packet (packet) == 0)
+	error ("Couldn't transmit packet\n");
+      if (monitor_get_packet (packet) == 0)
+	error ("Couldn't receive packet\n");  
+    }
+  else
+    {
+      for (regno = 0; regno <= PC_REGNUM; regno++)
+	monitor_store_register(regno);
     }
-    *(buf + (regno * 8) + 2) = 0;
-    make_gdb_packet (packet, buf);
-    if (monitor_send_packet (packet) == 0)
-      error ("Couldn't transmit packet\n");
-    if (monitor_get_packet (packet) == 0)
-      error ("Couldn't receive packet\n");  
-  } else {
-    for (regno = 0; regno <= PC_REGNUM; regno++)
-      monitor_store_register(regno);
-  }
 
   registers_changed ();
 }
 
-/* 
- * monitor_store_register -- store register REGNO, or all if REGNO == 0.
- *	return errno value.
- */
+/* Store register REGNO, or all if REGNO == 0.  Return errno value.  */
+
 void
 monitor_store_register (regno)
      int regno;
@@ -946,34 +980,36 @@ monitor_store_register (regno)
   char *name;
   int i;
 
-  i = read_register(regno);
+  i = read_register (regno);
 
   debuglogs (1, "monitor_store_register (regno=%d)", regno);
 
   if (regno < 0)
     monitor_store_registers ();
-  else {
-      debuglogs (3, "Setting register %s to 0x%x", get_reg_name (regno), read_register (regno));
-    
-    name = get_reg_name (regno);
-    if (STREQ(name, ""))
-      return;
-    printf_monitor (ROMCMD(SET_REG), name, read_register(regno));
-    expect (name, 1);				/* strip the leading garbage */
-    if (*ROMDELIM(SET_REG) != 0) {		/* if there's a delimiter */
-      expect (ROMDELIM(SET_REG), 1);
-      get_hex_word(1);
-      printf_monitor ("%d%s\n", i, CMD_END);
+  else
+    {
+      debuglogs (3, "Setting register %s to 0x%x",
+		 get_reg_name (regno), read_register (regno));
+
+      name = get_reg_name (regno);
+      if (STREQ (name, ""))
+	return;
+      printf_monitor (ROMCMD (SET_REG), name, read_register (regno));
+      expect (name, 1);				/* strip the leading garbage */
+      if (*ROMDELIM (SET_REG) != 0)
+	{
+	  expect (ROMDELIM (SET_REG), 1);
+	  get_hex_word (1);
+	  printf_monitor ("%d%s\n", i, CMD_END);
+	}
+      expect_prompt (1);
     }
-    expect_prompt (1);
-  }
   return;
-  
+
 #if 0
       printf_monitor (SET_REG, get_reg_name (regno),
 		      read_register (regno));
       expect_prompt (1);
-    }
 #endif
 }
 
@@ -992,14 +1028,12 @@ monitor_prepare_to_store ()
 void
 monitor_files_info ()
 {
-  printf ("\tAttached to %s at %d baud.\n",
-	  dev_name, baudrate);
+  printf ("\tAttached to %s at %d baud.\n", dev_name, baudrate);
 }
 
-/*
- * monitor_write_inferior_memory -- Copy LEN bytes of data from debugger
- *	memory at MYADDR to inferior's memory at MEMADDR.  Returns length moved.
- */
+/* Copy LEN bytes of data from debugger memory at MYADDR to inferior's
+    memory at MEMADDR.  Returns length moved.  */
+
 int
 monitor_write_inferior_memory (memaddr, myaddr, len)
      CORE_ADDR memaddr;
@@ -1013,58 +1047,64 @@ monitor_write_inferior_memory (memaddr, myaddr, len)
   char num[9];
   char *p;
   
-  debuglogs (1, "monitor_write_inferior_memory (memaddr=0x%x, myaddr=0x%x, len=%d)", memaddr, myaddr, len);
-  memset (buf, '\0', PBUFSIZ);		/* this also sets the string terminator */
+  debuglogs (1, "monitor_write_inferior_memory (memaddr=0x%x, myaddr=0x%x, len=%d)",
+	     memaddr, myaddr, len);
+  memset (buf, '\0', PBUFSIZ);	/* this also sets the string terminator */
   p = buf;
 
-  if (GDBPROTO) {
-    *p++ = 'M';				/* The command to write memory */
-    hexword2ascii (num, memaddr);	/* convert the address */
-    strcpy (p, num);			/* copy the address */
-    p += 8;
-    *p++ = ',';				/* add comma delimeter */
-    hexword2ascii (num, len);		/* Get the length as a 4 digit number */
-    *p++ = num[4];
-    *p++ = num[5];
-    *p++ = num[6];
-    *p++ = num[7];
-    *p++ = ':';				/* add the colon delimeter */
-    for (j = 0; j < len; j++) {		/* copy the data in after converting it */
-      *p++ = tohex ((myaddr[j] >> 4) & 0xf);
-      *p++ = tohex  (myaddr[j] & 0xf);
-    }
+  if (GDBPROTO)
+    {
+      *p++ = 'M';				/* The command to write memory */
+      hexword2ascii (num, memaddr);	/* convert the address */
+      strcpy (p, num);			/* copy the address */
+      p += 8;
+      *p++ = ',';				/* add comma delimeter */
+      hexword2ascii (num, len);		/* Get the length as a 4 digit number */
+      *p++ = num[4];
+      *p++ = num[5];
+      *p++ = num[6];
+      *p++ = num[7];
+      *p++ = ':';				/* add the colon delimeter */
+      for (j = 0; j < len; j++)
+	{		/* copy the data in after converting it */
+	  *p++ = tohex ((myaddr[j] >> 4) & 0xf);
+	  *p++ = tohex  (myaddr[j] & 0xf);
+	}
 
-    make_gdb_packet (packet, buf);
-    if (monitor_send_packet (packet) == 0)
-      error ("Couldn't transmit packet\n");
-    if (monitor_get_packet (packet) == 0)
-      error ("Couldn't receive packet\n");  
-  } else {
-    for (i = 0; i < len; i++) {
-      printf_monitor (ROMCMD(SET_MEM), memaddr + i, myaddr[i] );
-      if (*ROMDELIM(SET_MEM) != 0) {		/* if there's a delimiter */
-	expect (ROMDELIM(SET_MEM), 1);
-	expect (CMD_DELIM);
-	printf_monitor ("%x", myaddr[i]);
-      }
-      /***    printf_monitor ("%x", myaddr[i]); ***/
-      if (sr_get_debug() > 1)
-	printf ("\nSet 0x%x to 0x%x\n", memaddr + i, myaddr[i]);
-      if (*ROMDELIM(SET_MEM) != 0) {
-	expect (CMD_DELIM);
-	printf_monitor (CMD_END);
-      }
-      expect_prompt (1);
+      make_gdb_packet (packet, buf);
+      if (monitor_send_packet (packet) == 0)
+	error ("Couldn't transmit packet\n");
+      if (monitor_get_packet (packet) == 0)
+	error ("Couldn't receive packet\n");  
+    }
+  else
+    {
+      for (i = 0; i < len; i++)
+	{
+	  printf_monitor (ROMCMD (SET_MEM), memaddr + i, myaddr[i]);
+	  if (*ROMDELIM (SET_MEM) != 0)
+	    {
+	      expect (ROMDELIM (SET_MEM), 1);
+	      expect (CMD_DELIM);
+	      printf_monitor ("%x", myaddr[i]);
+	    }
+	  /***    printf_monitor ("%x", myaddr[i]); ***/
+	  if (sr_get_debug() > 1)
+	    printf ("\nSet 0x%x to 0x%x\n", memaddr + i, myaddr[i]);
+	  if (*ROMDELIM (SET_MEM) != 0)
+	    {
+	      expect (CMD_DELIM);
+	      printf_monitor (CMD_END);
+	    }
+	  expect_prompt (1);
+	}
     }
-  }
   return len;
 }
 
-/*
- * monitor_read_inferior_memory -- read LEN bytes from inferior memory
- *	at MEMADDR.  Put the result at debugger address MYADDR.  Returns
- *	length moved.
- */
+/* Read LEN bytes from inferior memory at MEMADDR.  Put the result at
+   debugger address MYADDR.  Returns length moved.  */
+
 int
 monitor_read_inferior_memory(memaddr, myaddr, len)
      CORE_ADDR memaddr;
@@ -1098,62 +1138,77 @@ monitor_read_inferior_memory(memaddr, myaddr, len)
      monitor_read_bytes (CORE_ADDR_MAX - 3, foo, 4)
      doesn't need to work.  Detect it and give up if there's an attempt
      to do that.  */
-  if (((memaddr - 1) + len) < memaddr) {
-    errno = EIO;
-    return 0;
-  }
+  if (((memaddr - 1) + len) < memaddr)
+    {
+      errno = EIO;
+      return 0;
+    }
   
   startaddr = memaddr;
   count = 0;
-  while (count < len) {
-    len_this_pass = 16;
-    if ((startaddr % 16) != 0)
-      len_this_pass -= startaddr % 16;
-    if (len_this_pass > (len - count))
-      len_this_pass = (len - count);
+  while (count < len)
+    {
+      len_this_pass = 16;
+      if ((startaddr % 16) != 0)
+	len_this_pass -= startaddr % 16;
+      if (len_this_pass > (len - count))
+	len_this_pass = (len - count);
     
-    debuglogs (3, "Display %d bytes at %x for Big Endian host", len_this_pass, startaddr);
+      debuglogs (3, "Display %d bytes at %x for Big Endian host",
+		 len_this_pass, startaddr);
     
-    if (GDBPROTO) {
-      for (i = 0; i < len_this_pass; i++) {
-	sprintf (buf, "m%08x,%04x", startaddr, len_this_pass);
-	make_gdb_packet (packet, buf);
-	if (monitor_send_packet (packet) == 0)
-	  error ("Couldn't transmit packet\n");
-	if (monitor_get_packet (packet) == 0)
-	  error ("Couldn't receive packet\n");  
-	debuglogs (4, "monitor_read_inferior: Got a \"%s\" back\n", packet);
-	for (j = 0; j < len_this_pass ; j++) {		/* extract the byte values */
-	  myaddr[count++] = from_hex (*(packet+(j*2))) * 16 + from_hex (*(packet+(j*2)+1));
-	  debuglogs (5, "myaddr set to %x\n", myaddr[count-1]);
-	}
-	startaddr += 1;
-      }
-    } else {
-      for (i = 0; i < len_this_pass; i++) {
-	printf_monitor (ROMCMD(GET_MEM), startaddr, startaddr);
-	sprintf (buf, ROMCMD(GET_MEM), startaddr, startaddr);
-	if (*ROMDELIM(GET_MEM) != 0) {		/* if there's a delimiter */
-	  expect (ROMDELIM(GET_MEM), 1);
-	} else {
-	  sprintf (buf, ROMCMD(GET_MEM), startaddr, startaddr);
-	  expect (buf,1);				/* get the command echo */
-	  get_hex_word(1);			/* strip away the address */
+      if (GDBPROTO)
+	{
+	  for (i = 0; i < len_this_pass; i++)
+	    {
+	      sprintf (buf, "m%08x,%04x", startaddr, len_this_pass);
+	      make_gdb_packet (packet, buf);
+	      if (monitor_send_packet (packet) == 0)
+		error ("Couldn't transmit packet\n");
+	      if (monitor_get_packet (packet) == 0)
+		error ("Couldn't receive packet\n");  
+	      debuglogs (4, "monitor_read_inferior: Got a \"%s\" back\n",
+			 packet);
+	      for (j = 0; j < len_this_pass ; j++)
+		{
+		  myaddr[count++] =
+		    from_hex (*(packet+(j*2))) * 16
+		      + from_hex (*(packet+(j*2)+1));
+		  debuglogs (5, "myaddr set to %x\n", myaddr[count-1]);
+		}
+	      startaddr += 1;
+	    }
 	}
-	get_hex_byte (&myaddr[count++]);		/* get the value at this address */
+      else
+	{
+	  for (i = 0; i < len_this_pass; i++)
+	    {
+	      printf_monitor (ROMCMD (GET_MEM), startaddr, startaddr);
+	      sprintf (buf, ROMCMD (GET_MEM), startaddr, startaddr);
+	      if (*ROMDELIM(GET_MEM) != 0)
+		{
+		  expect (ROMDELIM(GET_MEM), 1);
+		}
+	      else
+		{
+		  sprintf (buf, ROMCMD (GET_MEM), startaddr, startaddr);
+		  expect (buf,1);		/* get the command echo */
+		  get_hex_word (1);		/* strip away the address */
+		}
+	      get_hex_byte (&myaddr[count++]);	/* get the value at this address */
 	
-	if (*ROMDELIM(GET_MEM) != 0) {
-	  printf_monitor (CMD_END);
+	      if (*ROMDELIM(GET_MEM) != 0)
+		printf_monitor (CMD_END);
+	      expect_prompt (1);
+	      startaddr += 1;
+	    }
 	}
-	expect_prompt (1);
-	startaddr += 1;
-      }
     }
-  } 
   return len;
 }
 
 /* FIXME-someday!  merge these two.  */
+
 int
 monitor_xfer_inferior_memory (memaddr, myaddr, len, write, target)
      CORE_ADDR memaddr;
@@ -1193,9 +1248,8 @@ monitor_mourn_inferior ()
 extern int memory_breakpoint_size;
 static CORE_ADDR breakaddr[MAX_MONITOR_BREAKPOINTS] = {0};
 
-/*
- * monitor_insert_breakpoint -- add a breakpoint
- */
+/* Tell the monitor to add a breakpoint.  */
+
 int
 monitor_insert_breakpoint (addr, shadow)
      CORE_ADDR addr;
@@ -1205,25 +1259,26 @@ monitor_insert_breakpoint (addr, shadow)
 
   debuglogs (1, "monitor_insert_breakpoint() addr = 0x%x", addr);
 
-  for (i = 0; i <= MAX_MONITOR_BREAKPOINTS; i++) {
-    if (breakaddr[i] == 0) {
-      breakaddr[i] = addr;
-      if (sr_get_debug() > 4)
-	printf ("Breakpoint at %x\n", addr);
-      monitor_read_inferior_memory(addr, shadow, memory_breakpoint_size);
-      printf_monitor(SET_BREAK_CMD, addr);
-      expect_prompt(1);
-      return 0;
+  for (i = 0; i <= MAX_MONITOR_BREAKPOINTS; i++)
+    {
+      if (breakaddr[i] == 0)
+	{
+	  breakaddr[i] = addr;
+	  if (sr_get_debug () > 4)
+	    printf ("Breakpoint at %x\n", addr);
+	  monitor_read_inferior_memory (addr, shadow, memory_breakpoint_size);
+	  printf_monitor (SET_BREAK_CMD, addr);
+	  expect_prompt (1);
+	  return 0;
+	}
     }
-  }
 
-  fprintf(stderr, "Too many breakpoints (> 16) for monitor\n");
+  fprintf (stderr, "Too many breakpoints (> 16) for monitor\n");
   return 1;
 }
 
-/*
- * _remove_breakpoint -- Tell the monitor to remove a breakpoint
- */
+/* Tell the monitor to remove a breakpoint.  */
+
 int
 monitor_remove_breakpoint (addr, shadow)
      CORE_ADDR addr;
@@ -1233,19 +1288,21 @@ monitor_remove_breakpoint (addr, shadow)
 
   debuglogs (1, "monitor_remove_breakpoint() addr = 0x%x", addr);
 
-  for (i = 0; i < MAX_MONITOR_BREAKPOINTS; i++) {
-    if (breakaddr[i] == addr) {
-      breakaddr[i] = 0;
-      /* some monitors remove breakpoints based on the address */
-      if (CLR_BREAK_ADDR)   
-	printf_monitor(CLR_BREAK_CMD, addr);
-      else
-	printf_monitor(CLR_BREAK_CMD, i);
-      expect_prompt(1);
-      return 0;
+  for (i = 0; i < MAX_MONITOR_BREAKPOINTS; i++)
+    {
+      if (breakaddr[i] == addr)
+	{
+	  breakaddr[i] = 0;
+	  /* some monitors remove breakpoints based on the address */
+	  if (CLR_BREAK_ADDR)   
+	    printf_monitor(CLR_BREAK_CMD, addr);
+	  else
+	    printf_monitor(CLR_BREAK_CMD, i);
+	  expect_prompt (1);
+	  return 0;
+	}
     }
-  }
-  fprintf(stderr, "Can't find breakpoint associated with 0x%x\n", addr);
+  fprintf (stderr, "Can't find breakpoint associated with 0x%x\n", addr);
   return 1;
 }
 
@@ -1265,53 +1322,61 @@ monitor_remove_breakpoint (addr, shadow)
  *	ascii-xmodem - reads a ascii file and downloads using xmodem
  *		protocol.
  */
+
 void
 monitor_load (file, fromtty)
     char *file;
     int  fromtty;
 {
-  FILE *download;
-  int i, bytes_read;
-
   debuglogs (1, "Loading %s to monitor", file);
 
-  if (STREQ (loadtype_str, "default")) {	/* default, load a binary */
-    gr_load_image (file, fromtty);		/* by writing it into memory */
-    return;
-  }
+  /* default, load a binary */
+  if (STREQ (loadtype_str, "default"))
+    {
+      gr_load_image (file, fromtty);		/* by writing it into memory */
+      return;
+    }
 
   /* load an srecord by converting */
-  if ((STREQ (loadtype_str, "srec")) && STREQ (loadproto_str, "xmodem")) {
-    monitor_load_srec(file, XMODEM);
-    return;
-  }
+  if ((STREQ (loadtype_str, "srec")) && STREQ (loadproto_str, "xmodem"))
+    {
+      monitor_load_srec (file, XMODEM);
+      return;
+    }
 
-  if (STREQ (loadtype_str, "srec")) {		/* load an srecord by converting */
-    monitor_load_srec(file, 0);			/* if from a binary */
-    return;
-  }
+  /* load an srecord by converting */
+  if (STREQ (loadtype_str, "srec"))
+    {
+      monitor_load_srec (file, 0);			/* if from a binary */
+      return;
+    }
 
-  if (STREQ (loadtype_str, "none")) {		/* load an srecord by converting */
-    error ("Unimplemented");
-    return;
-  }
+  /* load an srecord by converting */
+  if (STREQ (loadtype_str, "none"))
+    {
+      error ("Unimplemented");
+      return;
+    }
 
-  if (STREQ (loadproto_str, "none")) {	/* load an srecord file */
-    monitor_load_ascii_srec(file, fromtty);		/* if from a binary */
-    return;
-  }
+  /* load an srecord file */
+  if (STREQ (loadproto_str, "none"))
+    {
+      monitor_load_ascii_srec (file, fromtty);		/* if from a binary */
+      return;
+    }
 
-  if (STREQ (loadproto_str, "xmodem")) {		/* load an srecord using the */
-    monitor_load_srec(file, XMODEM);
-    return;
-  }
+  if (STREQ (loadproto_str, "xmodem"))
+    {
+      monitor_load_srec (file, XMODEM);
+      return;
+    }
 }
 
-/*
- * monitor_load_ascii_srec -- download an ASCII srecord file.
- */
+/* Download an ASCII srecord file.  */
+
 #define DOWNLOAD_LINE_SIZE 100
-int
+
+static void
 monitor_load_ascii_srec (file, fromtty)
     char *file;
     int fromtty;
@@ -1323,89 +1388,91 @@ monitor_load_ascii_srec (file, fromtty)
   debuglogs (1, "Loading an ASCII srecord file, %s.", file);
 
   download = fopen (file, "r");
-  if (download == NULL) {
-    error ("%s Does not exist", file);
-    return;
-  }
+  if (download == NULL)
+    {
+      error ("%s does not exist", file);
+      return;
+    }
 
   printf_monitor (LOAD_CMD);
-  sleep(1);
-  while (!feof (download)) {
-    bytes_read = fread (buf, sizeof (char), DOWNLOAD_LINE_SIZE, download);
-    if (hashmark) {
-      putchar ('.');
-      fflush (stdout);
-    }
-    if (SERIAL_WRITE(monitor_desc, buf, bytes_read)) {
-      fprintf(stderr, "SERIAL_WRITE failed: (while downloading) %s\n", safe_strerror(errno));
-      break;
-    }
-    i = 0;
-    while (i++ <=200) {} ;     			/* Ugly HACK, probably needs flow control */
-    if (bytes_read < DOWNLOAD_LINE_SIZE) {
-      if (!feof (download))
-	error ("Only read %d bytes\n", bytes_read);
-      break;
+  sleep (1);
+  while (!feof (download))
+    {
+      bytes_read = fread (buf, sizeof (char), DOWNLOAD_LINE_SIZE, download);
+      if (hashmark)
+	{
+	  putchar ('.');
+	  fflush (stdout);
+	}
+      if (SERIAL_WRITE (monitor_desc, buf, bytes_read))
+	{
+	  fprintf (stderr, "SERIAL_WRITE failed: (while downloading) %s\n",
+		   safe_strerror (errno));
+	  break;
+	}
+      i = 0;
+      while (i++ <=200) {} ;	/* Ugly HACK, probably needs flow control */
+      if (bytes_read < DOWNLOAD_LINE_SIZE)
+	{
+	  if (!feof (download))
+	    error ("Only read %d bytes\n", bytes_read);
+	  break;
+	}
     }
-  }
   
-  if (hashmark) {
+  if (hashmark)
     putchar ('\n');
-  }
+
   if (!feof (download))
     error ("Never got EOF while downloading");
-  expect_prompt(1);
+  expect_prompt (1);
   fclose (download);
 }
 
-/* 
- * monitor_command -- put a command string, in args, out to MONITOR.
- *	Output from MONITOR is placed on the users terminal until the
- *	prompt is seen. FIXME: We read the charcters ourseleves here
- *	cause of a nasty echo.
- */
+/* Put a command string, in args, out to MONITOR.  Output from MONITOR
+   is placed on the users terminal until the prompt is seen. FIXME: We
+   read the characters ourseleves here cause of a nasty echo.  */
+
 void
 monitor_command (args, fromtty)
-     char	*args;
-     int	fromtty;
+     char *args;
+     int fromtty;
 {
-
   char *p;
-  char c, cp;
+
   p = PROMPT;
 
   debuglogs (1, "monitor_command (args=%s)", args);
 
   if (monitor_desc == NULL)
-    error("monitor target not open.");
+    error ("monitor target not open.");
 
-  if (!args)
-    error("Missing command.");
-	
-  printf_monitor ("%s\n", args);
+  /* Send the command.  Note that if no args were supplied, then we're
+     just sending the monitor a newline, which is sometimes useful.  */
+
+  printf_monitor ("%s\n", (args ? args : ""));
 
-  expect_prompt(0);
+  expect_prompt (0);
 }
 
-/*
- * monitor_load_srec -- download a binary file by converting it to srecords. This
- *	will also use xmodem to download the resulting file.
- *
- *	A download goes like this when using xmodem:
- *	Receiver:		Sender
- *	NAK ---------->
- *		<-------- (packet)	[SOH|1|1|data|SUM]
- *	ACK ---------->
- *		<-------- (packet)	[SOH|2|2|data|SUM]
- *	ACK ---------->
- *		<-------- EOT
- *	ACK ---------->
- *
- *	ACK = 0x06
- *	NAK = 0x15
- *	EOT = 0x04
- *
- */
+/*  Download a binary file by converting it to srecords. This
+    will also use xmodem to download the resulting file.
+  
+  	A download goes like this when using xmodem:
+ 	Receiver:		Sender
+  	NAK ---------->
+  		<-------- (packet)	[SOH|1|1|data|SUM]
+  	ACK ---------->
+  		<-------- (packet)	[SOH|2|2|data|SUM]
+  	ACK ---------->
+  		<-------- EOT
+  	ACK ---------->
+  
+  	ACK = 0x06
+  	NAK = 0x15
+  	EOT = 0x04
+   */
+
 static void
 monitor_load_srec (args, protocol)
      char *args;
@@ -1413,111 +1480,141 @@ monitor_load_srec (args, protocol)
 {
   bfd *abfd;
   asection *s;
-  char buffer[1024];
-  char srec[1024];
+  char *buffer, srec[1024];
   char packet[XMODEM_PACKETSIZE];
   int i;
   int retries;
-  int type = 0;					/* default to a type 0, header record */
-  int srec_frame = 57;				/* FIXME: this must be 57 There is 12 bytes
-						 of header, and 2 bytes of checksum at the end.
-						 The problem is an xmodem packet holds exactly
-						 128 bytes. */
+  int type = 0;			/* default to a type 0, header record */
+  int srec_frame = 57;		/* FIXME: this must be 57 There is 12 bytes
+				 of header, and 2 bytes of checksum at the end.
+				 The problem is an xmodem packet holds exactly
+				 128 bytes. */
 
   abfd = bfd_openr (args, 0);
-  if (!abfd) {
-    printf_filtered ("Unable to open file %s\n", args);
-    return;
-  }
+  if (!abfd)
+    {
+      printf_filtered ("Unable to open file %s\n", args);
+      return;
+    }
 
-  if (bfd_check_format (abfd, bfd_object) == 0) {
-    printf_filtered ("File is not an object file\n");
-    return;
-  }
+  if (bfd_check_format (abfd, bfd_object) == 0)
+    {
+      printf_filtered ("File is not an object file\n");
+      return;
+    }
   
   printf_monitor (LOAD_CMD);			/* tell the monitor to load */
   sleep (3);
-  if (protocol == XMODEM) {			/* get the NAK from the target */
-    if (GETNAK) {
-      debuglogs (3, "Got the NAK to start loading");
-    } else {
-      printf_monitor ("%c", EOT);
-      debuglogs (3, "Never got the NAK to start loading");
-      error ("Never got the NAK to start loading");
+  /* get the NAK from the target */
+  if (protocol == XMODEM)
+    {
+      if (GETNAK)
+	{
+	  debuglogs (3, "Got the NAK to start loading");
+	}
+      else
+	{
+	  printf_monitor ("%c", EOT);
+	  debuglogs (3, "Never got the NAK to start loading");
+	  error ("Never got the NAK to start loading");
+	}
     }
-  }
   
   s = abfd->sections;
-  while (s != (asection *) NULL) {
-    if (s->flags & SEC_LOAD) {
-      char *buffer = xmalloc (srec_frame);
-      printf_filtered ("%s\t: 0x%4x .. 0x%4x  ", s->name, s->vma, s->vma + s->_raw_size);
-      fflush (stdout);
-      for (i = 0; i < s->_raw_size; i += srec_frame) {
-	if (srec_frame > s->_raw_size - i)
-	  srec_frame = s->_raw_size - i;
+  while (s != (asection *) NULL)
+    {
+      if (s->flags & SEC_LOAD)
+	{
+	  buffer = xmalloc (srec_frame);
+
+	  printf_filtered ("%s\t: 0x%4x .. 0x%4x  ",
+			   s->name, s->vma, s->vma + s->_raw_size);
+	  fflush (stdout);
+	  for (i = 0; i < s->_raw_size; i += srec_frame)
+	    {
+	      if (srec_frame > s->_raw_size - i)
+		srec_frame = s->_raw_size - i;
 	
-	bfd_get_section_contents (abfd, s, buffer, i, srec_frame);
-	monitor_make_srec (srec, type, s->vma + i, buffer, srec_frame);
-	if (protocol == XMODEM) {		/* send a packet using xmodem */
-	  make_xmodem_packet (packet, srec, XMODEM_DATASIZE);
-	  write_monitor (packet, XMODEM_PACKETSIZE+1);
-	  retries = 0;
-	  while (retries++ <= 3) {
-	    if (GETNAK) {			/* Resend packet */
-	      debuglogs (3, "Got a NAK, resending packet");
-	      sleep(1);
-	      write_monitor (packet, XMODEM_PACKETSIZE+1); /* send it again */
-	      if (GETACK)			/* ACKnowledged, get next data chunk */
-		break;
-	    } else {				/* assume we got an ACK */
-	      if (hashmark) {
-		putc_unfiltered ('#');
-		gdb_flush (gdb_stdout);
-	      }
-	      debuglogs (3, "Got an ACK, sending next packet");
-	      break;
+	      bfd_get_section_contents (abfd, s, buffer, i, srec_frame);
+	      monitor_make_srec (srec, type, s->vma + i, buffer, srec_frame);
+	      /* send a packet using xmodem */
+	      if (protocol == XMODEM)
+		{
+		  make_xmodem_packet (packet, srec, XMODEM_DATASIZE);
+		  write_monitor (packet, XMODEM_PACKETSIZE+1);
+		  retries = 0;
+		  while (retries++ <= 3)
+		    {
+		      /* Resend packet */
+		      if (GETNAK)
+			{
+			  debuglogs (3, "Got a NAK, resending packet");
+			  sleep (1);
+			  /* send it again */
+			  write_monitor (packet, XMODEM_PACKETSIZE+1);
+			  if (GETACK)	/* ACKnowledged, get next data chunk */
+			    break;
+			}
+		      else
+			{			/* assume we got an ACK */
+			  if (hashmark)
+			    {
+			      putc_unfiltered ('#');
+			      gdb_flush (gdb_stdout);
+			    }
+			  debuglogs (3, "Got an ACK, sending next packet");
+			  break;
+			}
+		    }
+		  if (retries >= 4)
+		    {			/* too many tries, must be hosed */
+		      printf_monitor ("%c", EOT);
+		      error ("Never got a ACK after sending an xmodem packet");
+		    }
+		}
+	      else
+		{				/* no protocols at all */
+		  printf_monitor ("%s\n", srec);
+		}
+	      if (hashmark)
+		{
+		  putc_unfiltered ('#');
+		  gdb_flush (gdb_stdout);
+		}
+	      type = 3;				/* switch to a 4 byte address record */
+	      fflush (gdb_stdout);
 	    }
-	  }
-	  if (retries >= 4) {			/* too many tries, must be hosed */
-	    printf_monitor ("%c", EOT);
-	    error ("Never got a ACK after sending an xmodem packet");
-	  }
-	} else {				/* no protocols at all */
-	  printf_monitor ("%s\n", srec);
+	  free (buffer);
 	}
-	if (hashmark) {
-	  putc_unfiltered ('#');
-	  gdb_flush (gdb_stdout);
+      else
+	{
+	  debuglogs (3, "%s doesn't need to be loaded", s->name);
 	}
-	type = 3;				/* switch to a 4 byte address record */
-	fflush (gdb_stdout);
-      }
-      free (buffer);
-    } else {
-      debuglogs (3, "%s doesn't need to be loaded", s->name);
+      s = s->next;
     }
-    s = s->next;
-  }
   putc_unfiltered ('\n');
   
-  /*
-     write a type 7 terminator record. no data for a type 7,
-     and there is no data, so len is 0. 
-   */
-  if (protocol == XMODEM) {		/* send a packet using xmodem */
-    monitor_make_srec (srec, 7, abfd->start_address, "", 0);
-    make_xmodem_packet (packet, srec, XMODEM_DATASIZE);  
-    write_monitor (packet, XMODEM_PACKETSIZE+1);
-  } else {
-    monitor_make_srec (srec, 7, abfd->start_address, "", 0);
-    printf_monitor ("%s\n", srec);
-  }
-  if (protocol == XMODEM) {
-    printf_monitor ("%c", EOT);
-    if (!GETACK)
-      error ("Never got ACK after sending EOT");
-  }
+  /* Write a type 7 terminator record. no data for a type 7, and there
+     is no data, so len is 0.  */
+
+  if (protocol == XMODEM)
+    {
+      /* send a packet using xmodem */
+      monitor_make_srec (srec, 7, abfd->start_address, "", 0);
+      make_xmodem_packet (packet, srec, XMODEM_DATASIZE);  
+      write_monitor (packet, XMODEM_PACKETSIZE+1);
+    }
+  else
+    {
+      monitor_make_srec (srec, 7, abfd->start_address, "", 0);
+      printf_monitor ("%s\n", srec);
+    }
+  if (protocol == XMODEM)
+    {
+      printf_monitor ("%c", EOT);
+      if (!GETACK)
+	error ("Never got ACK after sending EOT");
+    }
 
   if (hashmark) 
     putc_unfiltered ('\n');
@@ -1525,16 +1622,15 @@ monitor_load_srec (args, protocol)
   expect_prompt ();
 }
 
-/*
- * getacknak -- get an ACK or a NAK from the target.
- *		returns 1 (true) or 0 (false) This is
- *		for xmodem. ANy string starting with "***"
- *		is an error message from the target.
- *	Here's a few from the WinBond w89k "Cougar" PA board.
- *		*** Too many errors found.
- *		*** Bad command
- *		*** Command syntax error
- */
+/* Get an ACK or a NAK from the target.  returns 1 (true) or 0 (false)
+   This is for xmodem. ANy string starting with "***" is an error
+   message from the target.  Here's a few from the WinBond w89k
+   "Cougar" PA board:
+   *** Too many errors found.
+   *** Bad command
+   *** Command syntax error
+   */
+
 int
 getacknak (byte)
      int byte;
@@ -1543,34 +1639,43 @@ getacknak (byte)
   int i;
   
   i = 0;
-  while (i++ < 60) {
-    character = (char)readchar (0);
-    if ((character == 0xfffffffe) || (character == 0x7f)) {		/* empty uart */
-      if (sr_get_debug() > 3)
-	putchar ('.');
-      fflush (stdout);
-      sleep (1);
-      continue;
-    }
-    if (character == CANCEL) {			/* target aborted load */
-      expect_prompt (0);
-      error ("Got a CANCEL from the target.");
-    }
-    if (character == '*') {			/* look for missed error message */
-      expect_prompt (0);
-      error ("Got an error message from the target");
-    }
-    debuglogs (3, "Got a %s (0x%x or \'%c\'), expecting a %s.\n",
-	       (character == ACK) ? "ACK" : (character == NAK) ? "NAK" : "BOGUS",
-	       character,  character, (byte == ACK) ? "ACK" : "NAK");
-    if (character == byte)			/* got what we wanted */
-      return 1;
-    if (character == ((byte == ACK) ? NAK : ACK)) {	/* got the opposite */
-      debuglogs (3, "Got the opposite, wanted 0x%x, got a 0x%x", byte, character);
-      return 0;
+  while (i++ < 60)
+    {
+      character = (char) readchar (0);
+      if ((character == 0xfffffffe) || (character == 0x7f))
+	{		/* empty uart */
+	  if (sr_get_debug () > 3)
+	    putchar ('.');
+	  fflush (stdout);
+	  sleep (1);
+	  continue;
+	}
+      if (character == CANCEL)
+	{			/* target aborted load */
+	  expect_prompt (0);
+	  error ("Got a CANCEL from the target.");
+	}
+    if (character == '*')
+      {			/* look for missed error message */
+	expect_prompt (0);
+	error ("Got an error message from the target");
+      }
+      debuglogs (3, "Got a %s (0x%x or \'%c\'), expecting a %s.\n",
+		 (character == ACK) ? "ACK"
+		 : (character == NAK) ? "NAK"
+		 : "BOGUS",
+		 character,  character, (byte == ACK) ? "ACK" : "NAK");
+      if (character == byte)			/* got what we wanted */
+	return 1;
+      if (character == ((byte == ACK) ? NAK : ACK))
+	{	/* got the opposite */
+	  debuglogs (3, "Got the opposite, wanted 0x%x, got a 0x%x",
+		     byte, character);
+	  return 0;
+	}
+      sleep (1); 
     }
-    sleep (1); 
-  }
+
   return 0;
 }
 
@@ -1614,7 +1719,8 @@ getacknak (byte)
  *	  is the sum of all the raw byte data in the record, from the length
  *        upwards, modulo 256 and subtracted from 255.
  */
-int
+
+static int
 monitor_make_srec (buffer, type, memaddr, myaddr, len)
      char *buffer;
      int type;
@@ -1631,10 +1737,9 @@ monitor_make_srec (buffer, type, memaddr, myaddr, len)
 	                            buffer, type, memaddr, len); 
   checksum = 0;
   
-  /*
-     create the header for the srec. 4 is the number of bytes in the address,
-     and 1 is the number of bytes in the count.
-   */
+  /* Create the header for the srec. 4 is the number of bytes in the address,
+     and 1 is the number of bytes in the count.  */
+
   if (type == 0)				/* FIXME: type 0 is optional */
     type = 3;					/* so use data as it works */
   sprintf (buf, "S%d%02X%08X", type, len + 4 + 1, memaddr);
@@ -1646,21 +1751,21 @@ monitor_make_srec (buffer, type, memaddr, myaddr, len)
 	       + ((memaddr >> 16) & 0xff)
 	       + ((memaddr >> 24) & 0xff));
   
-  for (i = 0; i < len; i++) {		/* build the srecord */
-    sprintf (buf, "%02X", myaddr[i]);
-    checksum += myaddr[i];
-    buf += 2;
-  }
+  /* build the srecord */
+  for (i = 0; i < len; i++)
+    {
+      sprintf (buf, "%02X", myaddr[i]);
+      checksum += myaddr[i];
+      buf += 2;
+    }
 
   sprintf(buf, "%02X", ~checksum & 0xff);	/* add the checksum */
   debuglogs (3, "srec is \"%s\"", buffer);
   
-  return(0);
+  return 0;
 }
 
-/*
- * make_xmodem_packet -- this takes a 128 bytes of data and makes a packet
- *	out of it.
+/* Take 128 bytes of data and make a packet out of it.
  *
  *	Each packet looks like this:
  *	+-----+-------+-------+------+-----+
@@ -1673,9 +1778,10 @@ monitor_make_srec (buffer, type, memaddr, myaddr, len)
  *	SUM  = Add the contents of the 128 bytes and use the low-order
  *	       8 bits of the result.
  */
+
 static void
 make_xmodem_packet (packet, data, len)
-     unsigned char packet[];
+     unsigned char *packet;
      unsigned char *data;
      int len;
 {
@@ -1690,60 +1796,60 @@ make_xmodem_packet (packet, data, len)
   packet[2] = 255 - sequence;
   sequence++;
 #if 0
-  packet[2] = ~sequence++;			/* the complement is the sequence checksum */
+  packet[2] = ~sequence++;	/* the complement is the sequence checksum */
 #endif
   
-  sum = 0;					/* calculate the data checksum */
+  sum = 0;				/* calculate the data checksum */
   for (i = 3; i <= len + 2; i++) {
     packet[i] = *buf;
     sum += *buf;
     buf++;
   }
 
-  for (i = len+1 ; i <= XMODEM_DATASIZE ; i++) {	/* add padding for the rest of the packet */
+  /* add padding for the rest of the packet */
+  for (i = len+1 ; i <= XMODEM_DATASIZE ; i++)
     packet[i] = '0';
-  }
 
   packet[XMODEM_PACKETSIZE] = sum & 0xff;	/* add the checksum */
 
-  if (sr_get_debug() > 4) {
-    debuglogs (4, "The xmodem checksum is %d (0x%x)\n", sum & 0xff, sum & 0xff);
-    print_xmodem_packet (packet);
+  if (sr_get_debug () > 4)
+    {
+      debuglogs (4, "The xmodem checksum is %d (0x%x)\n",
+		 sum & 0xff, sum & 0xff);
+      print_xmodem_packet (packet);
     }
 }
 
-/*
- * print_xmodem_packet -- print the packet as a debug check
- */
+/* Print the packet as a debug check.  */
+
 static void
-print_xmodem_packet(packet)
-     char packet[];
+print_xmodem_packet (packet)
+     char *packet;
 {
   int i;
   static int lastseq;
   int sum;
 
   /* take apart the packet header the packet header */
-  if (packet[0] == SOH) {
-     ("SOH");
-  } else {
+  if (packet[0] == SOH)
+    printf ("SOH");
+  else
     error ("xmodem: SOH is wrong");
-  }
   
   /* check the sequence */
-  if (packet[1] != 0) {
-    lastseq = packet[1];
-    if (packet[2] != ~lastseq)
-      error ("xmodem: Sequence checksum is wrong");
-    else
-      printf_filtered (" %d %d", lastseq, ~lastseq);
-  }
+  if (packet[1] != 0)
+    {
+      lastseq = packet[1];
+      if (packet[2] != ~lastseq)
+	error ("xmodem: Sequence checksum is wrong");
+      else
+	printf_filtered (" %d %d", lastseq, ~lastseq);
+    }
   
   /* check the data checksum */
   sum = 0;
-  for (i = 3; i <= XMODEM_DATASIZE; i++) {
+  for (i = 3; i <= XMODEM_DATASIZE; i++)
     sum += packet[i];
-  }
 
   /* ignore the data */
 #if 0
@@ -1751,14 +1857,14 @@ print_xmodem_packet(packet)
 #endif
   printf_filtered (" [%s] %d\n", packet, sum & 0xff);
 
-  if ((packet[XMODEM_PACKETSIZE] & 0xff) != (sum & 0xff)) {
-    debuglogs (4, "xmodem: data checksum wrong, got a %d", packet[XMODEM_PACKETSIZE] & 0xff);
-  }
+  if ((packet[XMODEM_PACKETSIZE] & 0xff) != (sum & 0xff))
+    debuglogs (4, "xmodem: data checksum wrong, got a %d",
+	       packet[XMODEM_PACKETSIZE] & 0xff);
+
   putchar ('\n');
 }
 
-/*
- * make_gdb_packet -- make a GDB packet. The data is always ASCII.
+/* Make a GDB packet. The data is always ASCII.
  *	 A debug packet whose contents are <data>
  *	 is encapsulated for transmission in the form:
  *
@@ -1770,9 +1876,8 @@ print_xmodem_packet(packet)
  *
  *       CSUM1 and CSUM2 are ascii hex representation of an 8-bit 
  *       checksum of <data>, the most significant nibble is sent first.
- *       the hex digits 0-9,a-f are used.
- *
- */
+ *       the hex digits 0-9,a-f are used.  */
+
 static void
 make_gdb_packet (buf, data)
      char *buf, *data;
@@ -1792,10 +1897,11 @@ make_gdb_packet (buf, data)
   *p++ = '$';
 
   /* calculate the checksum */
-  for (i = 0; i < cnt; i++) {
-    csum += data[i];
-    *p++ = data[i];
-  }
+  for (i = 0; i < cnt; i++)
+    {
+      csum += data[i];
+      *p++ = data[i];
+    }
 
   /* terminate the data with a '#' */
   *p++ = '#';
@@ -1806,12 +1912,11 @@ make_gdb_packet (buf, data)
   *p  = 0x0;			/* Null terminator on string */
 }
 
-/*
- * monitor_send_packet -- send a GDB packet to the target with error handling. We
- *		get a '+' (ACK) back if the packet is received and the checksum
- *		matches. Otherwise a '-' (NAK) is returned. It returns a 1 for a
- *		successful transmition, or a 0 for a failure.
- */
+/* Send a GDB packet to the target with error handling.  We get a '+'
+ (ACK) back if the packet is received and the checksum
+ matches. Otherwise a '-' (NAK) is returned. It returns a 1 for a
+ successful transmition, or a 0 for a failure.  */
+
 int
 monitor_send_packet (packet)
      char *packet;
@@ -1850,55 +1955,57 @@ monitor_send_packet (packet)
 
   /* ok, try to send the packet */
   retries = 0;
-  while (retries <= 10) {
-    printf_monitor ("%s", packet);
+  while (retries <= 10)
+    {
+      printf_monitor ("%s", packet);
     
-    /* read until either a timeout occurs (-2) or '+' is read */
-    while (retries <= 10) {
-      c = readchar (timeout);
-      debuglogs (3, "Reading a GDB protocol packet... Got a '%c'\n", c);
-      switch (c) {
-      case '+':
-	debuglogs (3, "Got Ack\n");
-	return 1;
-      case SERIAL_TIMEOUT:
-	debuglogs (3, "Timed out reading serial port\n");
-	break;            /* Retransmit buffer */
-      case '-':
-	debuglogs (3, "Got NAK\n");
-	break;			/* FIXME: (maybe) was a continue */
-      case '$':
-	/* it's probably an old response, or the echo of our command.
-	 * just gobble up the packet and ignore it.
-	 */
-	debuglogs (3, "Got a junk packet\n");
-	do {
+      /* read until either a timeout occurs (-2) or '+' is read */
+      while (retries <= 10)
+	{
 	  c = readchar (timeout);
-	  junk[i++] = c;
-	} while (c != '#');
-	c = readchar (timeout);
-	junk[i++] = c;
-	c = readchar (timeout);
-	junk[i++] = c;
-	junk[i++] = '\0';
-	debuglogs (3, "Reading a junk packet, got a \"%s\"\n", junk);
-	continue;               /* Now, go look for next packet */
-      default:
-	continue;
-      }
-      retries++;
-      debuglogs (3, "Retransmitting packet \"%s\"\n", packet);
-      break;                /* Here to retransmit */
-    }
-  } /* outer while */
+	  debuglogs (3, "Reading a GDB protocol packet... Got a '%c'\n", c);
+	  switch (c)
+	    {
+	    case '+':
+	      debuglogs (3, "Got Ack\n");
+	      return 1;
+	    case SERIAL_TIMEOUT:
+	      debuglogs (3, "Timed out reading serial port\n");
+	      break;            /* Retransmit buffer */
+	    case '-':
+	      debuglogs (3, "Got NAK\n");
+	      break;			/* FIXME: (maybe) was a continue */
+	    case '$':
+	      /* It's probably an old response, or the echo of our
+	         command.  just gobble up the packet and ignore it. */
+	      debuglogs (3, "Got a junk packet\n");
+	      do
+		{
+		  c = readchar (timeout);
+		  junk[i++] = c;
+		} while (c != '#');
+	      c = readchar (timeout);
+	      junk[i++] = c;
+	      c = readchar (timeout);
+	      junk[i++] = c;
+	      junk[i++] = '\0';
+	      debuglogs (3, "Reading a junk packet, got a \"%s\"\n", junk);
+	      continue;               /* Now, go look for next packet */
+	    default:
+	      continue;
+	    }
+	  retries++;
+	  debuglogs (3, "Retransmitting packet \"%s\"\n", packet);
+	  break;                /* Here to retransmit */
+	}
+    } /* outer while */
   return 0;
 }
 
-/*
- * monitor_get_packet -- get a GDB packet from the target. Basically we read till we
- *		see a '#', then check the checksum. It returns a 1 if it's gotten a
- *		packet, or a 0 it the packet wasn't transmitted correctly.
- */
+/* Get a GDB packet from the target. Basically we read till we see a
+   '#', then check the checksum. It returns a 1 if it's gotten a
+   packet, or a 0 it the packet wasn't transmitted correctly.  */
+
 int
 monitor_get_packet (packet)
      char *packet;
@@ -1914,74 +2021,81 @@ monitor_get_packet (packet)
 
   memset (packet, 1, PBUFSIZ);
   retries = 0;
-  while (retries <= 10) {
-    do {
-      c = readchar (timeout);
-      if (c == SERIAL_TIMEOUT) {
-	debuglogs (3, "monitor_get_packet: got time out from serial port.\n");
-      }
-      debuglogs (3, "Waiting for a '$', got a %c\n", c);
-    } while (c != '$');
+  while (retries <= 10)
+    {
+      do
+	{
+	  c = readchar (timeout);
+	  if (c == SERIAL_TIMEOUT)
+	    {
+	      debuglogs (3, "monitor_get_packet: got time out from serial port.\n");
+	    }
+	  debuglogs (3, "Waiting for a '$', got a %c\n", c);
+	} while (c != '$');
     
-    retries = 0;
-    while (retries <= 10) {
-      c = readchar (timeout);
-      debuglogs (3, "monitor_get_packet: got a '%c'\n", c);
-      switch (c) {
-      case SERIAL_TIMEOUT:
-	debuglogs (3, "Timeout in mid-packet, retrying\n");
-	return 0;
-      case '$':
-	debuglogs (3, "Saw new packet start in middle of old one\n");
-	return 0;             /* Start a new packet, count retries */
-      case '#':	
-	*bp = '\0';
-	pktcsum = from_hex (readchar (timeout)) << 4;
-	pktcsum |= from_hex (readchar (timeout));
-	if (csum == pktcsum) {
-	  debuglogs (3, "\nGDB packet checksum correct, packet data is \"%s\",\n", packet);
-	  printf_monitor ("+");
-	  expect_prompt (1);
-	  return 1;
-	}
-	debuglogs (3, "Bad checksum, sentsum=0x%x, csum=0x%x\n", pktcsum, csum);
-	return 0;
-      case '*':               /* Run length encoding */
-	debuglogs (5, "Run length encoding in packet\n");
-	csum += c;
-	c = readchar (timeout);
-	csum += c;
-	c = c - ' ' + 3;      /* Compute repeat count */
+      retries = 0;
+      while (retries <= 10)
+	{
+	  c = readchar (timeout);
+	  debuglogs (3, "monitor_get_packet: got a '%c'\n", c);
+	  switch (c)
+	    {
+	    case SERIAL_TIMEOUT:
+	      debuglogs (3, "Timeout in mid-packet, retrying\n");
+	      return 0;
+	    case '$':
+	      debuglogs (3, "Saw new packet start in middle of old one\n");
+	      return 0;		/* Start a new packet, count retries */
+	    case '#':
+	      *bp = '\0';
+	      pktcsum = from_hex (readchar (timeout)) << 4;
+	      pktcsum |= from_hex (readchar (timeout));
+	      if (csum == pktcsum)
+		{
+		  debuglogs (3, "\nGDB packet checksum correct, packet data is \"%s\",\n", packet);
+		  printf_monitor ("+");
+		  expect_prompt (1);
+		  return 1;
+		}
+	      debuglogs (3, "Bad checksum, sentsum=0x%x, csum=0x%x\n", pktcsum, csum);
+	      return 0;
+	    case '*':		/* Run length encoding */
+	      debuglogs (5, "Run length encoding in packet\n");
+	      csum += c;
+	      c = readchar (timeout);
+	      csum += c;
+	      c = c - ' ' + 3;	/* Compute repeat count */
 	
-	if (c > 0 && c < 255 && bp + c - 1 < packet + PBUFSIZ - 1) {
-	  memset (bp, *(bp - 1), c);
-	  bp += c;
-	  continue;
-	}
-	*bp = '\0';
-	printf_filtered ("Repeat count %d too large for buffer.\n", c);
-	return 0;
+	      if (c > 0 && c < 255 && bp + c - 1 < packet + PBUFSIZ - 1)
+		{
+		  memset (bp, *(bp - 1), c);
+		  bp += c;
+		  continue;
+		}
+	      *bp = '\0';
+	      printf_filtered ("Repeat count %d too large for buffer.\n", c);
+	      return 0;
 	
-      default:
-	if ((!isxdigit(c)) && (!ispunct(c)))
-	  debuglogs (4, "Got a non-ascii digit \'%c\'.\\n", c);
-	if (bp < packet + PBUFSIZ - 1) {
-	  *bp++ = c;
-	  csum += c;
-	  continue;
-	}
+	    default:
+	      if ((!isxdigit (c)) && (!ispunct (c)))
+		debuglogs (4, "Got a non-ascii digit \'%c\'.\\n", c);
+	      if (bp < packet + PBUFSIZ - 1)
+		{
+		  *bp++ = c;
+		  csum += c;
+		  continue;
+		}
 	
-	*bp = '\0';
-	puts_filtered ("Remote packet too long.\n");
-	return 0;
-      }
+	      *bp = '\0';
+	      puts_filtered ("Remote packet too long.\n");
+	      return 0;
+	    }
+	}
     }
-  }
 }
 
-/*
- * ascii2hexword -- convert an ascii number represented by 8 digits to a hex value.
- */
+/* Convert an ascii number represented by 8 digits to a hex value.  */
+
 static unsigned long
 ascii2hexword (mem)
      unsigned char *mem;
@@ -1991,44 +2105,44 @@ ascii2hexword (mem)
   char buf[9];
 
   val = 0;
-  for (i = 0; i < 8; i++) {
-    val <<= 4;
-    if (mem[i] >= 'A' && mem[i] <= 'F')
-      val = val + mem[i] - 'A' + 10;      
-    if (mem[i] >= 'a' && mem[i] <= 'f')
-      val = val + mem[i] - 'a' + 10;
-    if (mem[i] >= '0' && mem[i] <= '9')
-      val = val + mem[i] - '0';
-    buf[i] = mem[i];
-  }
+  for (i = 0; i < 8; i++)
+    {
+      val <<= 4;
+      if (mem[i] >= 'A' && mem[i] <= 'F')
+	val = val + mem[i] - 'A' + 10;      
+      if (mem[i] >= 'a' && mem[i] <= 'f')
+	val = val + mem[i] - 'a' + 10;
+      if (mem[i] >= '0' && mem[i] <= '9')
+	val = val + mem[i] - '0';
+      buf[i] = mem[i];
+    }
   buf[8] = '\0';
   debuglogs (4, "ascii2hexword() got a 0x%x from %s(%x).\n", val, buf, mem);
   return val;
 }
 
-/*
- * ascii2hexword -- convert a hex value to an ascii number represented by 8
- *	digits.
- */
-static char*
+/* Convert a hex value to an ascii number represented by 8 digits.  */
+
+static char *
 hexword2ascii (mem, num)
      unsigned char *mem;
      unsigned long num;
 {
   int i;
-  unsigned char ch;
   
   debuglogs (4, "hexword2ascii() converting %x ", num);
-  for (i = 7; i >= 0; i--) {    
-    mem[i] = tohex ((num >> 4) & 0xf);
-    mem[i] = tohex (num & 0xf);
-    num = num >> 4;
-  }
+  for (i = 7; i >= 0; i--)
+    {    
+      mem[i] = tohex ((num >> 4) & 0xf);
+      mem[i] = tohex (num & 0xf);
+      num = num >> 4;
+    }
   mem[8] = '\0';
   debuglogs (4, "\tto a %s", mem);
 }
 
 /* Convert hex digit A to a number.  */
+
 static int
 from_hex (a)
      int a;
@@ -2043,26 +2157,23 @@ from_hex (a)
     return a - 'a' + 10;
   if (a >= 'A' && a <= 'F')
     return a - 'A' + 10;
-  else {
-    error ("Reply contains invalid hex digit 0x%x", a);
-  }
+  error ("Reply contains invalid hex digit 0x%x", a);
 }
 
 /* Convert number NIB to a hex digit.  */
+
 static int
 tohex (nib)
      int nib;
 {
   if (nib < 10)
-    return '0'+nib;
+    return '0' + nib;
   else
-    return 'a'+nib-10;
+    return 'a' + nib - 10;
 }
 
-/*
- * _initialize_remote_monitors -- setup a few addtitional commands that
- *		are usually only used by monitors.
- */
+/* Define additional commands that are usually only used by monitors.  */
+
 void
 _initialize_remote_monitors ()
 {
@@ -2089,7 +2200,6 @@ When enabled, a period \'.\' is displayed.",
                                   &setlist),
 		     &showlist);
 
-  /* generic monitor command */
   add_com ("monitor", class_obscure, monitor_command,
 	   "Send a command to the debug monitor."); 
 }