From 46dccb01821ed3f50b55fb905825437e90e1fae6 Mon Sep 17 00:00:00 2001 From: Jannik Vogel Date: Mon, 11 Feb 2019 20:05:32 +0100 Subject: [PATCH] apu: Use GP_DSP_MIXBUF_BASE to refer to MIXBUF base --- hw/xbox/mcpx_apu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/xbox/mcpx_apu.c b/hw/xbox/mcpx_apu.c index 1b822444f4..92d304fd6d 100644 --- a/hw/xbox/mcpx_apu.c +++ b/hw/xbox/mcpx_apu.c @@ -159,6 +159,8 @@ static const struct { # define NV_PAVS_VOICE_TAR_PITCH_LINK_NEXT_VOICE_HANDLE 0x0000FFFF +#define GP_DSP_MIXBUF_BASE 0x001400 + #define GP_OUTPUT_FIFO_COUNT 4 #define GP_INPUT_FIFO_COUNT 2 @@ -659,7 +661,7 @@ static uint64_t gp_read(void *opaque, } case NV_PAPU_GPMIXBUF ... NV_PAPU_GPMIXBUF + 0x400 * 4 - 1: { uint32_t xaddr = (addr - NV_PAPU_GPMIXBUF) / 4; - r = dsp_read_memory(d->gp.dsp, 'X', 0x001400 + xaddr); + r = dsp_read_memory(d->gp.dsp, 'X', GP_DSP_MIXBUF_BASE + xaddr); break; } case NV_PAPU_GPYMEM ... NV_PAPU_GPYMEM + 0x800 * 4 - 1: { @@ -698,7 +700,7 @@ static void gp_write(void *opaque, hwaddr addr, } case NV_PAPU_GPMIXBUF ... NV_PAPU_GPMIXBUF + 0x400 * 4 - 1: { uint32_t xaddr = (addr - NV_PAPU_GPMIXBUF) / 4; - dsp_write_memory(d->gp.dsp, 'X', 0x001400 + xaddr, val); + dsp_write_memory(d->gp.dsp, 'X', GP_DSP_MIXBUF_BASE + xaddr, val); break; } case NV_PAPU_GPYMEM ... NV_PAPU_GPYMEM + 0x800 * 4 - 1: {