X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2F940ctl.c;h=9498858b8a9937d5e9a6cacc979b5a66da395b73;hb=b4c711c35a6f8db52e86703cd9a9011a0aaa9fa5;hp=b0355916bb6aa2d8c464c80d66873a02362578f9;hpb=d032c15a906f1d54f49648847b996ce5ed4362e6;p=libpicofe.git

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index b035591..9498858 100644
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -1,3 +1,6 @@
+// Code for communication with ARM940 and control of it.
+// (c) Copyright 2007, Grazvydas "notaz" Ignotas
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,21 +14,25 @@
 #include "gp2x.h"
 #include "emu.h"
 #include "menu.h"
-#include "asmutils.h"
 #include "mp3.h"
+#include "../common/arm_utils.h"
+#include "../common/menu.h"
 #include "../../Pico/PicoInt.h"
+#include "../../Pico/sound/ym2612.h"
 #include "../../Pico/sound/mix.h"
 
 /* we will need some gp2x internals here */
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
 extern volatile unsigned long  *gp2x_memregl;
 
+extern int reset_timing;
 static unsigned char *shared_mem = 0;
 static _940_data_t *shared_data = 0;
 _940_ctl_t *shared_ctl = 0;
 unsigned char *mp3_mem = 0;
 
-#define MP3_SIZE_MAX (0x1000000 - 4*640*480)
+#define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M
+#define CODE940_FILE "pico940.bin"
 
 int crashed_940 = 0;
 
@@ -45,11 +52,10 @@ static FILE *loaded_mp3 = 0;
 /* these will be managed locally on our side */
 extern int   *ym2612_dacen;
 extern INT32 *ym2612_dacout;
-extern void  *ym2612_regs;
-
 static UINT8 *REGS = 0;		/* we will also keep local copy of regs for savestates and such */
-static INT32 addr_A1;		/* address line A1      */
-static int	 dacen;
+static INT32 *addr_A1;		/* address line A1      */
+
+static int   dacen;
 static INT32 dacout;
 static UINT8 ST_address;	/* address register     */
 static UINT8 ST_status;		/* status flag          */
@@ -65,8 +71,10 @@ static int   writebuff_ptr = 0;
 
 
 /* OPN Mode Register Write */
-static void set_timers( int v )
+static int set_timers( int v )
 {
+	int change;
+
 	/* b7 = CSM MODE */
 	/* b6 = 3 slot mode */
 	/* b5 = reset b */
@@ -75,6 +83,7 @@ static void set_timers( int v )
 	/* b2 = timer enable a */
 	/* b1 = load b */
 	/* b0 = load a */
+	change = (ST_mode ^ v) & 0xc0;
 	ST_mode = v;
 
 	/* reset Timer b flag */
@@ -84,6 +93,8 @@ static void set_timers( int v )
 	/* reset Timer a flag */
 	if( v & 0x10 )
 		ST_status &= ~1;
+
+	return change;
 }
 
 /* YM2612 write */
