* h8300s now new target, not alias of h8300h

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

diff --git a/gdb/kod.c b/gdb/kod.c
index a0969109cf8174929bb9f7f9a1a2c0c23d087061..8f565bb8c36ed7599fe031d6c65a7061504e6ab6 100644 (file)
--- a/gdb/kod.c
+++ b/gdb/kod.c
@@ -1,5 +1,5 @@
 /* Kernel Object Display generic routines and callbacks
-   Copyright 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
 
    Written by Fernando Nasser <fnasser@cygnus.com> for Cygnus Solutions.
 
@@ -25,12 +25,12 @@
 #include "gdbcmd.h"
 #include "target.h"
 #include "gdb_string.h"
+#include "kod.h"
 
 /* Prototypes for exported functions.  */
 void _initialize_kod (void);
 
 /* Prototypes for local functions.  */
-static void show_kod (char *, int);
 static void info_kod_command (char *, int);
 static void load_kod_library (char *);
 
@@ -61,7 +61,8 @@ static void gdb_kod_query (char *, char *, int *);
    gdb_kod_close - This is called when the KOD connection to the
    remote should be terminated.  */
 
-static char *(*gdb_kod_open) (void *, void *);
+static char *(*gdb_kod_open) (kod_display_callback_ftype *display,
+                             kod_query_callback_ftype *query);
 static void (*gdb_kod_request) (char *, int);
 static void (*gdb_kod_close) ();
 
@@ -73,17 +74,6 @@ char *operating_system;
    switching OS's.  */
 static char *old_operating_system;
 
-/* Functions imported from the library for all supported OSes.
-   FIXME: we really should do something better, such as dynamically
-   loading the KOD modules.  */
-extern char *ecos_kod_open (void *, void *);
-extern void ecos_kod_request (char *, int);
-extern void ecos_kod_close ();
-extern char *cisco_kod_open (void *, void *);
-extern void cisco_kod_request (char *, int);
-extern void cisco_kod_close ();
-
-
 /* Print a line of data generated by the module.  */
 
 static void
@@ -142,7 +132,16 @@ kod_set_os (char *arg, int from_tty, struct cmd_list_element *command)
 {
   char *p;
 
-  if (command->type != set_cmd)
+  /* NOTE: cagney/2002-03-17: The add_show_from_set() function clones
+     the set command passed as a parameter.  The clone operation will
+     include (BUG?) any ``set'' command callback, if present.
+     Commands like ``info set'' call all the ``show'' command
+     callbacks.  Unfortunatly, for ``show'' commands cloned from
+     ``set'', this includes callbacks belonging to ``set'' commands.
+     Making this worse, this only occures if add_show_from_set() is
+     called after add_cmd_sfunc() (BUG?).  */
+
+  if (cmd_type (command) != set_cmd)
     return;
 
   /* If we had already had an open OS, close it.  */
@@ -153,9 +152,8 @@ kod_set_os (char *arg, int from_tty, struct cmd_list_element *command)
   if (old_operating_system)
     {
       delete_cmd (old_operating_system, &infolist);
-      free (old_operating_system);
+      xfree (old_operating_system);
     }
-  old_operating_system = strdup (operating_system);
 
   if (! operating_system || ! *operating_system)
     {
@@ -170,6 +168,8 @@ kod_set_os (char *arg, int from_tty, struct cmd_list_element *command)
     {
       char *kodlib;
 
+      old_operating_system = xstrdup (operating_system);
+
       load_kod_library (operating_system);
 
       kodlib = (*gdb_kod_open) (gdb_kod_display, gdb_kod_query);
@@ -185,7 +185,7 @@ kod_set_os (char *arg, int from_tty, struct cmd_list_element *command)
        p = "Unknown KOD library";
       printf_filtered ("%s - %s\n", operating_system, p);
 
-      free (kodlib);
+      xfree (kodlib);
     }
 }
 
@@ -226,7 +226,7 @@ load_kod_library (char *lib)
 }
 
 void
-_initialize_kod ()
+_initialize_kod (void)
 {
   struct cmd_list_element *c;
 
@@ -234,6 +234,6 @@ _initialize_kod ()
                   (char *) &operating_system,
                   "Set operating system",
                   &setlist);
-  c->function.sfunc = kod_set_os;
+  set_cmd_sfunc (c, kod_set_os);
   add_show_from_set (c, &showlist);
 }