* cpu32bug-rom.c monitor.h op50-rom.c remote-est.c rom68k-rom.c

	w89k-rom.c:  Remove loadtypes, loadprotos and baudrates.
	* op50-rom.c:  Fix copyrights and add load routine to op50n_cmds.
	* rom68k-rom.c (_initialize_rom68k):  Don't set baud rate.
	* w89k-rom.c:  Fix copyrights.

6 files changed, 4 insertions, 39 deletions

diff --git a/gdb/cpu32bug-rom.c b/gdb/cpu32bug-rom.c
index 5deefbb..10b1491 100644
--- a/gdb/cpu32bug-rom.c
+++ b/gdb/cpu32bug-rom.c
@@ -90,9 +90,6 @@ static char *cpu32bug_regnames[NUM_REGS] =
 
 static struct target_ops cpu32bug_ops;
 
-static char *cpu32bug_loadtypes[] = {"srec", NULL};
-static char *cpu32bug_loadprotos[] = {"none", NULL};
-
 static char *cpu32bug_inits[] = {"\r", NULL};
 
 static struct monitor_ops cpu32bug_cmds =
@@ -146,9 +143,6 @@ static struct monitor_ops cpu32bug_cmds =
   NULL,				/* end-of-command delimitor */
   NULL,				/* optional command terminator */
   &cpu32bug_ops,		/* target operations */
-  cpu32bug_loadtypes,		/* loadtypes */
-  cpu32bug_loadprotos,		/* loadprotos */
-  "9600",			/* supported baud rates */
   SERIAL_1_STOPBITS,		/* number of stop bits */
   cpu32bug_regnames,		/* registers names */
   MONITOR_OPS_MAGIC		/* magic */
diff --git a/gdb/monitor.h b/gdb/monitor.h
index d4e9962..d0553d0 100644
--- a/gdb/monitor.h
+++ b/gdb/monitor.h
@@ -107,9 +107,6 @@ struct monitor_ops
   char *cmd_delim;		/* end-of-command delimitor */
   char *cmd_end;		/* optional command terminator */
   struct target_ops *target;	/* target operations */
-  char **loadtypes;		/* the load types that are supported */
-  char **loadprotos;		/* the load protocols that are supported */
-  char *baudrates;		/* supported baud rates */
   int stopbits;			/* number of stop bits */
   char **regnames;		/* array of register names in ascii */
   int magic;			/* Check value */
diff --git a/gdb/op50-rom.c b/gdb/op50-rom.c
index 0cfb4b28..d5a3eb1 100644
--- a/gdb/op50-rom.c
+++ b/gdb/op50-rom.c
@@ -1,6 +1,6 @@
 /* Remote target glue for the Oki op50n based eval board.
 
-   Copyright 1988, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1995 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -53,9 +53,6 @@ static char *op50n_regnames[NUM_REGS] =
 
 static struct target_ops op50n_ops;
 
-static char *op50n_loadtypes[] = {"none", "srec", "default", NULL};
-static char *op50n_loadprotos[] = {"none", NULL};
-
 static char *op50n_inits[] = {"\003.\n", NULL};
 
 static struct monitor_ops op50n_cmds =
@@ -102,15 +99,13 @@ static struct monitor_ops op50n_cmds =
   NULL,				/* dump_registers */
   NULL,				/* register_pattern */
   NULL,				/* supply_register */
+  NULL,				/* load routine */
   "r 0\n",			/* download command */
   NULL,				/* load response */
   "#",				/* monitor command prompt */
   NULL,				/* end-of-command delimitor */
   NULL,				/* optional command terminator */
   &op50n_ops,			/* target operations */
-  op50n_loadtypes,		/* loadtypes */
-  op50n_loadprotos,		/* loadprotos */
-  "2400,4800,9600,19200,exta,38400,extb", /* supported baud rates */
   SERIAL_1_STOPBITS,		/* number of stop bits */
   op50n_regnames,		/* register names */
   MONITOR_OPS_MAGIC		/* magic */
