* target.c, target.h: Add "set remotedebug" command.

	* remote-bug.c, remote.c, remote-mips.c: Remove "set remotedebug" and
	"set m88ksnoop" options and use generic "set remotedebug" instead.

diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index 8e4db09e5032de40a94bf83a5fab5beceb39d83d..9cb0c3912b90e6458eea68eea749adc89f35ca86 100644 (file)
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -65,11 +65,6 @@ static int bug_write_inferior_memory ();
 
 #endif /* not __STDC__ */
 
-/* To be silent, or to loudly echo all input and output to and from
-   the target.  */
-
-static int bug88k_snoop = 0;
-
 /* This is the serial descriptor to our target.  */
 
 static serial_t desc = NULL;
@@ -326,7 +321,7 @@ readchar ()
   if (buf == SERIAL_TIMEOUT)
     error ("Timeout reading from remote system.");
 
-  if (bug88k_snoop)
+  if (remote_debug)
     printf ("%c", buf);
 
   return buf & 0x7f;
@@ -340,7 +335,7 @@ readchar_nofail ()
   buf = SERIAL_READCHAR (desc, timeout);
   if (buf == SERIAL_TIMEOUT)
     buf = 0;
-  if (bug88k_snoop)
+  if (remote_debug)
     if (buf)
       printf ("%c", buf);
     else
@@ -358,7 +353,7 @@ pollchar()
   buf = SERIAL_READCHAR (desc, 0);
   if (buf == SERIAL_TIMEOUT)
     buf = 0;
-  if (bug88k_snoop)
+  if (remote_debug)
     if (buf)
       printf ("%c", buf);
     else
@@ -888,7 +883,7 @@ bug_write (a, l)
 
   SERIAL_WRITE (desc, a, l);
 
