summary refs log tree commit diff stats
path: root/hw/dma.c
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-08 16:45:23 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-08 16:45:23 +0000
commit71db710f7ee00cf324153bbc203e6dad8c99850b (patch)
tree8366782c722140eaf2fd192105289e23f9cad88d /hw/dma.c
parent740733bb939963e77dacda0367eb807dea1c4faf (diff)
downloadfocaccia-qemu-71db710f7ee00cf324153bbc203e6dad8c99850b.tar.gz
focaccia-qemu-71db710f7ee00cf324153bbc203e6dad8c99850b.zip
Fix incorrect target_ulong use in hw devices
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2962 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/dma.c')
-rw-r--r--hw/dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/dma.c b/hw/dma.c
index ea13eae492..2e8608cfce 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -383,7 +383,7 @@ void DMA_register_channel (int nchan,
 int DMA_read_memory (int nchan, void *buf, int pos, int len)
 {
     struct dma_regs *r = &dma_controllers[nchan > 3].regs[nchan & 3];
-    target_ulong addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
+    target_phys_addr_t addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
 
     if (r->mode & 0x20) {
         int i;
@@ -405,7 +405,7 @@ int DMA_read_memory (int nchan, void *buf, int pos, int len)
 int DMA_write_memory (int nchan, void *buf, int pos, int len)
 {
     struct dma_regs *r = &dma_controllers[nchan > 3].regs[nchan & 3];
-    target_ulong addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
+    target_phys_addr_t addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
 
     if (r->mode & 0x20) {
         int i;