X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2F940ctl_ym2612.c;h=1a8160d3a43e17b0d832abe2282a4db945b30da8;hb=1cd356a33daf2eec34e52c075b06d62866f5fb2f;hp=35bf4a7cf0c3c2172f2284eaf6a281a46917d25c;hpb=42c7b14797fad5ad8adc822e8d0cebf326eb620b;p=picodrive.git

diff --git a/platform/gp2x/940ctl_ym2612.c b/platform/gp2x/940ctl_ym2612.c
index 35bf4a7..1a8160d 100644
--- a/platform/gp2x/940ctl_ym2612.c
+++ b/platform/gp2x/940ctl_ym2612.c
@@ -12,6 +12,10 @@
 #include "emu.h"
 #include "menu.h"
 #include "asmutils.h"
+#include "../../Pico/PicoInt.h"
+
+// tmp
+#include "../../Pico/sound/mix.h"
 
 /* we will need some gp2x internals here */
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
@@ -20,9 +24,13 @@ extern volatile unsigned long  *gp2x_memregl;
 static unsigned char *shared_mem = 0;
 static _940_data_t *shared_data = 0;
 static _940_ctl_t *shared_ctl = 0;
+static unsigned char *mp3_mem = 0;
+
+#define MP3_SIZE_MAX (0x1000000 - 4*640*480)
 
 int crashed_940 = 0;
 
+static FILE *loaded_mp3 = 0;
 
 /***********************************************************/
 
@@ -218,6 +226,7 @@ int YM2612PicoTick_940(int n)
 	return 0;
 }
 
+static int g_busy = 10;
 
 static void wait_busy_940(void)
 {
@@ -234,8 +243,9 @@ static void wait_busy_940(void)
 	}
 	printf("wait iterations: %i\n", i);
 #else
-	for (i = 0; shared_ctl->busy && i < 0x10000; i++)
+	for (i = 0; /*shared_ctl->busy*/gp2x_memregs[0x3B3E>>1] && i < 0x10000; i++)
 		spend_cycles(8*1024); // tested to be best for mp3 dec
+	//printf("i = 0x%x\n", i);
 	if (i < 0x10000) return;
 
 	/* 940 crashed */
@@ -243,6 +253,19 @@ static void wait_busy_940(void)
 	for (i = 0; i < 8; i++)
 		printf("%i ", shared_ctl->vstarts[i]);
 	printf(")\n");
+	printf("irq pending flags: DUALCPU %04x (see 15?), SRCPND %08lx (see 26), INTPND %08lx\n",
+		gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]);
+	printf("last irq PC: %08x, lastjob: 0x%03x, busy: %x, lastbusy: %x, g_busy: %x\n", shared_ctl->last_irq_pc,
+			shared_ctl->lastjob, gp2x_memregs[0x3B3E>>1]/*shared_ctl->busy*/, shared_ctl->lastbusy, g_busy);
+	printf("trying to interrupt..\n");
+	gp2x_memregs[0x3B3E>>1] = 0xffff;
+	for (i = 0; /*shared_ctl->busy*/gp2x_memregs[0x3B3E>>1] && i < 0x10000; i++)
+		spend_cycles(8*1024);
+	printf("i = 0x%x\n", i);
+	printf("irq pending flags: DUALCPU %04x (see 15?), SRCPND %08lx (see 26), INTPND %08lx\n",
+		gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]);
+	printf("last irq PC: %08x, lastjob: 0x%03x, busy: %x\n", shared_ctl->last_irq_pc, shared_ctl->lastjob, gp2x_memregs[0x3B3E>>1]/*shared_ctl->busy*/);
+
 	strcpy(menuErrorMsg, "940 crashed.");
 	engineState = PGS_Menu;
 	crashed_940 = 1;
