mcpx: Move APU components to hw/xbox/mcpx/apu

This commit is contained in:
Matt Borgerson 2025-06-03 19:17:09 -07:00 committed by mborgerson
parent 395d136364
commit ba297f3b69
41 changed files with 21 additions and 19 deletions

View File

@ -19,7 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/xbox/mcpx/apu_int.h"
#include "hw/xbox/mcpx/apu/apu_int.h"
static const int16_t ep_silence[256][2] = { 0 };

View File

@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/xbox/mcpx/apu_regs.h"
#include "hw/xbox/mcpx/apu/apu_regs.h"
#include "dsp.h"
#include "dsp_dma.h"

View File

@ -0,0 +1 @@
#include "trace/trace-hw_xbox_mcpx_apu_dsp.h"

View File

@ -0,0 +1,7 @@
mcpx_ss.add(sdl, files(
'apu.c',
'debug.c',
))
subdir('vp')
subdir('dsp')

1
hw/xbox/mcpx/apu/trace.h Normal file
View File

@ -0,0 +1 @@
#include "trace/trace-hw_xbox_mcpx_apu.h"

View File

@ -24,7 +24,7 @@
#include <stddef.h>
#include <math.h>
#include "hw/xbox/mcpx/apu_regs.h"
#include "hw/xbox/mcpx/apu/apu_regs.h"
#define HRTF_SAMPLES_PER_FRAME NUM_SAMPLES_PER_FRAME
#define HRTF_NUM_TAPS 31

View File

@ -19,7 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/xbox/mcpx/apu_int.h"
#include "hw/xbox/mcpx/apu/apu_int.h"
#include "adpcm.h"
static const struct {

View File

@ -27,7 +27,7 @@
#include "qemu/thread.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/xbox/mcpx/apu_regs.h"
#include "hw/xbox/mcpx/apu/apu_regs.h"
#include "svf.h"
#include "hrtf.h"

View File

@ -1 +0,0 @@
#include "trace/trace-hw_xbox_mcpx_dsp.h"

View File

@ -1,12 +1,7 @@
mcpx_ss = ss.source_set()
mcpx_ss.add(sdl, files(
'apu.c',
'aci.c',
'debug.c',
))
mcpx_ss.add(files('aci.c'))
subdir('vp')
subdir('dsp')
subdir('apu')
specific_ss.add_all(mcpx_ss)

View File

@ -1 +0,0 @@
#include "trace/trace-hw_xbox_mcpx.h"

View File

@ -53,7 +53,7 @@
#include "hw/i2c/i2c.h"
#include "hw/i2c/smbus_eeprom.h"
#include "hw/xbox/nv2a/nv2a.h"
#include "hw/xbox/mcpx/apu.h"
#include "hw/xbox/mcpx/apu/apu.h"
#include "hw/xbox/xbox.h"
#include "smbus.h"

View File

@ -3771,8 +3771,8 @@ if have_system
'ui',
'hw/remote',
'hw/xbox/nv2a',
'hw/xbox/mcpx',
'hw/xbox/mcpx/dsp',
'hw/xbox/mcpx/apu',
'hw/xbox/mcpx/apu/dsp',
'hw/xbox',
]
endif

View File

@ -18,7 +18,7 @@
*/
#include "qemu/osdep.h"
#include "hw/xbox/mcpx/dsp/dsp.h"
#include "hw/xbox/mcpx/apu/dsp/dsp.h"
static void scratch_rw(void *opaque, uint8_t *ptr, uint32_t addr, size_t len, bool dir)
{

View File

@ -39,7 +39,7 @@ extern "C" {
#include "qapi/error.h"
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
#include "hw/xbox/mcpx/apu_debug.h"
#include "hw/xbox/mcpx/apu/apu_debug.h"
#include "hw/xbox/nv2a/debug.h"
#include "hw/xbox/nv2a/nv2a.h"