X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fspu_c64x.h;h=7c4d5659b34a8d453da927439cec5fdfa5ccf31c;hp=bb20cc342b06c71d98c567cd06712cc6edc6ca91;hb=HEAD;hpb=3bd31caf9e9f5ddab2bf4fbdb5a129f4972c45f3

diff --git a/plugins/dfsound/spu_c64x.h b/plugins/dfsound/spu_c64x.h
index bb20cc34..dd07da1b 100644
--- a/plugins/dfsound/spu_c64x.h
+++ b/plugins/dfsound/spu_c64x.h
@@ -1,3 +1,9 @@
+#ifndef __P_SPU_C64X_H__
+#define __P_SPU_C64X_H__
+
+#include "externals.h"
+#include "spu_config.h"
+
 #define COMPONENT_NAME "pcsxr_spu"
 
 enum {
@@ -7,14 +13,18 @@ enum {
 
 struct region_mem {
  unsigned char spu_ram[512 * 1024];
- int SB[SB_SIZE * 24];
+ sample_buf sb_thread[MAXCHAN];
  // careful not to lose ARM writes by DSP overwriting
  // with old data when it's writing out neighbor cachelines
- int _pad1[128/4 - ((SB_SIZE * 24) & (128/4 - 1))];
- SPUCHAN s_chan[24 + 1];
- int _pad2[128/4 - ((sizeof(SPUCHAN) * 25 / 4) & (128/4 - 1))];
+ int _pad1[128/4 - ((sizeof(sample_buf) * MAXCHAN / 4) & (128/4 - 1))];
+ struct spu_in {
+  // these are not to be modified by DSP
+  SPUCHAN s_chan[24 + 1];
+  REVERBInfo rvb;
+  SPUConfig spu_config;
+ } in;
+ int _pad2[128/4 - ((sizeof(struct spu_in) / 4) & (128/4 - 1))];
  struct spu_worker worker;
- SPUConfig spu_config;
  // init/debug
  int sizeof_region_mem;
  int offsetof_s_chan1;
@@ -22,3 +32,5 @@ struct region_mem {
 };
 
 #define ACTIVE_CNT 3
+
+#endif /* __P_SPU_C64X_H__ */