@@ -252,10 +275,17 @@ static void wait_busy_940(void)
 
 static void add_job_940(int job0, int job1)
 {
+/*	if (gp2x_memregs[0x3b46>>1] || shared_ctl->busy)
+	{
+		printf("!!add_job_940: irq pending flags: DUALCPU %04x (see 15?), SRCPND %08lx (see 26), INTPND %08lx, busy: %x\n",
+				gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2], shared_ctl->busy);
+	}
+*/
 	shared_ctl->jobs[0] = job0;
 	shared_ctl->jobs[1] = job1;
-	shared_ctl->busy = 1;
-	gp2x_memregs[0x3B3E>>1] = 0xffff; // cause an IRQ for 940
+	//shared_ctl->busy = ++g_busy; // 1;
+	gp2x_memregs[0x3B3E>>1] = ++g_busy; // set busy flag
+//	gp2x_memregs[0x3B3E>>1] = 0xffff; // cause interrupt
 }
 
 
@@ -263,7 +293,7 @@ void YM2612PicoStateLoad_940(void)
 {
 	int i, old_A1 = addr_A1;
 
-	if (shared_ctl->busy) wait_busy_940();
+	if (/*shared_ctl->busy*/gp2x_memregs[0x3B3E>>1]) wait_busy_940();
 
 	// feed all the registers and update internal state
 	for(i = 0; i < 0x100; i++) {
@@ -305,10 +335,8 @@ void YM2612Init_940(int baseclock, int rate)
 	Reset940(1, 2);
 	Pause940(1);
 
-	gp2x_memregs[0x3B46>>1] = 0xffff; // clear pending DUALCPU interrupts for 940
-	gp2x_memregs[0x3B42>>1] = 0xffff; // enable DUALCPU interrupts for 940
-
-	gp2x_memregl[0x4508>>2] = ~(1<<26); // unmask DUALCPU ints in the undocumented 940's interrupt controller
+	gp2x_memregs[0x3B40>>1] = 0;      // disable DUALCPU interrupts for 920
+	gp2x_memregs[0x3B42>>1] = 1;      // enable  DUALCPU interrupts for 940
 
 	if (shared_mem == NULL)
 	{
@@ -321,6 +349,12 @@ void YM2612Init_940(int baseclock, int rate)
 		shared_data = (_940_data_t *) (shared_mem+0x100000);
 		/* this area must not get buffered on either side */
 		shared_ctl =  (_940_ctl_t *)  (shared_mem+0x200000);
+		mp3_mem = (unsigned char *) mmap(0, MP3_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x3000000);
+		if (mp3_mem == MAP_FAILED)
+		{
+			printf("mmap(mp3_mem) failed with %i\n", errno);
+			exit(1);
+		}
 		crashed_940 = 1;
 	}
 
@@ -370,12 +404,20 @@ void YM2612Init_940(int baseclock, int rate)
 
 	internal_reset();
 
+	loaded_mp3 = 0;
+
 	/* now cause 940 to init it's ym2612 stuff */
 	shared_ctl->baseclock = baseclock;
 	shared_ctl->rate = rate;
 	shared_ctl->jobs[0] = JOB940_INITALL;
 	shared_ctl->jobs[1] = 0;
-	shared_ctl->busy = 1;
+	//shared_ctl->busy = 1;
+	gp2x_memregs[0x3B3E>>1] = 1; // set busy flag
+
+	gp2x_memregs[0x3B46>>1] = 0xffff; // clear pending DUALCPU interrupts for 940
+	gp2x_memregl[0x4500>>2] = 0; // clear pending IRQs in SRCPND
+	gp2x_memregl[0x4510>>2] = 0; // clear pending IRQs in INTPND
+	gp2x_memregl[0x4508>>2] = ~(1<<26); // unmask DUALCPU ints in the undocumented 940's interrupt controller
 
 	/* start the 940 */
 	Reset940(0, 2);
@@ -393,7 +435,7 @@ void YM2612ResetChip_940(void)
 		return;
 	}
 
-	if (shared_ctl->busy) wait_busy_940();
+	if (/*shared_ctl->busy*/gp2x_memregs[0x3B3E>>1]) wait_busy_940();
 
 	internal_reset();
 
@@ -401,39 +443,93 @@ void YM2612ResetChip_940(void)
 }
 
 
