import gdb-1999-11-08 snapshot

[deliverable/binutils-gdb.git] / gdb / config / i960 / tm-nindy960.h

diff --git a/gdb/config/i960/tm-nindy960.h b/gdb/config/i960/tm-nindy960.h
index 7a20af3db5adfff70c420f7afdc5dd8e82a5cc0a..d57a6974c38bf83d7dd9f8b91a22e97ccac7763c 100644 (file)
--- a/gdb/config/i960/tm-nindy960.h
+++ b/gdb/config/i960/tm-nindy960.h
@@ -60,13 +60,18 @@ extern char *nindy_ttyname; /* Name of serial port to talk to nindy */
 /* If specified on the command line, open tty for talking to nindy,
    and download the executable file if one was specified.  */
 
-#define        ADDITIONAL_OPTION_HANDLER       \
-       if (!SET_TOP_LEVEL () && nindy_ttyname) {               \
-         nindy_open (nindy_ttyname, !batch);                   \
-         if (!SET_TOP_LEVEL () && execarg) {                   \
-               target_load (execarg, !batch);                  \
-         }                                                     \
-       }
+extern void nindy_open (char *name, int from_tty);
+#define        ADDITIONAL_OPTION_HANDLER                                       \
+       if (nindy_ttyname != NULL)                                      \
+          {                                                            \
+            if (catch_command_errors (nindy_open, nindy_ttyname,       \
+                                     !batch, RETURN_MASK_ALL))         \
+             {                                                         \
+                if (execarg != NULL)                                   \
+                  catch_command_errors (target_load, execarg, !batch,  \
+                                       RETURN_MASK_ALL);               \
+             }                                                         \
+         }
 
 /* If configured for i960 target, we take control before main loop
    and demand that we configure for a nindy target.  */