* objdump.c (SFILE): Add size field.

[deliverable/binutils-gdb.git] / gdb / ocd.c

diff --git a/gdb/ocd.c b/gdb/ocd.c
index e5e3792ae3c14fd2dfaa17928d01d967d6116a0f..0af8103a730c48607e7f6e8386c2b6d4583452fd 100644 (file)
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -74,10 +74,11 @@ static int last_run_status;
    other form of hairy serial connection, I would think 2 seconds would
    be plenty.  */
 
+#if 0
 /* FIXME: Change to allow option to set timeout value on a per target
-   basis.
-
+   basis. */
 static int remote_timeout = 2;
+#endif
 
 /* Descriptor for I/O to remote machine.  Initialize it to NULL so that
    ocd_open knows that we don't have a file open when the program
@@ -231,7 +232,6 @@ ocd_start_remote (dummy)
   select_frame (get_current_frame (), 0);
   print_stack_frame (selected_frame, -1, 1);
 
-#if 0
   buf[0] = OCD_LOG_FILE;
   buf[1] = 3;   /* close existing WIGGLERS.LOG */
   ocd_put_packet (buf, 2);
@@ -241,7 +241,6 @@ ocd_start_remote (dummy)
   buf[1] = 2;   /* append to existing WIGGLERS.LOG */
   ocd_put_packet (buf, 2);
   p = ocd_get_packet (buf[0], &pktlen, remote_timeout);
-#endif
 
   return 1;
 }
@@ -280,12 +279,10 @@ device the OCD device is attached to (e.g. /dev/ttya).");
           if (!ocd_desc)
             perror_with_name (name);
 
-#if 0
          buf[0] = OCD_LOG_FILE;
          buf[1] = 1;   /* open new or overwrite existing WIGGLERS.LOG */
          ocd_put_packet (buf, 2);
          p = ocd_get_packet (buf[0], &pktlen, remote_timeout);
-#endif
 
          buf[0] = OCD_SET_CONNECTION;
          buf[1] = 0x01;        /* atoi (name[11]); */
@@ -336,7 +333,10 @@ device the OCD device is attached to (e.g. /dev/ttya).");
   if (!catch_errors (ocd_start_remote, (char *)target_type,
                     "Couldn't establish connection to remote target\n",
                     RETURN_MASK_ALL))
-    pop_target();
+    {
+      pop_target();
+      error ("Failed to connect to OCD.");
+    }
 }
 
 /* This takes a program previously attached to and detaches it.  After
@@ -1213,7 +1213,6 @@ ocd_do_command (cmd, statusp, lenp)
 
   *statusp = status;
 
-#if 0
   logbuf[0] = OCD_LOG_FILE;
   logbuf[1] = 3;   /* close existing WIGGLERS.LOG */
   ocd_put_packet (logbuf, 2);
@@ -1223,7 +1222,6 @@ ocd_do_command (cmd, statusp, lenp)
   logbuf[1] = 2;   /* append to existing WIGGLERS.LOG */
   ocd_put_packet (logbuf, 2);
   ocd_get_packet (logbuf[0], &logpktlen, remote_timeout);
-#endif
 
   return p + 3;
 }
@@ -1291,7 +1289,9 @@ ocd_load (args, from_tty)
    not yet supported fully */
    
 #define BDM_BREAKPOINT {0x0,0x0,0x0,0x0} /* For ppc 8xx */
-/* #define BDM_BREAKPOINT {0x4a,0xfa} /* BGND insn used for CPU32 */
+#if 0
+#define BDM_BREAKPOINT {0x4a,0xfa} /* BGND insn used for CPU32 */
+#endif
 
 /* BDM (at least on CPU32) uses a different breakpoint */