X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fdfsound%2Fspu_c64x.h;h=7c4d5659b34a8d453da927439cec5fdfa5ccf31c;hb=HEAD;hp=8210e63a193820035eb23292639875ec2a0a06f8;hpb=05c7cec77522f04857f655474574469a5e66661d;p=pcsx_rearmed.git diff --git a/plugins/dfsound/spu_c64x.h b/plugins/dfsound/spu_c64x.h index 8210e63a..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,18 +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))]; + 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; @@ -26,3 +32,5 @@ struct region_mem { }; #define ACTIVE_CNT 3 + +#endif /* __P_SPU_C64X_H__ */