/*
- * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014-2016 Leo C. <erbl259-lmu@yahoo.de>
*
* (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0
*/
/*
#include <util/atomic.h>
#include "command.h"
+#include "cli_readline.h" /* console_buffer[] */
+#include "cli.h" /* run_command() */
#include "env.h"
#include "con-utils.h"
#include "z80-if.h"
-#include "z180-serv.h"
+#include "z180-serv.h" /* restart_z180_serv() */
#include "debug.h"
/* ugly hack to get Z180 loadfile into flash memory */
}
if (argc > 1)
- count = (uint16_t) strtoul(argv[2], NULL, 16);
+ count = (uint16_t) strtoul(argv[1], NULL, 16);
z80_bus_cmd(Request);
while (count--)
if (addr != 0) {
uint8_t tmp[3];
- uint_fast8_t i;
z80_bus_cmd(Request);
- for (i = 0; i < 3; i++)
- tmp[i] = z80_read(i);
+ z80_read_block (tmp, 0, 3);
z80_write(0, 0xc3);
z80_write(1, addr);
z80_write(2, (addr >> 8));
z80_bus_cmd(Run);
z80_bus_cmd(M_Cycle);
z80_bus_cmd(M_Cycle);
- for (i = 0; i < 3; i++)
- z80_write(i, tmp[i]);
+ z80_write_block(tmp, 0, 3);
} else
z80_bus_cmd(Run);
{ printf_P(PSTR("\n"
"------------------------------------------------\n"
" ?,H - This Help\n"
- " R - Reset (Restart) CPU\n"
" Q,X - Return to command line\n"
+ " R - Reset (Restart) CPU\n"
+ " : - Execute monitor command\n"
" \\ - code input:\n"
" \\nnn 3 decimal digits character code\n"
" \\Xhh 2 hexadecimal digits character code\n"
(void) cmdtp; (void) flag; (void) argc; (void) argv;
+ printf_P(PSTR("Connecting to CPU. Escape character is '^%c'.\n"),
+ esc_char + 0x40);
while (1) {
goto quit;
break;
+ case ':':
+ putchar('\n');
+ int cmdlen = cli_readline(PSTR(": "), 1);
+ if (cmdlen > 0)
+ run_command(console_buffer, 0);
+ break;
+
case '\\':
code = 0;
state = 3;
if (isdigit(ch)) {
code = code * 10 + ch - '0';
state++;
+ } else {
+ if (state > 3)
+ z80_memfifo_putc(fifo_conin, code);
+ z80_memfifo_putc(fifo_conin, ch);
+ state = 0;
}
if (state > 5) {
z80_memfifo_putc(fifo_conin, code);
ch -= 'A' - 10;
code = code * 16 + ch - '0';
state++;
+ }else {
+ if (state > 6)
+ z80_memfifo_putc(fifo_conin, code);
+ z80_memfifo_putc(fifo_conin, ch);
+ state = 0;
}
if (state > 7) {
z80_memfifo_putc(fifo_conin, code);