Commit 3204db98 authored by Eduard - Gabriel Munteanu's avatar Eduard - Gabriel Munteanu Committed by Anthony Liguori
Browse files

es1370: Use PCI DMA stub functions 



This updates the es1370 device emulation to use the explicit PCI DMA
functions, instead of directly calling physical memory access functions.

Signed-off-by: default avatarEduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 93f43c48

hw/es1370.c

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "audiodev.h"

#include "audio/audio.h"

#include "pci.h"

#include "dma.h"



/* Missing stuff:

   SCTRL_P[12](END|ST)INC
@@ -802,7 +803,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, 
            if (!acquired)

                break;



            cpu_physical_memory_write (addr, tmpbuf, acquired);

            pci_dma_write (&s->dev, addr, tmpbuf, acquired);



            temp -= acquired;

            addr += acquired;
@@ -816,7 +817,7 @@ static void es1370_transfer_audio (ES1370State *s, struct chan *d, int loop_sel, 
            int copied, to_copy;



            to_copy = audio_MIN ((size_t) temp, sizeof (tmpbuf));

            cpu_physical_memory_read (addr, tmpbuf, to_copy);

            pci_dma_read (&s->dev, addr, tmpbuf, to_copy);

            copied = AUD_write (voice, tmpbuf, to_copy);

            if (!copied)

                break;