--- np2/sound/psggenc.c	2003/10/16 17:58:05	1.1.1.1
+++ np2/sound/psggenc.c	2003/12/04 13:54:29	1.7
@@ -45,8 +45,10 @@ void psggen_initialize(UINT rate) {
 	if (psggencfg.puchidec == 0) {
 		psggencfg.puchidec = 1;
 	}
-	psggencfg.base = (5000 * (1 << (32 - PSGFREQPADBIT - PSGADDEDBIT)))
+	if (rate) {
+		psggencfg.base = (5000 * (1 << (32 - PSGFREQPADBIT - PSGADDEDBIT)))
 															/ (rate / 25);
+	}
 }
 
 void psggen_setvol(UINT vol) {
@@ -78,10 +80,10 @@ void psggen_setreg(PSGGEN psg, BYTE reg,
 	UINT	ch;
 
 	reg &= 15;
-	((BYTE *)&psg->reg)[reg] = value;
 	if (reg < 14) {
 		sound_sync();
 	}
+	((BYTE *)&psg->reg)[reg] = value;
 	switch(reg) {
 		case 0:
 		case 1:
@@ -111,6 +113,8 @@ void psggen_setreg(PSGGEN psg, BYTE reg,
 		case 7:
 			keydisp_psgmix(psg);
 			psg->mixer = ~value;
+			psg->puchicount = psggencfg.puchidec;
+//			TRACEOUT(("psg %x 7 %d", (long)psg, value));
 			break;
 
 		case 8:
@@ -125,6 +129,8 @@ void psggen_setreg(PSGGEN psg, BYTE reg,
 				psg->tone[ch].pvol = ((BYTE *)&psg->reg) + reg;
 			}
 			psg->tone[ch].puchi = psggencfg.puchidec;
+			psg->puchicount = psggencfg.puchidec;
+//			TRACEOUT(("psg %x %x %d", (long)psg, reg, value));
 			break;
 
 		case 11:
@@ -150,3 +156,10 @@ BYTE psggen_getreg(PSGGEN psg, BYTE reg)
 	return(((BYTE *)&psg->reg)[reg & 15]);
 }
 
+void psggen_setpan(PSGGEN psg, UINT ch, BYTE pan) {
+
+	if ((psg) && (ch < 3)) {
+		psg->tone[ch].pan = pan;
+	}
+}
+