summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo C2014-11-25 11:25:19 +0100
committerLeo C2014-11-25 11:25:19 +0100
commitcca42593c4ab9e564675d1896caa9a7e794d6fec (patch)
treeb37e070994064cbebfc0c2e568941aa9b6201e4d
parenta882a089ae73d71acf57f92096e36313ede5b9c5 (diff)
downloadz180-stamp-cca42593c4ab9e564675d1896caa9a7e794d6fec.zip
dump_ram() parameter
-rw-r--r--avr/cmd_sd.c10
-rw-r--r--avr/print-utils.c4
-rw-r--r--include/print-utils.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c
index a0c6f52..2ccf024 100644
--- a/avr/cmd_sd.c
+++ b/avr/cmd_sd.c
@@ -108,16 +108,16 @@ command_ret_t do_status(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[
printf_P(PSTR("Card type: %u\n"), dat.uc);
if (disk_ioctl(dev, MMC_GET_CSD, dat.uca) == RES_OK)
- dump_ram((uint32_t) (size_t) dat.uca, 0, 16, "CSD:");
+ dump_ram(dat.uca, 0, 16, "CSD:");
if (disk_ioctl(dev, MMC_GET_CID, dat.uca) == RES_OK)
- dump_ram((uint32_t) (size_t) dat.uca, 0, 16, "CID:");
+ dump_ram(dat.uca, 0, 16, "CID:");
if (disk_ioctl(dev, MMC_GET_OCR, dat.uca) == RES_OK)
- dump_ram((uint32_t) (size_t) dat.uca, 0, 4, "OCR:");
+ dump_ram(dat.uca, 0, 4, "OCR:");
if (disk_ioctl(dev, MMC_GET_SDSTAT, dat.uca) == RES_OK)
- dump_ram((uint32_t) (size_t) dat.uca, 0, 64, "SD Status:");
+ dump_ram(dat.uca, 0, 64, "SD Status:");
if (disk_ioctl(dev, ATA_GET_MODEL, dat.uca) == RES_OK) {
dat.uca[40] = '\0';
@@ -176,7 +176,7 @@ command_ret_t do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
sprintf_P(header, PSTR("Sector: %lu"), sec);
- dump_ram((uint32_t) (size_t) buffer, 0, _MAX_SS, header);
+ dump_ram(buffer, 0, _MAX_SS, header);
}
dev_last = dev;
sec_last = sec;
diff --git a/avr/print-utils.c b/avr/print-utils.c
index 050140f..4205a90 100644
--- a/avr/print-utils.c
+++ b/avr/print-utils.c
@@ -75,7 +75,7 @@ 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)
+void dump_ram(uint8_t *addr, size_t offset, unsigned int len, char *title)
{
- dump_mem(addr, offset, len, ram_read_buf, title);
+ dump_mem((uint32_t) (size_t) addr, offset, len, ram_read_buf, title);
}
diff --git a/include/print-utils.h b/include/print-utils.h
index 238cf40..5604d3b 100644
--- a/include/print-utils.h
+++ b/include/print-utils.h
@@ -9,7 +9,7 @@ int dump_mem(uint32_t address, uint32_t offset, uint32_t len,
void (*readfkt)(uint8_t *, uint32_t, uint8_t), char *title);
void dump_eep(uint32_t addr, unsigned int len, char *title);
-void dump_ram(uint32_t addr, uint32_t offset, unsigned int len, char *title);
+void dump_ram(uint8_t *addr, size_t offset, unsigned int len, char *title);
void eeprom_read_buf(uint8_t *buf, uint32_t addr, uint8_t count);
void ram_read_buf(uint8_t *buf, uint32_t addr, uint8_t count);