* monitor.h (MO_SREC_ACK_PLUS, MO_SREC_ACK_ROTATE): New flags.

	* monitor.c (monitor_wait_srec_ack): Add DINK32-specific ack code.
	* dsrec.c (load_srec): Always write a header S-record.
	* dink32-rom.c (dink32_regnames): Fix the names of float registers.
	(dink32_cmds): Set to use S-record downloading with acks.
	* remote-est.c (est_cmds): Add MO_SREC_ACK_PLUS flag.

4 files changed, 27 insertions, 6 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e428a8f..427fa1c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -8,6 +8,13 @@ Tue Sep 16 16:00:01 1997  Stan Shebs  <shebs@andros.cygnus.com>
  	interfaces.
 	(sds_restart): Remove, no longer used.
 
+	* monitor.h (MO_SREC_ACK_PLUS, MO_SREC_ACK_ROTATE): New flags.
+	* monitor.c (monitor_wait_srec_ack): Add DINK32-specific ack code.
+	* dsrec.c (load_srec): Always write a header S-record.
+	* dink32-rom.c (dink32_regnames): Fix the names of float registers.
+	(dink32_cmds): Set to use S-record downloading with acks.
+	* remote-est.c (est_cmds): Add MO_SREC_ACK_PLUS flag.
+
 Tue Sep 16 10:08:27 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* config/v850/tm-v850.h (BREAKPOINT): Set to a truely illegal
diff --git a/gdb/dink32-rom.c b/gdb/dink32-rom.c
index a2d0326..c0c2e51 100644
--- a/gdb/dink32-rom.c
+++ b/gdb/dink32-rom.c
@@ -126,10 +126,10 @@ static char *dink32_regnames[NUM_REGS] =
   "r16",  "r17",  "r18",  "r19",  "r20",  "r21",  "r22",  "r23",
   "r24",  "r25",  "r26",  "r27",  "r28",  "r29",  "r30",  "r31",
 
-  "fr0",  "fr1",  "fr2",  "fr3",  "fr4",  "fr5",  "fr6",  "fr7",
-  "fr8",  "fr9",  "fr10", "fr11", "fr12", "fr13", "fr14", "fr15",
-  "fr16", "fr17", "fr18", "fr19", "fr20", "fr21", "fr22", "fr23",
-  "fr24", "fr25", "fr26", "fr27", "fr28", "fr29", "fr30", "fr31",
+  "f0",   "f1",   "f2",   "f3",   "f4",   "f5",   "f6",   "f7",
+  "f8",   "f9",   "f10",  "f11",  "f12",  "f13",  "f14",  "f15",
+  "f16",  "f17",  "f18",  "f19",  "f20",  "f21",  "f22",  "f23",
+  "f24",  "f25",  "f26",  "f27",  "f28",  "f29",  "f30",  "f31",
 
   "srr0", "msr",  "cr",   "lr",   "ctr",  "xer",  "xer"
 };
@@ -151,13 +151,15 @@ dink32_open (args, from_tty)
 void
 _initialize_dink32_rom ()
 {
-  dink32_cmds.flags = MO_HEX_PREFIX | MO_GETMEM_NEEDS_RANGE | MO_FILL_USES_ADDR | MO_HANDLE_NL | MO_32_REGS_PAIRED | MO_SETREG_INTERACTIVE | MO_SETMEM_INTERACTIVE | MO_GETMEM_16_BOUNDARY | MO_CLR_BREAK_1_BASED;
+  dink32_cmds.flags = MO_HEX_PREFIX | MO_GETMEM_NEEDS_RANGE | MO_FILL_USES_ADDR | MO_HANDLE_NL | MO_32_REGS_PAIRED | MO_SETREG_INTERACTIVE | MO_SETMEM_INTERACTIVE | MO_GETMEM_16_BOUNDARY | MO_CLR_BREAK_1_BASED | MO_SREC_ACK | MO_SREC_ACK_ROTATE;
   dink32_cmds.init = dink32_inits;
   dink32_cmds.cont = "go +\r";
   dink32_cmds.step = "tr +\r";
   dink32_cmds.set_break = "bp 0x%x\r";
   dink32_cmds.clr_break = "bp %d\r";
+#if 0 /* Would need to follow strict alignment rules.. */
   dink32_cmds.fill = "mf %x %x %x\r";
+#endif
   dink32_cmds.setmem.cmdb = "mm -b %x\r";
   dink32_cmds.setmem.cmdw = "mm -w %x\r";
   dink32_cmds.setmem.cmdl = "mm %x\r";
@@ -171,8 +173,12 @@ _initialize_dink32_rom ()
   dink32_cmds.dump_registers = "rd r\r";
   dink32_cmds.register_pattern = "\\(\\w+\\) +=\\([0-9a-fA-F]+\\b\\)";
   dink32_cmds.supply_register = dink32_supply_register;
+  /* S-record download, via "keyboard port".  */
   dink32_cmds.load = "dl -k\r";
+  dink32_cmds.loadresp = "Set Input Port : set to Keyboard Port\r";
+#if 0 /* slow load routine not needed if S-records work... */
   dink32_cmds.load_routine = dink32_load;
+#endif
   dink32_cmds.prompt = "DINK32_603 >>";
   dink32_cmds.line_term = "\r";
   dink32_cmds.target = &dink32_ops;
diff --git a/gdb/monitor.h b/gdb/monitor.h
index 33ef9a9..cf1e0ce 100644
--- a/gdb/monitor.h
+++ b/gdb/monitor.h
@@ -189,6 +189,14 @@ struct monitor_ops
 
 #define MO_CLR_BREAK_1_BASED 0x20000
 
+/* If set, then the monitor acks srecords with a plus sign.  */
+
+#define MO_SREC_ACK_PLUS 0x40000
+
+/* If set, then the monitor "acks" srecords with rotating lines.  */
+
+#define MO_SREC_ACK_ROTATE 0x80000
+
 #define SREC_SIZE 160
 
 extern void monitor_open PARAMS ((char *args, struct monitor_ops *ops,
diff --git a/gdb/remote-est.c b/gdb/remote-est.c
index 25c25ac..8862cc3 100644
--- a/gdb/remote-est.c
+++ b/gdb/remote-est.c
@@ -98,7 +98,7 @@ static char *est_inits[] = {"he\r", /* Resets the prompt, and clears repeated cm
 static struct monitor_ops est_cmds =
 {
   MO_CLR_BREAK_USES_ADDR | MO_FILL_USES_ADDR | MO_NEED_REGDUMP_AFTER_CONT |
-  MO_SREC_ACK,
+  MO_SREC_ACK | MO_SREC_ACK_PLUS,
   est_inits,			/* Init strings */
   "go\r",			/* continue command */
   "sidr\r",			/* single step */