From: notaz <notasas@gmail.com>
Date: Thu, 26 Jun 2008 20:04:33 +0000 (+0000)
Subject: click noise fixed when 940 was used
X-Git-Tag: v1.85~461
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52250671ae14d00dfcb52d137f73c9b565493279;p=picodrive.git

click noise fixed when 940 was used

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@498 be3aeb3a-fb24-0410-a615-afba39da0efa
---

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 99f78460..88e3a322 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -839,7 +839,7 @@ int ym2612_write_local(u32 a, u32 d, int is_from_z80)
 
           if ((d ^ old_mode) & 0xc0) {
 #ifdef __GP2X__
-            if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80));
+            if (PicoOpt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));
 #endif
             return 1;
           }
diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index b372d92e..ee250f8a 100644
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -82,10 +82,6 @@ int YM2612Write_940(unsigned int a, unsigned int v, int scanline)
 			upd = 0;
 			break;
 
-		case 1:	/* data port 0    */
-			if (ST_address == 0x2b) upd = 0; /* DAC sel */
-			break;
-
 		case 2:	/* address port 1 */
 			if (addr_A1 == 1 && ST_address == v)
 				return 0;
@@ -403,8 +399,8 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
 
 	/* predict sample counter for next frame */
 	if (PsndLen_exc_add) {
-		if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length = PsndLen + 1;
-		else length = PsndLen;
+		length = PsndLen;
+		if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length++;
 	}
 
 	/* give 940 ym job */