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

hw/ssi/xilinx_spips: Convert lqspi_read() to read_with_attrs 

In the next commit we will implement the write_with_attrs()
handler. To avoid using different APIs, convert the read()
handler first.

Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.com>
Tested-by: Francisco Iglesias <frasse.iglesias@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2019-07-15 14:17:03 +01:00 committed by Peter Maydell
parent 45b1a243b8
commit 5937bd50d3
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/ssi/xilinx_spips.c
View File

@ -1202,27 +1202,26 @@ static void lqspi_load_cache(void *opaque, hwaddr addr)
} }
} }
static uint64_t static MemTxResult lqspi_read(void *opaque, hwaddr addr, uint64_t *value,
lqspi_read(void *opaque, hwaddr addr, unsigned int size) unsigned size, MemTxAttrs attrs)
{ {
XilinxQSPIPS *q = opaque; XilinxQSPIPS *q = XILINX_QSPIPS(opaque);
uint32_t ret;
if (addr >= q->lqspi_cached_addr && if (addr >= q->lqspi_cached_addr &&
addr <= q->lqspi_cached_addr + LQSPI_CACHE_SIZE - 4) { addr <= q->lqspi_cached_addr + LQSPI_CACHE_SIZE - 4) {
uint8_t *retp = &q->lqspi_buf[addr - q->lqspi_cached_addr]; uint8_t *retp = &q->lqspi_buf[addr - q->lqspi_cached_addr];
ret = cpu_to_le32(*(uint32_t *)retp); *value = cpu_to_le32(*(uint32_t *)retp);
DB_PRINT_L(1, "addr: %08x, data: %08x\n", (unsigned)addr, DB_PRINT_L(1, "addr: %08" HWADDR_PRIx ", data: %08" PRIx64 "\n",
(unsigned)ret); addr, *value);
return ret; return MEMTX_OK;
} else {
lqspi_load_cache(opaque, addr);
return lqspi_read(opaque, addr, size);
} }
lqspi_load_cache(opaque, addr);
return lqspi_read(opaque, addr, value, size, attrs);
} }
static const MemoryRegionOps lqspi_ops = { static const MemoryRegionOps lqspi_ops = {
.read = lqspi_read, .read_with_attrs = lqspi_read,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
.valid = { .valid = {
.min_access_size = 1, .min_access_size = 1,