Handle bus errors in md command

1 files changed, 13 insertions, 9 deletions

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++) {