Add display offset to dump_mem()

[z180-stamp.git] / avr / print-utils.c

diff --git a/avr/print-utils.c b/avr/print-utils.c
index 2bd132873b75f9b528e73f337a988e1b2eb6ec3a..050140ff9215247d9d688d18c92e0758e494d2b7 100644 (file)
--- 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);
+}