X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/e39cd2a2822a410ba06d61657a467c8307daa35d..910e72069ea19a79e06e7146a5e42d0bb05a9c2f:/avr/print-utils.c

diff --git a/avr/print-utils.c b/avr/print-utils.c
index 2bd1328..83f86a9 100644
--- a/avr/print-utils.c
+++ b/avr/print-utils.c
@@ -1,4 +1,11 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
 #include "common.h"
+#include <stdint.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "con-utils.h"
@@ -11,14 +18,34 @@ void print_blanks(uint_fast8_t count)
 }
 
 
-int dump_mem(uint32_t startaddr, uint32_t len,
-		void (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title)
+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;
+}
+
+int ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+{
+	while (count--)
+		*buf++ = *(uint8_t *) (size_t) addr++;
+	return 0;
+}
+
+int flash_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+{
+	while (count--)
+		*buf++ = *(const __memx uint8_t *) (__uint24) addr++;
+	return 0;
+}
+
+int dump_mem(uint32_t address, uint32_t offset, uint32_t len,
+		int (*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 +57,10 @@ int dump_mem(uint32_t startaddr, uint32_t len,
 	while (len) {
 		if (len < 16)
 			llen = len;
-		readfkt(buf, addr + pre, llen - pre);
+		if (readfkt(buf, address, llen - pre) != 0)
+			return -2; /* TODO: Error codes */
 
-		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 +76,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 +86,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(uint8_t *addr, size_t offset, unsigned int len, char *title)
+{
+	dump_mem((uint32_t) (size_t) addr, offset, len, ram_read_buf, title);
+}