X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fcode940%2F940shared.h;h=7f348e2d70f10ac859cee878380b6b4d2cc8156d;hb=091facb8fe133c8318ed13147b244e9af602a2ac;hp=cc5d0c4ad29d545cae194341cab7e87f4c767213;hpb=42c7b14797fad5ad8adc822e8d0cebf326eb620b;p=picodrive.git

diff --git a/platform/gp2x/code940/940shared.h b/platform/gp2x/code940/940shared.h
index cc5d0c4..7f348e2 100644
--- a/platform/gp2x/code940/940shared.h
+++ b/platform/gp2x/code940/940shared.h
@@ -1,30 +1,37 @@
 #include "../../../Pico/sound/ym2612.h"
-#include "../helix/pub/mp3dec.h"
+#include "../../common/helix/pub/mp3dec.h"
 
+// max 16 jobs, lower num means higher prio
 enum _940_job_t {
 	JOB940_INITALL = 1,
+	JOB940_INVALIDATE_DCACHE,
 	JOB940_YM2612RESETCHIP,
 	JOB940_YM2612UPDATEONE,
-	JOB940_PICOSTATELOAD,
 	JOB940_MP3DECODE,
-	JOB940_NUMJOBS
+	JOB940_PICOSTATELOAD,
+	JOB940_PICOSTATESAVE2,
+	JOB940_PICOSTATELOAD2_PREP,
+	JOB940_PICOSTATELOAD2,
+	JOB940_MP3RESET,
 };
 
-#define MAX_940JOBS	2
+//#define MAX_940JOBS	2
 
 typedef struct
 {
-	YM2612  ym2612;					/* current state of the emulated YM2612 */
+	YM2612  ym2612;				/* current state of the emulated YM2612 */
 	HMP3Decoder mp3dec;			/* mp3 decoder's handle */
-	int     mix_buffer[44100/50*2];		/* this is where the YM2612 samples will be mixed to */
+	int     ym_buffer[44100/50*2];		/* this is where the YM2612 samples will be mixed to */
 	short   mp3_buffer[2][1152*2];		/* buffers for mp3 decoder's output */
 } _940_data_t;
 
 
 typedef struct
 {
-	int		jobs[MAX_940JOBS];			/* jobs for second core */
-	int		busy;					/* busy status of the 940 core */
+	int		vstarts[8];				/* debug: 00: number of starts from each of 8 vectors */
+	int		last_lr;				/* debug: 20: last exception's lr */
+//	int		jobs[MAX_940JOBS];			/* jobs for second core */
+//	int		busy_;					/* unused */
 	int		length;					/* number of samples to mix (882 max) */
 	int		stereo;					/* mix samples as stereo, doubles sample count automatically */
 	int		baseclock;				/* ym2612 settings */
@@ -32,11 +39,12 @@ typedef struct
 	int		writebuffsel;			/* which write buffer to use (from 940 side) */
 	UINT16  writebuff0[2048];			/* list of writes to ym2612, 1024 for savestates, 1024 extra */
 	UINT16  writebuff1[2048];
+	int		ym_active_chs;
 	int		mp3_len;			/* data len of loaded mp3 */
 	int		mp3_offs;			/* current playback offset (just after last decoded frame) */
 	int		mp3_buffsel;			/* which output buffer to decode to */
-	int		vstarts[8];				/* debug: number of starts from each of 8 vectors */
-	int		loopc;					/* debug: main loop counter */
+	int		loopc;				/* debug: main loop counter */
 	int		mp3_errors;			/* debug: mp3 decoder's error counter */
 	int		mp3_lasterr;			/* debug: mp3 decoder's last error */
+	int		lastjob;			/* debug: last job id */
 } _940_ctl_t;