X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/fcf1d5b30bd3b341fb7596aef395f347c6dc97b4..89826c563e38a30d5bfc589905eb1202fa14b751:/avr/cmd_mem.c?ds=sidebyside

diff --git a/avr/cmd_mem.c b/avr/cmd_mem.c
index 763b857..d641410 100644
--- a/avr/cmd_mem.c
+++ b/avr/cmd_mem.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014,2018 Leo C. <erbl259-lmu@yahoo.de>
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -13,11 +13,9 @@
  * Copied from FADS ROM, Dan Malek (dmalek@jlc.net)
  */
 
-#include "common.h"
-#include <ctype.h>
+#include "cmd_mem.h"
 #include <avr/interrupt.h>
 
-#include "command.h"
 #include "cli_readline.h"
 #include "print-utils.h"
 #include "con-utils.h"
@@ -43,18 +41,31 @@ static	uint32_t	base_address = 0;
 
 /*--------------------------------------------------------------------------*/
 
-int z180_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+static ERRNUM z180_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
 {
 	if (!(z80_bus_cmd(Request) & ZST_ACQUIRED))
-		return -1;
+		return EBUSTO;
 
 	z80_read_block (buf, addr, count);
 	z80_bus_cmd(Release);
-	return 0;
+	return ESUCCESS;
 }
 
 /*--------------------------------------------------------------------------*/
 
+command_ret_t do_mem_size(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
+{
+	int32_t ramsize = z80_memsize_detect();
+
+	if (ramsize < 0)
+		cmd_error(CMD_RET_FAILURE, (ERRNUM) -ramsize, PSTR("Couldn't access RAM"));
+
+	printf_P(PSTR("Detected RAM: Start %.5lx, End: %.5lx, Size: %.5lx (%ld dec)\n"),
+		0l, ramsize ? ramsize-1 : 0l, ramsize, ramsize);
+
+	return CMD_RET_SUCCESS;
+}
+
 /* Memory Display
  *
  * Syntax:
@@ -94,13 +105,11 @@ command_ret_t do_mem_md(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * co
 	}
 
 	/* Print the lines. */
-	int ret = dump_mem(addr, addr, length, z180_read_buf, NULL);
-	if (ret == -2)  { /* TODO: Error codes */
-		my_puts_P(PSTR("Bus timeout\n"));
-		return  CMD_RET_FAILURE;
-	}
+	ERRNUM ret = dump_mem(addr, addr, length, z180_read_buf, NULL);
+	if (ret == EBUSTO)
+		cmd_error(CMD_RET_FAILURE, ret, NULL);
 
-	if (ret >= 0) {
+	if (ret == ESUCCESS) {
 		dp_last_addr = addr + length;
 		dp_last_length = length;
 	}
@@ -144,10 +153,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, uint_fast8_t flag, int argc, char * cons
 	 * the next value.  A non-converted value exits.
 	 */
 	do {
-		if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-			my_puts_P(PSTR("Bus timeout\n"));
-			return  CMD_RET_FAILURE;
-		}
+		z80_bus_request_or_exit();
 		data = z80_read(addr);
 		z80_bus_cmd(Release);
 		printf_P(PSTR("%05lx: %02x"), addr, data);
@@ -166,10 +172,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, uint_fast8_t flag, int argc, char * cons
 			data = eval_arg(console_buffer, &endp);
 			nbytes = endp - console_buffer;
 			if (nbytes) {
-				if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-					my_puts_P(PSTR("Bus timeout\n"));
-					return  CMD_RET_FAILURE;
-				}
+				z80_bus_request_or_exit();
 				z80_write(addr, data);
 				z80_bus_cmd(Release);
 				if (incrflag)
@@ -235,11 +238,7 @@ command_ret_t do_mem_mw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * co
 	if (argc == 3)
 		count = eval_arg(argv[optind], NULL);
 
-	if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-		my_puts_P(PSTR("Bus timeout\n"));
-		return  CMD_RET_FAILURE;
-	}
-
+	z80_bus_request_or_exit();
 	if (width == 1)
 		z80_memset(addr, writeval, count);
 	else {
@@ -380,10 +379,7 @@ command_ret_t do_mem_cp(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * co
 
 	while (count-- > 0) {
 		uint8_t data;
-		if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-			my_puts_P(PSTR("Bus timeout\n"));
-			return  CMD_RET_FAILURE;
-		}
+		z80_bus_request_or_exit();
 		data = z80_read(src);
 		z80_write(dest, data);
 		z80_bus_cmd(Release);
@@ -436,19 +432,13 @@ command_ret_t do_mem_loop(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc,
 	 * If we have only one object, just run infinite loops.
 	 */
 	if (length == 1) {
-		if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-			my_puts_P(PSTR("Bus timeout\n"));
-			return  CMD_RET_FAILURE;
-		}
+		z80_bus_request_or_exit();
 		cli();
 		for (;;)
 			z80_read(addr);
 	}
 
-	if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-		my_puts_P(PSTR("Bus timeout\n"));
-		return  CMD_RET_FAILURE;
-	}
+	z80_bus_request_or_exit();
 	cli();
 	for (;;) {
 		uint32_t i = length;
@@ -484,19 +474,13 @@ command_ret_t do_mem_loopw (cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char
 	 * If we have only one object, just run infinite loops.
 	 */
 	if (length == 1) {
-		if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-			my_puts_P(PSTR("Bus timeout\n"));
-			return  CMD_RET_FAILURE;
-		}
+		z80_bus_request_or_exit();
 		cli();
 		for (;;)
 			z80_write(addr, data);
 	}
 
-	if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-		my_puts_P(PSTR("Bus timeout\n"));
-		return  CMD_RET_FAILURE;
-	}
+	z80_bus_request_or_exit();
 	cli();
 	for (;;) {
 		uint32_t i = length;
@@ -770,10 +754,7 @@ command_ret_t do_mem_mtest(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc,
 		printf_P(PSTR("Iteration: %6d\r"), iteration + 1);
 //		debug("\n");
 
-		if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
-			my_puts_P(PSTR("Bus timeout\n"));
-			return  CMD_RET_FAILURE;
-		}
+		z80_bus_request_or_exit();
 		errs += mem_test_alt(start, end);
 		z80_bus_cmd(Release);