-void YM2612UpdateOne_940(short *buffer, int length, int stereo)
+//extern int pcm_buffer[2*44100/50];
+/*
+static void mix_samples(int *dest_buf, short *mp3_buf, int len, int stereo)
 {
-	int i, *mix_buffer = shared_data->mix_buffer;
+//	int *pcm = pcm_buffer + offset * 2;
 
-	//printf("YM2612UpdateOne_940()\n");
-	if (shared_ctl->busy) wait_busy_940();
-
-	//printf("940 (cnt: %i, wc: %i, ve: ", shared_ctl->loopc, shared_ctl->waitc);
-	//for (i = 0; i < 8; i++)
-	//	printf("%i ", shared_ctl->vstarts[i]);
-	//printf(")\n");
-
-	/* mix data from previous go */
-	if (stereo) {
-		int *mb = mix_buffer;
-		for (i = length; i > 0; i--) {
-			int l, r;
-			l = r = *buffer;
-			l += *mb++, r += *mb++;
-			Limit( l, MAXOUT, MINOUT );
-			Limit( r, MAXOUT, MINOUT );
-			*buffer++ = l; *buffer++ = r;
+	if (stereo)
+	{
+		for (; len > 0; len--)
+		{
+			int lm, rm;
+			lm = *mp3_buf++; rm = *mp3_buf++;
+			*dest_buf++ += lm - lm/2; *dest_buf++ += rm - rm/2;
 		}
 	} else {
-		for (i = 0; i < length; i++) {
-			int l = mix_buffer[i];
-			l += buffer[i];
-			Limit( l, MAXOUT, MINOUT );
-			buffer[i] = l;
+		for (; len > 0; len--)
+		{
+			int l = *mp3_buf++;
+			*dest_buf++ = l - l/2;
 		}
 	}
+}
+*/
+
+// here we assume that length is different between games, but constant in one game
+
+static int mp3_samples_ready = 0, mp3_buffer_offs = 0;
+static int mp3_play_bufsel = 0;
+
+int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
+{
+	int length_mp3 = Pico.m.pal ? 44100/50 : 44100/60; // mp3s are locked to 44100Hz stereo
+	int *ym_buf = shared_data->mix_buffer;
+//	int *dest_buf = buffer;
+	int cdda_on, mp3_job = 0;
+//	int len;
+
+	// emulating CD, enabled in opts, not data track, CDC is reading, playback was started, track not ended
+	cdda_on = (PicoMCD & 1) && (PicoOpt & 0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
+		(Pico_mcd->scd.Status_CDC & 1) && loaded_mp3;
+
+	//printf("YM2612UpdateOne_940()\n");
+	if (/*shared_ctl->busy*/gp2x_memregs[0x3B3E>>1]) wait_busy_940();
+
+	// track ended?
+	cdda_on = cdda_on && shared_ctl->mp3_offs < shared_ctl->mp3_len;
+
+	// mix in ym buffer
+	if (is_buf_empty) memcpy32(buffer, ym_buf, length<<stereo);
+	// else TODO
+
+//	for (len = length << stereo; len > 0; len--)
+//	{
+//		*dest_buf++ += *ym_buf++;
+//	}
+
+	/* mix mp3 data, only stereo */
+	if (cdda_on && mp3_samples_ready >= length_mp3)
+	{
+		int shr = 0;
+		void (*mix_samples)(int *dest_buf, short *mp3_buf, int count) = mix_16h_to_32;
+		if (PsndRate == 22050) { mix_samples = mix_16h_to_32_s1; shr = 1; }
+		else if (PsndRate == 11025) { mix_samples = mix_16h_to_32_s2; shr = 2; }
+
+		if (1152 - mp3_buffer_offs >= length_mp3) {
+			mix_samples(buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, (length_mp3>>shr)<<1);
+
+			mp3_buffer_offs += length_mp3;
+		} else {
+			// collect from both buffers..
+			int left = 1152 - mp3_buffer_offs;
+			if (mp3_play_bufsel == 0)
+			{
+				mix_samples(buffer, shared_data->mp3_buffer[0] + mp3_buffer_offs*2, (length_mp3>>shr)<<1);
+				mp3_buffer_offs = length_mp3 - left;
+				mp3_play_bufsel = 1;
+			} else {
+				mix_samples(buffer, shared_data->mp3_buffer[1] + mp3_buffer_offs*2, (left>>shr)<<1);
+				mp3_buffer_offs = length_mp3 - left;
+				mix_samples(buffer + ((left>>shr)<<1),
+					shared_data->mp3_buffer[0], (mp3_buffer_offs>>shr)<<1);
+				mp3_play_bufsel = 0;
+			}
+		}
+		mp3_samples_ready -= length_mp3;
+	}
 
-	//printf("new writes: %i\n", writebuff_ptr);
 	if (shared_ctl->writebuffsel == 1) {
 		shared_ctl->writebuff0[writebuff_ptr] = 0xffff;
 	} else {
@@ -441,12 +537,81 @@ void YM2612UpdateOne_940(short *buffer, int length, int stereo)
 	}
 	writebuff_ptr = 0;
 
-	/* give 940 another job */
+	/* give 940 ym job */
 	shared_ctl->writebuffsel ^= 1;
 	shared_ctl->length = length;
 	shared_ctl->stereo = stereo;
-	add_job_940(JOB940_YM2612UPDATEONE, 0);
+
+	// make sure we will have enough mp3 samples next frame
+	if (cdda_on && mp3_samples_ready < length_mp3)
+	{
+		shared_ctl->mp3_buffsel ^= 1;
+		mp3_job = JOB940_MP3DECODE;
+		mp3_samples_ready += 1152;
+	}
+
+	add_job_940(JOB940_YM2612UPDATEONE, mp3_job);
 	//spend_cycles(512);
 	//printf("SRCPND: %08lx, INTMODE: %08lx, INTMASK: %08lx, INTPEND: %08lx\n",
 	//	gp2x_memregl[0x4500>>2], gp2x_memregl[0x4504>>2], gp2x_memregl[0x4508>>2], gp2x_memregl[0x4510>>2]);
+
+	return 1;
+}
+
+
+/***********************************************************/
+
+void mp3_start_play(FILE *f, int pos) // pos is 0-1023
+{
+	int byte_offs = 0;
+
+	if (!(PicoOpt&0x800)) { // cdda disabled?
+		return;
+	}
+
+	if (loaded_mp3 != f)
+	{
+		// printf("loading mp3... "); fflush(stdout);
+		fseek(f, 0, SEEK_SET);
+		fread(mp3_mem, 1, MP3_SIZE_MAX, f);
+		// if (feof(f)) printf("done.\n");
+		// else printf("done. mp3 too large, not all data loaded.\n");
+		shared_ctl->mp3_len = ftell(f);
+		loaded_mp3 = f;
+	}
+
+	// seek..
+	if (pos) {
+		byte_offs  = (shared_ctl->mp3_len << 6) >> 10;
+		byte_offs *= pos;
+		byte_offs >>= 6;
+	}
+	// printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len);
+
+	shared_ctl->mp3_offs = byte_offs;
+
+	// reset buffer pointers..
+	mp3_samples_ready = mp3_buffer_offs = mp3_play_bufsel = 0;
+	shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode
+}
+
+
+int mp3_get_offset(void)
+{
+	int offs1024 = 0;
+	int cdda_on;
+
+	cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
+			(Pico_mcd->scd.Status_CDC & 1) && loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;
+
+	if (cdda_on) {
+		offs1024  = shared_ctl->mp3_offs << 7;
+		offs1024 /= shared_ctl->mp3_len;
+		offs1024 <<= 3;
+	}
+	printf("offs1024=%i (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len);
+
+	return offs1024;
 }
+
+