[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 15/42] esp: introduce esp_pdma_read() and esp_pdma_write()
From: |
Laurent Vivier |
Subject: |
Re: [PATCH v2 15/42] esp: introduce esp_pdma_read() and esp_pdma_write() functions |
Date: |
Mon, 1 Mar 2021 23:06:06 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 |
Le 09/02/2021 à 20:29, Mark Cave-Ayland a écrit :
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
> hw/scsi/esp.c | 28 ++++++++++++++++++++--------
> 1 file changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
> index e7cf36f4b8..b0cba889a9 100644
> --- a/hw/scsi/esp.c
> +++ b/hw/scsi/esp.c
> @@ -151,6 +151,20 @@ static uint8_t *get_pdma_buf(ESPState *s)
> return NULL;
> }
>
> +static uint8_t esp_pdma_read(ESPState *s)
> +{
> + uint8_t *buf = get_pdma_buf(s);
> +
> + return buf[s->pdma_cur++];
> +}
> +
> +static void esp_pdma_write(ESPState *s, uint8_t val)
> +{
> + uint8_t *buf = get_pdma_buf(s);
> +
> + buf[s->pdma_cur++] = val;
> +}
> +
> static int get_cmd_cb(ESPState *s)
> {
> int target;
> @@ -910,7 +924,6 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr
> addr,
> SysBusESPState *sysbus = opaque;
> ESPState *s = ESP(&sysbus->esp);
> uint32_t dmalen = esp_get_tc(s);
> - uint8_t *buf = get_pdma_buf(s);
>
> trace_esp_pdma_write(size);
>
> @@ -919,13 +932,13 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr
> addr,
> }
> switch (size) {
> case 1:
> - buf[s->pdma_cur++] = val;
> + esp_pdma_write(s, val);
> s->pdma_len--;
> dmalen--;
> break;
> case 2:
> - buf[s->pdma_cur++] = val >> 8;
> - buf[s->pdma_cur++] = val;
> + esp_pdma_write(s, val >> 8);
> + esp_pdma_write(s, val);
> s->pdma_len -= 2;
> dmalen -= 2;
> break;
> @@ -944,7 +957,6 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hwaddr
> addr,
> SysBusESPState *sysbus = opaque;
> ESPState *s = ESP(&sysbus->esp);
> uint32_t dmalen = esp_get_tc(s);
> - uint8_t *buf = get_pdma_buf(s);
> uint64_t val = 0;
>
> trace_esp_pdma_read(size);
> @@ -954,13 +966,13 @@ static uint64_t sysbus_esp_pdma_read(void *opaque,
> hwaddr addr,
> }
> switch (size) {
> case 1:
> - val = buf[s->pdma_cur++];
> + val = esp_pdma_read(s);
> s->pdma_len--;
> dmalen--;
> break;
> case 2:
> - val = buf[s->pdma_cur++];
> - val = (val << 8) | buf[s->pdma_cur++];
> + val = esp_pdma_read(s);
> + val = (val << 8) | esp_pdma_read(s);
> s->pdma_len -= 2;
> dmalen -= 2;
> break;
>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH v2 15/42] esp: introduce esp_pdma_read() and esp_pdma_write() functions,
Laurent Vivier <=