diff --git a/hw/xbox/dsp/dsp_cpu.c b/hw/xbox/dsp/dsp_cpu.c index ff00e543d1..92cd132b83 100644 --- a/hw/xbox/dsp/dsp_cpu.c +++ b/hw/xbox/dsp/dsp_cpu.c @@ -972,8 +972,6 @@ uint32_t dsp56k_read_memory(dsp_core_t* dsp, int space, uint32_t address) return dsp->read_peripheral(dsp, address); } else if (address >= DSP_MIXBUFFER_BASE && address < DSP_MIXBUFFER_BASE+DSP_MIXBUFFER_SIZE) { return dsp->mixbuffer[address-DSP_MIXBUFFER_BASE]; - } else if (address >= DSP_MIXBUFFER_READ_BASE && address < DSP_MIXBUFFER_READ_BASE+DSP_MIXBUFFER_SIZE) { - return dsp->mixbuffer[address-DSP_MIXBUFFER_READ_BASE]; } else { assert(address < DSP_XRAM_SIZE); return dsp->xram[address]; @@ -1012,8 +1010,6 @@ static void write_memory_raw(dsp_core_t* dsp, int space, uint32_t address, uint3 return; } else if (address >= DSP_MIXBUFFER_BASE && address < DSP_MIXBUFFER_BASE+DSP_MIXBUFFER_SIZE) { dsp->mixbuffer[address-DSP_MIXBUFFER_BASE] = value; - } else if (address >= DSP_MIXBUFFER_READ_BASE && address < DSP_MIXBUFFER_READ_BASE+DSP_MIXBUFFER_SIZE) { - dsp->mixbuffer[address-DSP_MIXBUFFER_READ_BASE] = value; } else { assert(address < DSP_XRAM_SIZE); dsp->xram[address] = value; diff --git a/hw/xbox/dsp/dsp_cpu.h b/hw/xbox/dsp/dsp_cpu.h index 86b31561aa..0f4fc9c308 100644 --- a/hw/xbox/dsp/dsp_cpu.h +++ b/hw/xbox/dsp/dsp_cpu.h @@ -112,13 +112,12 @@ #define DSP_SPACE_Y 0x01 #define DSP_SPACE_P 0x02 -#define DSP_XRAM_SIZE 3072 +#define DSP_XRAM_SIZE 4096 #define DSP_YRAM_SIZE 2048 #define DSP_PRAM_SIZE 4096 -#define DSP_MIXBUFFER_BASE 3072 +#define DSP_MIXBUFFER_BASE 0x001400 #define DSP_MIXBUFFER_SIZE 1024 -#define DSP_MIXBUFFER_READ_BASE 5120 #define DSP_PERIPH_BASE 0xFFFF80 #define DSP_PERIPH_SIZE 128