@@ -92,26 +103,29 @@ static void set_timers( int v )
 /* returns 1 if sample affecting state changed */
 int YM2612Write_940(unsigned int a, unsigned int v)
 {
-	int addr; //, ret=1;
+	int addr;
+	int upd = 1;	/* the write affects sample generation */
 
 	v &= 0xff;	/* adjust to 8 bit bus */
 	a &= 3;
 
+	//printf("%05i:%03i: ym w ([%i] %02x)\n", Pico.m.frame_count, Pico.m.scanline, a, v);
+
 	switch( a ) {
 	case 0:	/* address port 0 */
-		if (!addr_A1 && ST_address == v)
+		if (!*addr_A1 && ST_address == v)
 			return 0;	/* address already selected, don't send this command to 940 */
 		ST_address = v;
 		/* don't send DAC or timer related address changes to 940 */
-		if (!addr_A1 && (v & 0xf0) == 0x20 &&
+		if (!*addr_A1 && (v & 0xf0) == 0x20 &&
 			(v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a))
 				return 0;
-		addr_A1 = 0;
-		//ret=0;
+		*addr_A1 = 0;
+		upd = 0;
 		break;
 
 	case 1:	/* data port 0    */
-		if (addr_A1 != 0) {
+		if (*addr_A1 != 0) {
 			return 0;	/* verified on real YM2608 */
 		}
 
@@ -151,14 +165,16 @@ int YM2612Write_940(unsigned int a, unsigned int v)
 				}
 				return 0;
 			case 0x27:	/* mode, timer control */
-				set_timers( v );
-				break; // other side needs ST.mode for 3slot mode
+				if (set_timers( v ))
+					break; // other side needs ST.mode for 3slot mode
+				return 0;
 			case 0x2a:	/* DAC data (YM2612) */
 				dacout = ((int)v - 0x80) << 6;	/* level unknown (notaz: 8 seems to be too much) */
 				return 0;
 			case 0x2b:	/* DAC Sel  (YM2612) */
 				/* b7 = dac enable */
 				dacen = v & 0x80;
+				upd = 0;
 				break; // other side has to know this
 			default:
 				break;
@@ -168,15 +184,15 @@ int YM2612Write_940(unsigned int a, unsigned int v)
 		break;
 
 	case 2:	/* address port 1 */
-		if (addr_A1 && ST_address == v)
+		if (*addr_A1 && ST_address == v)
 			return 0;
 		ST_address = v;
-		addr_A1 = 1;
-		//ret=0;
+		*addr_A1 = 1;
+		upd = 0;
 		break;
 
 	case 3:	/* data port 1    */
-		if (addr_A1 != 1) {
+		if (*addr_A1 != 1) {
 			return 0;	/* verified on real YM2608 */
 		}
 
@@ -185,14 +201,25 @@ int YM2612Write_940(unsigned int a, unsigned int v)
 		break;
 	}
 
+	//printf("ym pass\n");
+
 	if(currentConfig.EmuOpt & 4) {
-		/* queue this write for 940 */
-		if (writebuff_ptr < 2047) {
-			if (shared_ctl->writebuffsel == 1) {
-				shared_ctl->writebuff0[writebuff_ptr++] = (a<<8)|v;
-			} else {
-				shared_ctl->writebuff1[writebuff_ptr++] = (a<<8)|v;
+		UINT16 *writebuff = shared_ctl->writebuffsel ? shared_ctl->writebuff0 : shared_ctl->writebuff1;
+
+		/* detect rapid ym updates */
+		if (upd && !(writebuff_ptr & 0x80000000) && Pico.m.scanline < 224) {
+			int mid = Pico.m.pal ? 68 : 93;
+			if (Pico.m.scanline > mid) {
+				//printf("%05i:%03i: rapid ym\n", Pico.m.frame_count, Pico.m.scanline);
+				writebuff[writebuff_ptr++ & 0xffff] = 0xfffe;
+				writebuff_ptr |= 0x80000000;
+				//printf("%05i:%03i: ym w ([%02x] %02x, upd=%i)\n", Pico.m.frame_count, Pico.m.scanline, addr, v, upd);
 			}
+		}
+
+		/* queue this write for 940 */
+		if ((writebuff_ptr&0xffff) < 2047) {
+			writebuff[writebuff_ptr++ & 0xffff] = (a<<8)|v;
 		} else {
 			printf("warning: writebuff_ptr > 2047 ([%i] %02x)\n", a, v);
 		}
@@ -263,7 +290,7 @@ static void wait_busy_940(int job)
 		gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]);
 	printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob);
 
-	strcpy(menuErrorMsg, "940 crashed.");
+	strcpy(menuErrorMsg, "940 crashed, too much overclock?");
 	engineState = PGS_Menu;
 	crashed_940 = 1;
 }
@@ -286,7 +313,13 @@ static void add_job_940(int job)
 
 void YM2612PicoStateLoad_940(void)
 {
-	int i, old_A1 = addr_A1;
+	int i, old_A1 = *addr_A1;
+
+	/* make sure JOB940_PICOSTATELOAD gets done before next JOB940_YM2612UPDATEONE */
+	add_job_940(JOB940_PICOSTATELOAD);
+	if (CHECK_BUSY(JOB940_PICOSTATELOAD)) wait_busy_940(JOB940_PICOSTATELOAD);
+
+	writebuff_ptr = 0;
 
 	// feed all the registers and update internal state
 	for(i = 0; i < 0x100; i++) {
@@ -298,9 +331,7 @@ void YM2612PicoStateLoad_940(void)
 		YM2612Write_940(3, REGS[i|0x100]);
 	}
 
-	addr_A1 = old_A1;
-
-	add_job_940(JOB940_PICOSTATELOAD);
+	*addr_A1 = old_A1;
 }
 
 
@@ -313,7 +344,9 @@ static void internal_reset(void)
 	ST_TAC    = 0;
 	ST_TB     = 0;
 	ST_TBC    = 0;
-	dacen = 0;
+	dacen     = 0;
+	dacout    = 0;
+	ST_address= 0;
 }
 
 
@@ -331,7 +364,7 @@ void sharedmem_init(void)
 	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);
