X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Fspu_c64x.h;h=dd07da1ba849f7eee6e38dfe7bdd21315fa283e0;hb=7f2a91d0a12d2c096cafc3fa4e1f1da8f63e5af9;hp=d4e73e97faedc012630b813d0630e4422eb2e27e;hpb=de4a0279efefdd2e4595c8fc27f1564f4bff9341;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/spu_c64x.h b/plugins/dfsound/spu_c64x.h
index d4e73e97..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,19 +13,24 @@ enum {
 
 struct region_mem {
  unsigned char spu_ram[512 * 1024];
- int RVB[NSSIZE * 2];
- int SSumLR[NSSIZE * 2];
- 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 - ((NSSIZE * 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;
- int offsetof_worker_ram;
+ int offsetof_spos_3_20;
 };
 
+#define ACTIVE_CNT 3
+
+#endif /* __P_SPU_C64X_H__ */