mcpx: Move VP files into vp/

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))
 

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)

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

hw/xbox/mcpx/vp/meson.build

@@ -0,0 +1,3 @@
+mcpx_ss.add(libsamplerate, files(
+	'vp.c'
+	))

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 {

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"