diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-15 20:24:25 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-15 20:24:25 +0000 |
| commit | 09723aa114f9755b860dd1b6ad2281dea47b77fc (patch) | |
| tree | df7ef76bd580f3661e0687643af92350bdeaacb2 | |
| parent | 3af72a4d98dca033492102603734cbc63cd2694a (diff) | |
| download | qemu-09723aa114f9755b860dd1b6ad2281dea47b77fc.zip qemu-09723aa114f9755b860dd1b6ad2281dea47b77fc.tar.gz qemu-09723aa114f9755b860dd1b6ad2281dea47b77fc.tar.bz2 | |
Revert part of r5853
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6057 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/sparc32_dma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c index e12216d..354b551 100644 --- a/hw/sparc32_dma.c +++ b/hw/sparc32_dma.c @@ -45,6 +45,9 @@ do { printf("DMA: " fmt , ##args); } while (0) #define DMA_REGS 4 #define DMA_SIZE (4 * sizeof(uint32_t)) +/* We need the mask, because one instance of the device is not page + aligned (ledma, start address 0x0010) */ +#define DMA_MASK (DMA_SIZE - 1) #define DMA_VER 0xa0000000 #define DMA_INTR 1 @@ -156,7 +159,7 @@ static uint32_t dma_mem_readl(void *opaque, target_phys_addr_t addr) DMAState *s = opaque; uint32_t saddr; - saddr = addr >> 2; + saddr = (addr & DMA_MASK) >> 2; DPRINTF("read dmareg " TARGET_FMT_plx ": 0x%8.8x\n", addr, s->dmaregs[saddr]); @@ -168,7 +171,7 @@ static void dma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val) DMAState *s = opaque; uint32_t saddr; - saddr = addr >> 2; + saddr = (addr & DMA_MASK) >> 2; DPRINTF("write dmareg " TARGET_FMT_plx ": 0x%8.8x -> 0x%8.8x\n", addr, s->dmaregs[saddr], val); switch (saddr) { |