/*
- * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ * (C) Copyright 2014,2018 Leo C. <erbl259-lmu@yahoo.de>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0
*/
#include "common.h"
#include <stdint.h>
-#include <stdio.h>
-#include <ctype.h>
#include "con-utils.h"
#include "print-utils.h"
}
-int eeprom_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+ERRNUM 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;
+ return ESUCCESS;
}
-int ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+ERRNUM ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
{
while (count--)
*buf++ = *(uint8_t *) (size_t) addr++;
- return 0;
+ return ESUCCESS;
}
-int flash_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
+ERRNUM flash_read_buf(uint8_t *buf, uint32_t addr, uint8_t count)
{
while (count--)
*buf++ = *(const __memx uint8_t *) (__uint24) addr++;
- return 0;
+ return ESUCCESS;
}
-int dump_mem(uint32_t address, uint32_t offset, uint32_t len,
- int (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title)
+ERRNUM dump_mem(uint32_t address, uint32_t offset, uint32_t len,
+ ERRNUM (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title)
{
uint8_t buf[16];
- char *indent = NULL;
uint8_t llen = 16;
uint8_t pre = offset % 16;
offset = offset & ~0x0f;
if (title && *title) {
printf_P(PSTR("%s\n"),title);
- indent = " ";
}
while (len) {
if (len < 16)
llen = len;
- if (readfkt(buf, address, llen - pre) != 0)
- return -2; /* TODO: Error codes */
+ ERRNUM err = readfkt(buf, address, llen - pre);
+ if (err != ESUCCESS)
+ return err;
- printf_P(PSTR("%s%.5lx:"),indent, offset);
+ if (title)
+ print_blanks(4);
+ printf_P(PSTR("%.5lx:"),offset);
for (i = 0; i < llen; i++) {
if ((i % 8) == 0)
putchar(' ');
len -= llen;
if (ctrlc())
- return -1;
+ return EINTR;
}
- return 0;
+ return ESUCCESS;
}
void dump_eep(uint32_t addr, unsigned int len, char *title)