ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/char/goldfish: Use DMA memory API 

Rather than using address_space_rw(..., 0 or 1),
use the simpler DMA memory API which expand to
the same code. This allows removing a cast on
the 'buf' variable which is really const. Since
'buf' is only used in the CMD_READ_BUFFER case,
we can reduce its scope.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240723181850.46000-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-07-23 20:14:28 +02:00
parent 2f28f28e74
commit c9e0b9a59c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/char/goldfish_tty.c
View File

@ -16,6 +16,7 @@
#include "qemu/log.h" #include "qemu/log.h"
#include "trace.h" #include "trace.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/dma.h"
#include "hw/char/goldfish_tty.h" #include "hw/char/goldfish_tty.h"
#define GOLDFISH_TTY_VERSION 1 #define GOLDFISH_TTY_VERSION 1
@ -69,7 +70,6 @@ static uint64_t goldfish_tty_read(void *opaque, hwaddr addr,
static void goldfish_tty_cmd(GoldfishTTYState *s, uint32_t cmd) static void goldfish_tty_cmd(GoldfishTTYState *s, uint32_t cmd)
{ {
uint32_t to_copy; uint32_t to_copy;
uint8_t *buf;
uint8_t data_out[GOLFISH_TTY_BUFFER_SIZE]; uint8_t data_out[GOLFISH_TTY_BUFFER_SIZE];
int len; int len;
uint64_t ptr; uint64_t ptr;
@ -97,8 +97,8 @@ static void goldfish_tty_cmd(GoldfishTTYState *s, uint32_t cmd)
while (len) { while (len) {
to_copy = MIN(GOLFISH_TTY_BUFFER_SIZE, len); to_copy = MIN(GOLFISH_TTY_BUFFER_SIZE, len);
address_space_rw(&address_space_memory, ptr, dma_memory_read_relaxed(&address_space_memory, ptr,
MEMTXATTRS_UNSPECIFIED, data_out, to_copy, 0); data_out, to_copy);
qemu_chr_fe_write_all(&s->chr, data_out, to_copy); qemu_chr_fe_write_all(&s->chr, data_out, to_copy);
len -= to_copy; len -= to_copy;
@ -109,9 +109,9 @@ static void goldfish_tty_cmd(GoldfishTTYState *s, uint32_t cmd)
len = s->data_len; len = s->data_len;
ptr = s->data_ptr; ptr = s->data_ptr;
while (len && !fifo8_is_empty(&s->rx_fifo)) { while (len && !fifo8_is_empty(&s->rx_fifo)) {
buf = (uint8_t *)fifo8_pop_buf(&s->rx_fifo, len, &to_copy); const uint8_t *buf = fifo8_pop_buf(&s->rx_fifo, len, &to_copy);
address_space_rw(&address_space_memory, ptr,
MEMTXATTRS_UNSPECIFIED, buf, to_copy, 1); dma_memory_write_relaxed(&address_space_memory, ptr, buf, to_copy);
len -= to_copy; len -= to_copy;
ptr += to_copy; ptr += to_copy;