-/* Flag defintions */
-
-#define MO_CLR_BREAK_USES_ADDR 0x1 /* If set, then clear breakpoint command
- uses address, otherwise it uses an index
- returned by the monitor. */
-#define MO_FILL_USES_ADDR 0x2 /* If set, then memory fill command uses
- STARTADDR, ENDADDR+1, VALUE as args, else it
- uses STARTADDR, LENGTH, VALUE as args. */
-#define MO_NEED_REGDUMP_AFTER_CONT 0x4 /* If set, then monitor doesn't auto-
- matically supply register dump when
- coming back after a continue. */
-#define MO_GETMEM_NEEDS_RANGE 0x8 /* getmem needs start addr and end addr */
-#define MO_GETMEM_READ_SINGLE 0x10 /* getmem can only read one loc at a time */
-
-extern struct monitor_ops *current_monitor;
-
-#define LOADTYPES (current_monitor->loadtypes)
-#define LOADPROTOS (current_monitor->loadprotos)
-#define INIT_CMD (current_monitor->init)
-#define CONT_CMD (current_monitor->cont)
-#define STEP_CMD (current_monitor->step)
-#define SET_BREAK_CMD (current_monitor->set_break)
-#define CLR_BREAK_CMD (current_monitor->clr_break)
-#define SET_MEM (current_monitor->setmem)
-#define GET_MEM (current_monitor->getmem)
-#define LOAD_CMD (current_monitor->load)
-#define GET_REG (current_monitor->regget)
-#define SET_REG (current_monitor->regset)
-#define CMD_END (current_monitor->cmd_end)
-#define CMD_DELIM (current_monitor->cmd_delim)
-#define PROMPT (current_monitor->prompt)
-#define TARGET_OPS (current_monitor->target)
-#define TARGET_NAME (current_monitor->target->to_shortname)
-#define BAUDRATES (current_monitor->baudrates)
-#define STOPBITS (current_monitor->stopbits)
-#define REGNAMES(x) (current_monitor->regnames[x])
-#define ROMCMD(x) (x.cmd)
-#define ROMDELIM(x) (x.delim)
-#define ROMRES(x) (x.result)
-
-#define push_monitor(x) current_monitor = x;
+/* Flag definitions. */
+
+/* If set, then clear breakpoint command uses address, otherwise it
+ uses an index returned by the monitor. */
+
+#define MO_CLR_BREAK_USES_ADDR 0x1
+
+/* If set, then memory fill command uses STARTADDR, ENDADDR+1, VALUE
+ as args, else it uses STARTADDR, LENGTH, VALUE as args. */
+
+#define MO_FILL_USES_ADDR 0x2
+
+/* If set, then monitor doesn't automatically supply register dump
+ when coming back after a continue. */
+
+#define MO_NEED_REGDUMP_AFTER_CONT 0x4
+
+/* getmem needs start addr and end addr. */
+
+#define MO_GETMEM_NEEDS_RANGE 0x8
+
+/* getmem can only read one loc at a time. */
+
+#define MO_GETMEM_READ_SINGLE 0x10
+
+/* handle \r\n combinations. */
+
+#define MO_HANDLE_NL 0x20
+
+/* don't expect echos in monitor_open. */
+
+#define MO_NO_ECHO_ON_OPEN 0x40
+
+/* If set, send break to stop monitor. */
+
+#define MO_SEND_BREAK_ON_STOP 0x80
+
+/* If set, target sends an ACK after each S-record. */
+
+#define MO_SREC_ACK 0x100
+
+/* Allow 0x prefix on addresses retured from monitor. */
+
+#define MO_HEX_PREFIX 0x200
+
+/* Some monitors require a different command when starting a program. */
+
+#define MO_RUN_FIRST_TIME 0x400
+
+/* Don't expect echos when getting memory */
+
+#define MO_NO_ECHO_ON_SETMEM 0x800
+
+/* If set, then register store command expects value BEFORE regname. */
+
+#define MO_REGISTER_VALUE_FIRST 0x1000
+
+/* If set, then the monitor displays registers as pairs. */
+
+#define MO_32_REGS_PAIRED 0x2000
+
+/* If set, then register setting happens interactively. */
+
+#define MO_SETREG_INTERACTIVE 0x4000
+
+/* If set, then memory setting happens interactively. */
+
+#define MO_SETMEM_INTERACTIVE 0x8000
+
+/* If set, then memory dumps are always on 16-byte boundaries, even
+ when less is desired. */
+
+#define MO_GETMEM_16_BOUNDARY 0x10000
+
+/* If set, then the monitor numbers its breakpoints starting from 1. */
+
+#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
+
+/* If set, then remove useless address bits from memory addresses. */
+
+#define MO_ADDR_BITS_REMOVE 0x100000
+
+/* If set, then display target program output if prefixed by ^O. */
+
+#define MO_PRINT_PROGRAM_OUTPUT 0x200000
+
+/* Some dump bytes commands align the first data with the preceding
+ 16 byte boundary. Some print blanks and start at the exactly the
+ requested boundary. */
+
+#define MO_EXACT_DUMPADDR 0x400000
+
+/* Rather entering and exiting the write memory dialog for each word byte,
+ we can save time by transferring the whole block without exiting
+ the memory editing mode. You only need to worry about this
+ if you are doing memory downloading.
+ This engages a new write function registered with dcache. */
+
+#define MO_HAS_BLOCKWRITES 0x800000