--- np2/sound/sound.c	2003/10/25 19:10:37	1.7
+++ np2/sound/sound.c	2004/01/08 16:29:56	1.11
@@ -1,13 +1,12 @@
 #include	"compiler.h"
 #include	"soundmng.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
 #include	"sndcsec.h"
 #include	"beep.h"
 
-
 	SOUNDCFG	soundcfg;
 
 
@@ -37,7 +36,7 @@ static void streamreset(void) {
 	sndstream.ptr = sndstream.buffer;
 	sndstream.remain = sndstream.samples + sndstream.reserve;
 	sndstream.cbreg = sndstream.cb;
-	SNDCSEC_TERM;
+	SNDCSEC_LEAVE;
 }
 
 static void streamprepare(UINT samples) {
@@ -126,7 +125,7 @@ void sound_reset(void) {
 	if (sndstream.buffer) {
 		soundmng_reset();
 		streamreset();
-		soundcfg.lastclock = I286_CLOCK;
+		soundcfg.lastclock = CPU_CLOCK;
 		beep_eventreset();
 	}
 }
@@ -154,7 +153,7 @@ void sound_changeclock(void) {
 	soundcfg.hzbase = hz;
 	soundcfg.clockbase = clock;
 	soundcfg.minclock = 2 * clock / hz;
-	soundcfg.lastclock = I286_CLOCK;
+	soundcfg.lastclock = CPU_CLOCK;
 }
 
 void sound_streamregist(void *hdl, SOUNDCB cbfn) {
@@ -180,7 +179,7 @@ void sound_sync(void) {
 		return;
 	}
 
-	length = I286_CLOCK + I286_BASECLOCK - I286_REMCLOCK - soundcfg.lastclock;
+	length = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK - soundcfg.lastclock;
 	if (length < soundcfg.minclock) {
 		return;
 	}
@@ -208,6 +207,7 @@ const SINT32 *sound_pcmlock(void) {
 const SINT32 *ret;
 
 	if (locks) {
+		TRACEOUT(("sound pcm lock: already locked"));
 		return(NULL);
 	}
 	locks++;
@@ -216,10 +216,13 @@ const SINT32 *ret;
 		SNDCSEC_ENTER;
 		if (sndstream.remain > sndstream.reserve) {
 			streamprepare(sndstream.remain - sndstream.reserve);
-			soundcfg.lastclock = I286_CLOCK + I286_BASECLOCK - I286_REMCLOCK;
+			soundcfg.lastclock = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
 			beep_eventreset();
 		}
 	}
+	else {
+		locks--;
+	}
 	return(ret);
 }