1 files changed, 13 insertions, 58 deletions

diff --git a/avr/debug.c b/avr/debug.c
index fcbd2c1..16df702 100644
--- a/avr/debug.c
+++ b/avr/debug.c
@@ -12,8 +12,6 @@
  */
 #ifdef DEBUG
 
-//uint8_t eeprom_read_byte (const uint8_t *__p)
-
 static void print_blanks(uint_fast8_t count)
 {
 	while(count--)
@@ -29,14 +27,17 @@ void dump_mem(const uint8_t *startaddr, int len,
 		uint8_t (*readfkt)(const uint8_t *), char *title)
 {
 	uint8_t buf[16];
+	char *indent = NULL;
 	uint8_t llen = 16;
 	uint8_t pre = (size_t) startaddr % 16;
 	const uint8_t *addr = (uint8_t *) ((size_t) startaddr & ~0x0f);
 	len += pre;
 	uint8_t i;
 	
-	if (title && *title)
+	if (title && *title) {
 		printf_P(PSTR("%s\n"),title);
+		indent = "    ";
+	}
 		
 	while (len) {
 		if (len < 16)
@@ -45,7 +46,7 @@ void dump_mem(const uint8_t *startaddr, int len,
 		for (i = pre; i < llen; i++)
 			buf[i] = readfkt(addr + i);
 
-		printf_P(PSTR("%04x:"), addr);
+		printf_P(PSTR("%s%04x:"),indent, addr);
 		for (i = 0; i < llen; i++) {
 			if ((i % 8) == 0)
 				putchar(' ');
@@ -67,37 +68,17 @@ void dump_mem(const uint8_t *startaddr, int len,
 	}
 }
 
-#if 0
-void dump_ram(const uint8_t *startaddr, int len, char *title)
+void dump_eep(const uint8_t *addr, unsigned int len, char *title)
 {
-	uint8_t llen = 16;
-	uint8_t pre = (size_t) startaddr % 16;
-	const uint8_t *addr = (uint8_t *) ((size_t) startaddr & ~0x0f);
-	len += pre;
-	uint8_t i;
-
-	if (title && *title)
-		printf_P(PSTR("%s\n"),title);
+	dump_mem(addr, len, eeprom_read_byte, title);
+}
 
-	while (len) {
-		if (len < 16)
-			llen = len;
+void dump_ram(const uint8_t *addr, unsigned int len, char *title)
+{
+	dump_mem(addr, len, ram_read_byte, title);
+}
 
-		printf_P(PSTR("    %.4x:"), (size_t) addr);
-		print_blanks(3 * pre);
-		for (i = pre; i < llen; i++)
-			printf_P(PSTR(" %.2x"), addr[i]);
-		print_blanks(3 * (16 - i + 1) + pre);
-		for (i = pre; i < llen; i++)
-			printf_P(PSTR("%c"), isprint(addr[i]) ? addr[i] : '.');
-		putchar('\n');
 
-		pre = 0;
-		addr += 16;
-		len -= llen;
-	}
-}
-#endif
 #if 0
 void dump_heap(void)
 {
@@ -109,35 +90,9 @@ void dump_heap(void)
 }
 #endif
 
-#if 0
-/* TODO: combine with dump_ram() */
-void dump_eep(const uint8_t *addr, unsigned int len, 
-			uint8_t (*readfkt)(const uint8_t *))
-{
-	uint_fast8_t i;
-	uint8_t buf[16];
-
-	printf_P(PSTR("eeprom dump:"));
-	while (len) {
-		printf_P(PSTR("\n    0x%.4x:"), (unsigned int) addr);
-		for (i = 0; i<16; i++)
-			buf[i] = readfkt(addr + i);
-		for (i = 0; i<16; i++)
-			printf_P(PSTR(" %.2x"), buf[i]);
-		printf_P(PSTR("   "));
-		for (i = 0; i<16; i++)
-			printf_P(PSTR("%c"), isprint(buf[i]) ? buf[i] : '.');
-
-		addr += 16;
-		len -= len > 16 ? 16 : len;
-	}
-	putchar('\n');
-}
-#endif
-
 
 /*
- * EEPROM Display
+ * Memory Display
  *	md addr {len}
  */
 command_ret_t do_dump_mem(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])