From fc454c83abd628f03eb39800b269d25c54f9591a Mon Sep 17 00:00:00 2001
From: Leo C <erbl259-lmu@yahoo.de>
Date: Fri, 21 Nov 2014 13:46:48 +0100
Subject: [PATCH] Add display offset to dump_mem()

---
 avr/cmd_mem.c         |  2 +-
 avr/debug.c           | 25 +------------------------
 avr/print-utils.c     | 34 ++++++++++++++++++++++++++++------
 include/debug.h       |  2 --
 include/print-utils.h | 16 +++++++++++++++-
 5 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/avr/cmd_mem.c b/avr/cmd_mem.c
index 975cab4..66ace10 100644
--- a/avr/cmd_mem.c
+++ b/avr/cmd_mem.c
@@ -88,7 +88,7 @@ command_ret_t do_mem_md(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
 	}
 
 	/* Print the lines. */
-	dump_mem(addr, length, z180_read_buf, NULL);
+	dump_mem(addr, addr, length, z180_read_buf, NULL);
 
 	dp_last_addr = addr + length;
 	dp_last_length = length;
diff --git a/avr/debug.c b/avr/debug.c
index 1940eb0..27b5329 100644
--- a/avr/debug.c
+++ b/avr/debug.c
@@ -14,29 +14,6 @@
 #ifdef DEBUG
 
 
-void eeprom_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
-{
-	eeprom_read_block((void *) buf, (const void *) (size_t) addr, count);
-}
-
-void ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
-{
-		while (count--)
-			*buf++ = *(uint8_t *) (size_t) addr++;
-}
-
-
-void dump_eep(uint32_t addr, unsigned int len, char *title)
-{
-	dump_mem(addr, len, eeprom_read_buf, title);
-}
-
-void dump_ram(uint32_t addr, unsigned int len, char *title)
-{
-	dump_mem(addr, len, ram_read_buf, title);
-}
-
-
 #if 0
 void dump_heap(void)
 {
@@ -80,7 +57,7 @@ command_ret_t do_dump_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const arg
 		length = (uint16_t) strtoul(argv[2], NULL, 16);
 
 	/* Print the lines. */
-	dump_mem(addr, length, readhow, NULL);
+	dump_mem(addr, addr, length, readhow, NULL);
 
 	return CMD_RET_SUCCESS;
 }
diff --git a/avr/print-utils.c b/avr/print-utils.c
index 2bd1328..050140f 100644
--- a/avr/print-utils.c
+++ b/avr/print-utils.c
@@ -11,14 +11,25 @@ void print_blanks(uint_fast8_t count)
 }
 
 
-int dump_mem(uint32_t startaddr, uint32_t len,
+void eeprom_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+{
+	eeprom_read_block((void *) buf, (const void *) (size_t) addr, count);
+}
+
+void ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+{
+		while (count--)
+			*buf++ = *(uint8_t *) (size_t) addr++;
+}
+
+int dump_mem(uint32_t address, uint32_t offset, uint32_t len,
 		void (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title)
 {
 	uint8_t buf[16];
 	char *indent = NULL;
 	uint8_t llen = 16;
-	uint8_t pre = startaddr % 16;
-	uint32_t addr = startaddr & ~0x0f;
+	uint8_t pre = offset % 16;
+	offset = offset & ~0x0f;
 	len += pre;
 	uint8_t i;
 
@@ -30,9 +41,9 @@ int dump_mem(uint32_t startaddr, uint32_t len,
 	while (len) {
 		if (len < 16)
 			llen = len;
-		readfkt(buf, addr + pre, llen - pre);
+		readfkt(buf, address, llen - pre);
 
-		printf_P(PSTR("%s%.5lx:"),indent, addr);
+		printf_P(PSTR("%s%.5lx:"),indent, offset);
 		for (i = 0; i < llen; i++) {
 			if ((i % 8) == 0)
 				putchar(' ');
@@ -48,8 +59,9 @@ int dump_mem(uint32_t startaddr, uint32_t len,
 			printf_P(PSTR("%c"), isprint(buf[i-pre]) ? buf[i-pre] : '.');
 		putchar('\n');
 
+		address += llen - pre;
+		offset += 16;
 		pre = 0;
-		addr += 16;
 		len -= llen;
 
 		if (ctrlc())
@@ -57,3 +69,13 @@ int dump_mem(uint32_t startaddr, uint32_t len,
 	}
 	return 0;
 }
+
+void dump_eep(uint32_t addr, unsigned int len, char *title)
+{
+	dump_mem(addr, addr, len, eeprom_read_buf, title);
+}
+
+void dump_ram(uint32_t addr, uint32_t offset, unsigned int len, char *title)
+{
+	dump_mem(addr, offset, len, ram_read_buf, title);
+}
diff --git a/include/debug.h b/include/debug.h
index 70039a6..da8e9a0 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -30,8 +30,6 @@
 #endif /* 0 */
 
 
-void dump_eep(uint32_t addr, unsigned int len, char *title);
-void dump_ram(uint32_t addr, unsigned int len, char *title);
 void printfreelist(const char * title);
 
 
diff --git a/include/print-utils.h b/include/print-utils.h
index e76cba7..238cf40 100644
--- a/include/print-utils.h
+++ b/include/print-utils.h
@@ -1,3 +1,17 @@
+#ifndef PRINT_UTILS_H
+#define PRINT_UTILS_H
+
+#include "common.h"
+#include <avr/eeprom.h>
+
 void print_blanks(uint_fast8_t count);
-int dump_mem(uint32_t startaddr, uint32_t len,
+int dump_mem(uint32_t address, uint32_t offset, uint32_t len,
 		void (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title);
+
+void dump_eep(uint32_t addr, unsigned int len, char *title);
+void dump_ram(uint32_t addr, uint32_t offset, unsigned int len, char *title);
+
+void eeprom_read_buf(uint8_t *buf, uint32_t addr, uint8_t count);
+void ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count);
+
+#endif /* PRINT_UTILS_H */
-- 
2.39.2