X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fexternals.h;fp=plugins%2Fdfsound%2Fexternals.h;h=3047afc81ed5a94b10b29ea6c87e7c250ae1d59c;hp=3a3ff68aad86b807f9072d920148fc86c62560cb;hb=5514a050f4e936f5c333fa1271b11bf5a6a9ea39;hpb=63a4f6b6a3b0315590cd3009df2c92480ed2d98b diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 3a3ff68a..3047afc8 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -181,7 +181,10 @@ typedef struct unsigned short spuStat; unsigned int spuAddr; - unsigned char * spuMemC; + union { + unsigned char *spuMemC; + unsigned short *spuMem; + }; unsigned char * pSpuIrq; unsigned int cycles_played; @@ -222,9 +225,10 @@ typedef struct int iLeftXAVol; int iRightXAVol; - int pad[32]; + SPUCHAN * s_chan; + + int pad[31]; unsigned short regArea[0x400]; - unsigned short spuMem[256*1024]; } SPUInfo; /////////////////////////////////////////////////////////// @@ -234,7 +238,6 @@ typedef struct #ifndef _IN_SPU extern SPUInfo spu; -extern SPUCHAN s_chan[]; extern REVERBInfo rvb; void do_samples(unsigned int cycles_to, int do_sync);