+	mp3_mem = (unsigned char *) mmap(0, MP3_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x2400000);
 	if (mp3_mem == MAP_FAILED)
 	{
 		printf("mmap(mp3_mem) failed with %i\n", errno);
@@ -380,15 +413,15 @@ void YM2612Init_940(int baseclock, int rate)
 		binpath[1023] = 0;
 		for (i = strlen(binpath); i > 0; i--)
 			if (binpath[i] == '/') { binpath[i] = 0; break; }
-		strcat(binpath, "/code940.bin");
+		strcat(binpath, "/" CODE940_FILE);
 
 		fp = fopen(binpath, "rb");
 		if(!fp)
 		{
-			memset(gp2x_screen, 0, 320*240);
-			gp2x_text_out8(10, 100, "failed to open required file:");
-			gp2x_text_out8(10, 110, "code940.bin");
-			gp2x_video_flip();
+			memset(gp2x_screen, 0, 320*240*2);
+			text_out16(10, 100, "failed to open required file:");
+			text_out16(10, 110, CODE940_FILE);
+			gp2x_video_flip2();
 			printf("failed to open %s\n", binpath);
 			exit(1);
 		}
@@ -408,7 +441,11 @@ void YM2612Init_940(int baseclock, int rate)
 	memset(shared_data, 0, sizeof(*shared_data));
 	memset(shared_ctl,  0, sizeof(*shared_ctl));
 
+	/* cause local ym2612 to init REGS */
+	YM2612Init_(baseclock, rate);
+
 	REGS = YM2612GetRegs();
+	addr_A1 = (INT32 *) (REGS + 0x200);
 
 	ym2612_dacen  = &dacen;
 	ym2612_dacout = &dacout;
@@ -464,9 +501,9 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
 	else memset32(buffer, 0, length<<stereo);
 
 	if (shared_ctl->writebuffsel == 1) {
-		shared_ctl->writebuff0[writebuff_ptr] = 0xffff;
+		shared_ctl->writebuff0[writebuff_ptr & 0xffff] = 0xffff;
 	} else {
-		shared_ctl->writebuff1[writebuff_ptr] = 0xffff;
+		shared_ctl->writebuff1[writebuff_ptr & 0xffff] = 0xffff;
 	}
 	writebuff_ptr = 0;
 
@@ -570,7 +607,6 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
 
 	if (loaded_mp3 != f)
 	{
-		// printf("loading mp3... "); fflush(stdout);
 		if (PicoMessage != NULL)
 		{
 			fseek(f, 0, SEEK_END);
@@ -579,8 +615,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
 		}
 		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");
+		if (!feof(f)) printf("Warning: mp3 was too large, not all data loaded.\n");
 		shared_ctl->mp3_len = ftell(f);
 		loaded_mp3 = f;
 
@@ -589,6 +624,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
 			if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE);
 			add_job_940(JOB940_INVALIDATE_DCACHE);
 		}
+		reset_timing = 1;
 	}
 
 	// seek..