On Tue, Jun 30, 2020 at 6:44 AM Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
>
> Having 'base address' and 'relative offset' displayed
> separately is more helpful than the absolute address.
>
> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/sd/sd.c | 8 ++++----
> hw/sd/trace-events | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index eb549a52e1..304fa4143a 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1855,8 +1855,8 @@ void sd_write_data(SDState *sd, uint8_t value)
> return;
>
> trace_sdcard_write_data(sd->proto_name,
> - sd_current_cmd_name(sd),
> - sd->current_cmd, value);
> + sd_current_cmd_name(sd), sd->current_cmd,
> + sd->data_start, sd->data_offset, value);
> switch (sd->current_cmd) {
> case 24: /* CMD24: WRITE_SINGLE_BLOCK */
> sd->data[sd->data_offset ++] = value;
> @@ -2009,8 +2009,8 @@ uint8_t sd_read_data(SDState *sd)
> io_len = (sd->ocr & (1 << 30)) ? HWBLOCK_SIZE : sd->blk_len;
>
> trace_sdcard_read_data(sd->proto_name,
> - sd_current_cmd_name(sd),
> - sd->current_cmd, io_len);
> + sd_current_cmd_name(sd), sd->current_cmd,
> + sd->data_start, sd->data_offset, io_len);
> switch (sd->current_cmd) {
> case 6: /* CMD6: SWITCH_FUNCTION */
> ret = sd->data[sd->data_offset ++];
> diff --git a/hw/sd/trace-events b/hw/sd/trace-events
> index d0cd7c6ec4..946923223b 100644
> --- a/hw/sd/trace-events
> +++ b/hw/sd/trace-events
> @@ -51,8 +51,8 @@ sdcard_lock(void) ""
> sdcard_unlock(void) ""
> sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
> sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size
> 0x%x"
> -sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd,
> uint8_t value) "%s %20s/ CMD%02d value 0x%02x"
> -sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd,
> uint32_t length) "%s %20s/ CMD%02d len %" PRIu32
> +sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd,
> uint64_t address, uint32_t offset, uint8_t value) "%s %20s/ CMD%02d addr 0x%"
> PRIx64 " ofs 0x%" PRIx32 " val 0x%02x"
> +sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd,
> uint64_t address, uint32_t offset, uint32_t length) "%s %20s/ CMD%02d addr
> 0x%" PRIx64 " ofs 0x%" PRIx32 " len %" PRIu32
> sdcard_set_voltage(uint16_t millivolts) "%u mV"
>
> # milkymist-memcard.c
> --
> 2.21.3
>
>
