Commit 88655881 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

dbdma: use DMA memory interface for memory accesses 



Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent ddd495e5

hw/misc/macio/mac_dbdma.c

+7 −6
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "hw/ppc/mac_dbdma.h"

#include "qemu/main-loop.h"

#include "qemu/log.h"

#include "sysemu/dma.h"



/* debug DBDMA */

//#define DEBUG_DBDMA
@@ -81,7 +82,7 @@ static void dbdma_cmdptr_load(DBDMA_channel *ch) 
{

    DBDMA_DPRINTF("dbdma_cmdptr_load 0x%08x\n",

                  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));

}
@@ -92,7 +93,7 @@ static void dbdma_cmdptr_save(DBDMA_channel *ch) 
    DBDMA_DPRINTF("xfer_status 0x%08x res_count 0x%04x\n",

                  le16_to_cpu(ch->current.xfer_status),

                  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));

}
@@ -353,7 +354,7 @@ static void load_word(DBDMA_channel *ch, int key, uint32_t addr, 
        return;

    }



    cpu_physical_memory_read(addr, &val, len);

    dma_memory_read(&address_space_memory, addr, &val, len);



    if (len == 2)

        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)

        val >>= 24;



    cpu_physical_memory_write(addr, &val, len);

    dma_memory_write(&address_space_memory, addr, &val, len);



    if (conditional_wait(ch))

        goto wait;