* array-rom.c: Remove the non GDB remote protocol config stuff.

	* monitor.c: All reading/writing functions for memory and
	registers work.

1 files changed, 6 insertions, 107 deletions

diff --git a/gdb/array-rom.c b/gdb/array-rom.c
index ccf29bd..dae6089 100644
--- a/gdb/array-rom.c
+++ b/gdb/array-rom.c
@@ -26,7 +26,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 extern int baud_rate;
 
-void array_open();
 void gdb_open();
 void monitor_open();
 
@@ -36,6 +35,9 @@ void monitor_open();
  * different strings than GDB does, and doesn't support all the
  * registers either. So, typing "info reg sp" becomes a "r30".
  */
+static char *array_regnames[] = REGISTER_NAMES;
+
+#if 0
 static char *array_regnames[] = {
   "r0",		"r1",	"r2",	"r3",	"r4",	"r5",	"r6",	"r7",
   "r8",		"r9",	"r10",	"r11",	"r12",	"r13",	"r14",	"r15",
@@ -55,6 +57,7 @@ static char *array_regnames[] = {
   "",     "",      "",     "",     "",    "",    "",    "",
   "",     "",      "",     "",     "",    "",    "",    ""
 };
+#endif
 
 /*
  * Define the monitor command strings. Since these are passed directly
@@ -64,90 +67,6 @@ static char *array_regnames[] = {
 
 struct target_ops array_ops = {
   "array",
-  "Array Tech's custom debug monitor for their LSI based RAID controller board",
-  "Debug on an Array Tech RAID controller.\n\
-Specify the serial device it is connected to (e.g. /dev/ttya).",
-  array_open,
-  monitor_close, 
-  monitor_attach,
-  monitor_detach,
-  monitor_resume,
-  monitor_wait,
-  monitor_fetch_register,
-  monitor_store_register,
-  monitor_prepare_to_store,
-  monitor_xfer_inferior_memory,
-  monitor_files_info,
-  monitor_insert_breakpoint,
-  monitor_remove_breakpoint,	/* Breakpoints */
-  0,
-  0,
-  0,
-  0,
-  0,				/* Terminal handling */
-  monitor_kill,
-  monitor_load,			/* load */
-  0,				/* lookup_symbol */
-  monitor_create_inferior,
-  monitor_mourn_inferior,
-  0,				/* can_run */
-  0, 				/* notice_signals */
-  0,				/* to_stop */
-  process_stratum,
-  0,				/* next */
-  1,
-  1,
-  1,
-  1,
-  1,				/* all mem, mem, stack, regs, exec */
-  0,
-  0,				/* Section pointers */
-  OPS_MAGIC,			/* Always the last thing */
-};
-
-struct monitor_ops array_cmds = {
-  1,					/* 1 for ASCII, 0 for binary */
-  "\003.\r\n",				/* monitor init string */
-  "go %x\n",				/* execute or usually GO command */
-  "c\n",				/* continue command */
-  "s\n",				/* single step */
-  "brk %x\n",				/* set a breakpoint */
-  "unbrk %x\n",				/* clear a breakpoint */
-  0,					/* 0 for number, 1 for address */
-  {
-    "p %x %x\n",			/* set memory */
-    "",				        /* delimiter */
-    "",					/* the result */
-  },
-  {
-    "g %x %x\n",			/* get memory */
-    "",				        /* delimiter */
-    "",					/* the result */
-  },
-  {
-    "p %s %x\n",			/* set a register */
-    "",				        /* delimiter between registers */
-    "",					/* the result */
-  },
-  {
-    "g %s\n",				/* get a register */
-    "",				        /* delimiter between registers */
-    "",					/* the result */
-  },
-  "sload -a tty(0)\r\n",		/* download command */
-  ">> ",				/* monitor command prompt */
-  "",					/* end-of-command delimitor */
-  "",					/* optional command terminator */
-  &array_ops,				/* target operations */
-  "none,srec,default",			/* load types */
-  "none",				/* load protocols */
-  "4800",				/* supported baud rates */
-  2,					/* number of stop bits */
-  array_regnames			/* registers names */
-};
-
-struct target_ops gdb_ops = {
-  "gdb",
   "Debug using the standard GDB remote protocol for the Array Tech target.",
   "Debug using the standard GDB remote protocol for the Array Tech target.\n\
 Specify the serial device it is connected to (e.g. /dev/ttya).",
@@ -190,7 +109,7 @@ Specify the serial device it is connected to (e.g. /dev/ttya).",
   OPS_MAGIC,			/* Always the last thing */
 };
 
-struct monitor_ops gdb_cmds = {
+struct monitor_ops array_cmds = {
   0,					/* 1 for ASCII, 0 for binary */
   "$?#b8+\n",				/* monitor init string */
   "go %x",				/* execute or usually GO command */
@@ -223,7 +142,7 @@ struct monitor_ops gdb_cmds = {
   ">> ",				/* monitor command prompt */
   "",					/* end-of-command delimitor */
   "",					/* optional command terminator */
-  &gdb_ops,				/* target operations */
+  &array_ops,				/* target operations */
   "none,srec,default",			/* load types */
   "none",				/* load protocols */
   "4800",				/* supported baud rates */
@@ -237,23 +156,6 @@ gdb_open(args, from_tty)
      int from_tty;
 {
   target_preopen(from_tty);
-  push_target  (&gdb_ops);
-  push_monitor (&gdb_cmds);
-  monitor_open (args, "gdb", from_tty);
-}
-
-void
-_initialize_gdb_proto ()
-{
-  add_target (&gdb_ops);
-}
-
-void
-array_open(args, from_tty)
-     char *args;
-     int from_tty;
-{
-  target_preopen(from_tty);
   push_target  (&array_ops);
   push_monitor (&array_cmds);
   monitor_open (args, "array", from_tty);
@@ -263,12 +165,9 @@ void
 _initialize_array ()
 {
   add_target (&array_ops);
-
-  /* this is the default, since it's the only baud rate supported by the hardware */
   baud_rate = 4800;
 }
 
 
 
 
-