diff --git a/gdb/remote-est.c b/gdb/remote-est.c
index b8d5f5a..efc83d4 100644
--- a/gdb/remote-est.c
+++ b/gdb/remote-est.c
@@ -92,9 +92,6 @@ static char *est_regnames[NUM_REGS] =
 
 static struct target_ops est_ops;
 
-static char *est_loadtypes[] = {"srec", NULL};
-static char *est_loadprotos[] = {"none", NULL};
-
 static char *est_inits[] = {"he\r", /* Resets the prompt, and clears repeated cmds */
 			      NULL};
 
@@ -149,9 +146,6 @@ static struct monitor_ops est_cmds =
   NULL,				/* end-of-command delimitor */
   NULL,				/* optional command terminator */
   &est_ops,			/* target operations */
-  est_loadtypes,		/* loadtypes */
-  est_loadprotos,		/* loadprotos */
-  "9600",			/* supported baud rates */
   SERIAL_1_STOPBITS,		/* number of stop bits */
   est_regnames,			/* registers names */
   MONITOR_OPS_MAGIC		/* magic */
diff --git a/gdb/rom68k-rom.c b/gdb/rom68k-rom.c
index ca1d41d..399b747 100644
--- a/gdb/rom68k-rom.c
+++ b/gdb/rom68k-rom.c
@@ -91,9 +91,6 @@ static char *rom68k_regnames[NUM_REGS] = {
 
 static struct target_ops rom68k_ops;
 
-static char *rom68k_loadtypes[] = {"srec", NULL};
-static char *rom68k_loadprotos[] = {"none", NULL};
-
 static char *rom68k_inits[] = {".\r\r", NULL}; /* Exits pm/pr & download cmds */
 
 static struct monitor_ops rom68k_cmds =
@@ -148,9 +145,6 @@ static struct monitor_ops rom68k_cmds =
   "=",				/* end-of-command delimitor */
   ".\r",			/* optional command terminator */
   &rom68k_ops,			/* target operations */
-  rom68k_loadtypes,		/* loadtypes */
-  rom68k_loadprotos,		/* loadprotos */
-  "9600",			/* supported baud rates */
   SERIAL_1_STOPBITS,		/* number of stop bits */
   rom68k_regnames,		/* registers names */
   MONITOR_OPS_MAGIC		/* magic */
@@ -176,8 +170,4 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
   rom68k_ops.to_open = rom68k_open;
 
   add_target (&rom68k_ops);
-
-  /* This is the default, since it's the only baud rate supported by
-     the hardware.  */
-  baud_rate = 9600;
 }
diff --git a/gdb/w89k-rom.c b/gdb/w89k-rom.c
index aedd739..1aca2b4 100644
--- a/gdb/w89k-rom.c
+++ b/gdb/w89k-rom.c
@@ -1,7 +1,7 @@
 /* Remote target glue for the WinBond ROM monitor running on the "Cougar"
    W89k eval board.
 
-   Copyright 1988, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1995 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -34,6 +34,7 @@ static void w89k_open PARAMS ((char *args, int from_tty));
  * different strings than GDB does, and doesn't support all the
  * registers either. So, typing "info reg sp" becomes a "r30".
  */
+
 static char *w89k_regnames[NUM_REGS] =
 {
   "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
@@ -239,9 +240,6 @@ w89k_load (desc, file, hashmark)
 
 static struct target_ops w89k_ops;
 
-static char *w89k_loadtypes[] = {"binary", NULL};
-static char *w89k_loadprotos[] = {"xmodem", NULL};
-
 static char *w89k_inits[] = {"\r", NULL};
 
 static struct monitor_ops w89k_cmds =
@@ -295,9 +293,6 @@ static struct monitor_ops w89k_cmds =
   NULL,				/* end-of-command delimitor */
   NULL,				/* optional command terminator */
   &w89k_ops,			/* target operations */
-  w89k_loadtypes,		/* loadtypes */
-  w89k_loadprotos,		/* loadprotos */
-  "9600",			/* supported baud rates */
   SERIAL_1_STOPBITS,		/* number of stop bits */
   w89k_regnames,		/* register names */
   MONITOR_OPS_MAGIC		/* magic */