-  if (bug88k_snoop)
+  if (remote_debug)
     for (i = 0; i < l; i++)
       {
        printf ("%c", a[i]);
@@ -940,7 +935,7 @@ bug_srec_write_cr (s)
   if (srec_echo_pace)
     for (p = s; *p; ++p)
       {
-       if (bug88k_snoop)
+       if (remote_debug)
          printf ("%c", *p);
 
        do
@@ -1194,7 +1189,7 @@ bug_write_inferior_memory (memaddr, myaddr, len)
 
       if (retries > 0)
        {
-         if (bug88k_snoop)
+         if (remote_debug)
            printf("\n<retrying...>\n");
 
          /* This expect_prompt call is extremely important.  Without
@@ -1263,7 +1258,7 @@ bug_write_inferior_memory (memaddr, myaddr, len)
 
          if ((x = pollchar()) != 0)
            {
-             if (bug88k_snoop)
+             if (remote_debug)
                printf("\n<retrying...>\n");
 
              ++retries;
@@ -1640,14 +1635,5 @@ much slower, but generally more reliable.",
                  &setlist),
      &showlist);
 
-  add_show_from_set
-    (add_set_cmd ("bug88k-snoop", class_support, var_boolean,
-                 (char *) &bug88k_snoop,
-                 "\
-Set echoing of what's going to and from the monitor.\n\
-When on, echo data going out on and coming back from the serial line.", 
-                 &setlist),
-     &showlist);
-
   dev_name = NULL;
 }

diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index d4cfcda745a6ecab29deb85b76cf2626ba21c1ed..91d846df5fc739209ecfeecf70455cbb28fcf34f 100644 (file)
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -276,9 +276,6 @@ static int mips_receive_wait = 5;
    a reply.  */
 static int mips_need_reply = 0;
 
-/* This can be set to get debugging with ``set remotedebug''.  */
-static int mips_debug = 0;
-
 /* Handle used to access serial I/O stream.  */
 static serial_t mips_desc;
 
@@ -309,7 +306,7 @@ mips_readchar (timeout)
     error ("End of file from remote");
   if (ch == SERIAL_ERROR)
     error ("Error reading from remote: %s", safe_strerror (errno));
-  if (mips_debug > 1)
+  if (remote_debug > 1)
     {
       if (ch != SERIAL_TIMEOUT)
        printf_filtered ("Read '%c' %d 0x%x\n", ch, ch, ch);
@@ -326,7 +323,7 @@ mips_readchar (timeout)
       && state == 5
       && ! mips_initializing)
     {
-      if (mips_debug > 0)
+      if (remote_debug > 0)
        printf_filtered ("Reinitializing MIPS debugging mode\n");
       SERIAL_WRITE (mips_desc, "\rdb tty0\r", sizeof "\rdb tty0\r" - 1);
       sleep (1);
@@ -378,7 +375,7 @@ mips_receive_header (hdr, pgarbage, ch, timeout)
                 what the program is outputting, if the debugging is
                 being done on the console port.  FIXME: Perhaps this
                 should be filtered?  */
-             if (! mips_initializing || mips_debug > 0)
+             if (! mips_initializing || remote_debug > 0)
                {
                  putchar (ch);
                  fflush (stdout);
@@ -513,7 +510,7 @@ mips_send_packet (s, get_ack)
       int garbage;
       int ch;
 
-      if (mips_debug > 0)
+      if (remote_debug > 0)
        {
          packet[HDR_LENGTH + len + TRLR_LENGTH] = '\0';
          printf_filtered ("Writing \"%s\"\n", packet + 1);
@@ -569,7 +566,7 @@ mips_send_packet (s, get_ack)
              != TRLR_GET_CKSUM (trlr))
            continue;
 
-         if (mips_debug > 0)
+         if (remote_debug > 0)
            {
              hdr[HDR_LENGTH] = '\0';
              trlr[TRLR_LENGTH] = '\0';
@@ -630,7 +627,7 @@ mips_receive_packet (buff)
       /* An acknowledgement is probably a duplicate; ignore it.  */
       if (! HDR_IS_DATA (hdr))
        {
-         if (mips_debug > 0)
+         if (remote_debug > 0)
            printf_filtered ("Ignoring unexpected ACK\n");
          continue;
        }
@@ -638,7 +635,7 @@ mips_receive_packet (buff)
       /* If this is the wrong sequence number, ignore it.  */
       if (HDR_GET_SEQ (hdr) != mips_receive_seq)
        {
-         if (mips_debug > 0)
+         if (remote_debug > 0)
            printf_filtered ("Ignoring sequence number %d (want %d)\n",
                             HDR_GET_SEQ (hdr), mips_receive_seq);
          continue;
@@ -663,7 +660,7 @@ mips_receive_packet (buff)
 
       if (i < len)
        {
-         if (mips_debug > 0)
+         if (remote_debug > 0)
            printf_filtered ("Got new SYN after %d chars (wanted %d)\n",
                             i, len);
          continue;
@@ -674,7 +671,7 @@ mips_receive_packet (buff)
        error ("Timed out waiting for packet");
       if (err == -2)
        {
-         if (mips_debug > 0)
+         if (remote_debug > 0)
            printf_filtered ("Got SYN when wanted trailer\n");
          continue;
        }
@@ -682,7 +679,7 @@ mips_receive_packet (buff)
       if (mips_cksum (hdr, buff, len) == TRLR_GET_CKSUM (trlr))
        break;
 
-      if (mips_debug > 0)
+      if (remote_debug > 0)
        printf_filtered ("Bad checksum; data %d, trailer %d\n",
                         mips_cksum (hdr, buff, len),
                         TRLR_GET_CKSUM (trlr));
@@ -700,7 +697,7 @@ mips_receive_packet (buff)
       ack[HDR_LENGTH + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
       ack[HDR_LENGTH + TRLR_INDX_CSUM3] = TRLR_SET_CSUM3 (cksum);
 
-      if (mips_debug > 0)
+      if (remote_debug > 0)
        {
          ack[HDR_LENGTH + TRLR_LENGTH] = '\0';
          printf_filtered ("Writing ack %d \"%s\"\n", mips_receive_seq,
@@ -711,7 +708,7 @@ mips_receive_packet (buff)
        error ("write to target failed: %s", safe_strerror (errno));
     }
 
-  if (mips_debug > 0)
+  if (remote_debug > 0)
     {
       buff[len] = '\0';
       printf_filtered ("Got packet \"%s\"\n", buff);
@@ -731,7 +728,7 @@ mips_receive_packet (buff)
   ack[HDR_LENGTH + TRLR_INDX_CSUM2] = TRLR_SET_CSUM2 (cksum);
   ack[HDR_LENGTH + TRLR_INDX_CSUM3] = TRLR_SET_CSUM3 (cksum);
 
-  if (mips_debug > 0)
+  if (remote_debug > 0)
     {
       ack[HDR_LENGTH + TRLR_LENGTH] = '\0';
       printf_filtered ("Writing ack %d \"%s\"\n", mips_receive_seq,
@@ -1336,11 +1333,4 @@ _initialize_remote_mips ()
 This is the number of seconds to wait for an acknowledgement to a packet\n\
 before resending the packet.", &setlist),
        &showlist);
-
-  add_show_from_set (
-    add_set_cmd ("remotedebug", no_class, var_zinteger, (char *) &mips_debug,
-                  "Set debugging of remote MIPS serial I/O.\n\
-When non-zero, each packet sent or received with the remote target\n\
-is displayed.  Higher numbers produce more debugging.", &setlist),
-       &showlist);
 }