Handle bus errors in md command

3 files changed, 30 insertions, 19 deletions

diff --git a/avr/cmd_mem.c b/avr/cmd_mem.c
index 101b912..effa416 100644
--- a/avr/cmd_mem.c
+++ b/avr/cmd_mem.c
@@ -42,13 +42,14 @@ static	uint32_t	base_address = 0;
 
 /*--------------------------------------------------------------------------*/
 
-
-void z180_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+int z180_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
 {
-		if (z80_bus_cmd(Request) & ZST_ACQUIRED) {
-			z80_read_block (buf, addr, count);
-			z80_bus_cmd(Release);
-		}
+	if (!(z80_bus_cmd(Request) & ZST_ACQUIRED))
+		return -1;
+
+	z80_read_block (buf, addr, count);
+	z80_bus_cmd(Release);
+	return 0;
 }
 
 /*--------------------------------------------------------------------------*/
@@ -92,10 +93,16 @@ command_ret_t do_mem_md(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 	}
 
 	/* Print the lines. */
-	dump_mem(addr, addr, length, z180_read_buf, NULL);
+	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;
+	}
 
-	dp_last_addr = addr + length;
-	dp_last_length = length;
+	if (ret >= 0) {
+		dp_last_addr = addr + length;
+		dp_last_length = length;
+	}
 	return CMD_RET_SUCCESS;
 }
 
diff --git a/avr/debug.c b/avr/debug.c
index f3632c2..e29a085 100644
--- a/avr/debug.c
+++ b/avr/debug.c
@@ -40,7 +40,7 @@ void dump_heap(void)
  */
 command_ret_t do_dump_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	void (*readwhat)(uint8_t *buf, uint32_t addr, uint8_t count);
+	int (*readwhat)(uint8_t *buf, uint32_t addr, uint8_t count);
 
 	(void) cmdtp; (void) flag;
 
diff --git a/avr/print-utils.c b/avr/print-utils.c
index 9ce3e50..83f86a9 100644
--- a/avr/print-utils.c
+++ b/avr/print-utils.c
@@ -18,25 +18,28 @@ void print_blanks(uint_fast8_t count)
 }
 
 
-void eeprom_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+int eeprom_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
 {
 	eeprom_read_block((void *) buf, (const void *) (size_t) addr, count);
+	return 0;
 }
 
-void ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+int ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
 {
-		while (count--)
-			*buf++ = *(uint8_t *) (size_t) addr++;
+	while (count--)
+		*buf++ = *(uint8_t *) (size_t) addr++;
+	return 0;
 }
 
-void flash_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+int flash_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
 {
-		while (count--)
-			*buf++ = *(const __memx uint8_t *) (__uint24) addr++;
+	while (count--)
+		*buf++ = *(const __memx uint8_t *) (__uint24) addr++;
+	return 0;
 }
 
 int dump_mem(uint32_t address, uint32_t offset, uint32_t len,
-		void (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title)
+		int (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title)
 {
 	uint8_t buf[16];
 	char *indent = NULL;
@@ -54,7 +57,8 @@ int dump_mem(uint32_t address, uint32_t offset, uint32_t len,
 	while (len) {
 		if (len < 16)
 			llen = len;
-		readfkt(buf, address, llen - pre);
+		if (readfkt(buf, address, llen - pre) != 0)
+			return -2; /* TODO: Error codes */
 
 		printf_P(PSTR("%s%.5lx:"),indent, offset);
 		for (i = 0; i < llen; i++) {