From ba6f7f360e94df8e5752127676743edbb654c9f4 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Tue, 3 Jun 2025 19:17:09 -0700
Subject: [PATCH] mcpx: Move VP files into vp/

---
 hw/xbox/mcpx/apu_int.h        | 2 +-
 hw/xbox/mcpx/meson.build      | 5 +++--
 hw/xbox/mcpx/{ => vp}/adpcm.h | 0
 hw/xbox/mcpx/{ => vp}/hrtf.h  | 2 +-
 hw/xbox/mcpx/vp/meson.build   | 3 +++
 hw/xbox/mcpx/{ => vp}/svf.h   | 0
 hw/xbox/mcpx/{ => vp}/vp.c    | 2 +-
 hw/xbox/mcpx/{ => vp}/vp.h    | 7 ++++---
 8 files changed, 13 insertions(+), 8 deletions(-)
 rename hw/xbox/mcpx/{ => vp}/adpcm.h (100%)
 rename hw/xbox/mcpx/{ => vp}/hrtf.h (99%)
 create mode 100644 hw/xbox/mcpx/vp/meson.build
 rename hw/xbox/mcpx/{ => vp}/svf.h (100%)
 rename hw/xbox/mcpx/{ => vp}/vp.c (99%)
 rename hw/xbox/mcpx/{ => vp}/vp.h (98%)

diff --git a/hw/xbox/mcpx/apu_int.h b/hw/xbox/mcpx/apu_int.h
index b33e747181..108a834e12 100644
--- a/hw/xbox/mcpx/apu_int.h
+++ b/hw/xbox/mcpx/apu_int.h
@@ -45,7 +45,7 @@
 #include "apu_regs.h"
 #include "apu_debug.h"
 #include "fpconv.h"
-#include "vp.h"
+#include "vp/vp.h"
 
 #define GET_MASK(v, mask) (((v) & (mask)) >> ctz32(mask))
 
diff --git a/hw/xbox/mcpx/meson.build b/hw/xbox/mcpx/meson.build
index 489c5b7b52..2cf8916f92 100644
--- a/hw/xbox/mcpx/meson.build
+++ b/hw/xbox/mcpx/meson.build
@@ -1,12 +1,13 @@
 subdir('dsp')
 
 mcpx_ss = ss.source_set()
-mcpx_ss.add(sdl, libsamplerate, dsp, files(
+mcpx_ss.add(sdl, dsp, files(
 	'apu.c',
 	'aci.c',
 	'debug.c',
 	'dsp.c',
-	'vp.c'
 	))
 
+subdir('vp')
+
 specific_ss.add_all(mcpx_ss)
\ No newline at end of file
diff --git a/hw/xbox/mcpx/adpcm.h b/hw/xbox/mcpx/vp/adpcm.h
similarity index 100%
rename from hw/xbox/mcpx/adpcm.h
rename to hw/xbox/mcpx/vp/adpcm.h
diff --git a/hw/xbox/mcpx/hrtf.h b/hw/xbox/mcpx/vp/hrtf.h
similarity index 99%
rename from hw/xbox/mcpx/hrtf.h
rename to hw/xbox/mcpx/vp/hrtf.h
index f7036bc409..9c790b9673 100644
--- a/hw/xbox/mcpx/hrtf.h
+++ b/hw/xbox/mcpx/vp/hrtf.h
@@ -24,7 +24,7 @@
 #include <stddef.h>
 #include <math.h>
 
-#include "apu_regs.h"
+#include "hw/xbox/mcpx/apu_regs.h"
 
 #define HRTF_SAMPLES_PER_FRAME  NUM_SAMPLES_PER_FRAME
 #define HRTF_NUM_TAPS           31
diff --git a/hw/xbox/mcpx/vp/meson.build b/hw/xbox/mcpx/vp/meson.build
new file mode 100644
index 0000000000..f7a6b262e5
--- /dev/null
+++ b/hw/xbox/mcpx/vp/meson.build
@@ -0,0 +1,3 @@
+mcpx_ss.add(libsamplerate, files(
+	'vp.c'
+	))
diff --git a/hw/xbox/mcpx/svf.h b/hw/xbox/mcpx/vp/svf.h
similarity index 100%
rename from hw/xbox/mcpx/svf.h
rename to hw/xbox/mcpx/vp/svf.h
diff --git a/hw/xbox/mcpx/vp.c b/hw/xbox/mcpx/vp/vp.c
similarity index 99%
rename from hw/xbox/mcpx/vp.c
rename to hw/xbox/mcpx/vp/vp.c
index a96d987d20..c25bd15b56 100644
--- a/hw/xbox/mcpx/vp.c
+++ b/hw/xbox/mcpx/vp/vp.c
@@ -19,7 +19,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "apu_int.h"
+#include "hw/xbox/mcpx/apu_int.h"
 #include "adpcm.h"
 
 static const struct {
diff --git a/hw/xbox/mcpx/vp.h b/hw/xbox/mcpx/vp/vp.h
similarity index 98%
rename from hw/xbox/mcpx/vp.h
rename to hw/xbox/mcpx/vp/vp.h
index c6ee356b3b..ff65f0d034 100644
--- a/hw/xbox/mcpx/vp.h
+++ b/hw/xbox/mcpx/vp/vp.h
@@ -21,12 +21,13 @@
 #ifndef HW_XBOX_MCPX_VP_H
 #define HW_XBOX_MCPX_VP_H
 
+#include <samplerate.h>
+
 #include "qemu/osdep.h"
+#include "qemu/thread.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "qemu/thread.h"
-#include "apu_regs.h"
-#include <samplerate.h>
+#include "hw/xbox/mcpx/apu_regs.h"
 #include "svf.h"
 #include "hrtf.h"