OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

dbdma: use DMA memory interface for memory accesses

Browse Source 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2016-06-05 23:36:43 +01:00 committed by David Gibson
parent ddd495e5e3
commit 8865588133
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/misc/macio/mac_dbdma.c
View File

@ -42,6 +42,7 @@
#include "hw/ppc/mac_dbdma.h" #include "hw/ppc/mac_dbdma.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "sysemu/dma.h"
/* debug DBDMA */ /* debug DBDMA */
//#define DEBUG_DBDMA //#define DEBUG_DBDMA
@ -81,8 +82,8 @@ static void dbdma_cmdptr_load(DBDMA_channel *ch)
{ {
DBDMA_DPRINTF("dbdma_cmdptr_load 0x%08x\n", DBDMA_DPRINTF("dbdma_cmdptr_load 0x%08x\n",
ch->regs[DBDMA_CMDPTR_LO]); ch->regs[DBDMA_CMDPTR_LO]);
cpu_physical_memory_read(ch->regs[DBDMA_CMDPTR_LO], dma_memory_read(&address_space_memory, ch->regs[DBDMA_CMDPTR_LO],
&ch->current, sizeof(dbdma_cmd)); &ch->current, sizeof(dbdma_cmd));
} }
static void dbdma_cmdptr_save(DBDMA_channel *ch) static void dbdma_cmdptr_save(DBDMA_channel *ch)
@ -92,8 +93,8 @@ static void dbdma_cmdptr_save(DBDMA_channel *ch)
DBDMA_DPRINTF("xfer_status 0x%08x res_count 0x%04x\n", DBDMA_DPRINTF("xfer_status 0x%08x res_count 0x%04x\n",
le16_to_cpu(ch->current.xfer_status), le16_to_cpu(ch->current.xfer_status),
le16_to_cpu(ch->current.res_count)); le16_to_cpu(ch->current.res_count));
cpu_physical_memory_write(ch->regs[DBDMA_CMDPTR_LO], dma_memory_write(&address_space_memory, ch->regs[DBDMA_CMDPTR_LO],
&ch->current, sizeof(dbdma_cmd)); &ch->current, sizeof(dbdma_cmd));
} }
static void kill_channel(DBDMA_channel *ch) static void kill_channel(DBDMA_channel *ch)
@ -353,7 +354,7 @@ static void load_word(DBDMA_channel *ch, int key, uint32_t addr,
return; return;
} }
cpu_physical_memory_read(addr, &val, len); dma_memory_read(&address_space_memory, addr, &val, len);
if (len == 2) if (len == 2)
val = (val << 16) | (current->cmd_dep & 0x0000ffff); val = (val << 16) | (current->cmd_dep & 0x0000ffff);
@ -398,7 +399,7 @@ static void store_word(DBDMA_channel *ch, int key, uint32_t addr,
else if (len == 1) else if (len == 1)
val >>= 24; val >>= 24;
cpu_physical_memory_write(addr, &val, len); dma_memory_write(&address_space_memory, addr, &val, len);
if (conditional_wait(ch)) if (conditional_wait(ch))
goto wait; goto wait;