--- np2/sound/psggenc.c	2003/10/20 06:36:33	1.3
+++ np2/sound/psggenc.c	2003/12/08 00:55:33	1.8
@@ -70,20 +70,20 @@ void psggen_reset(PSGGEN psg) {
 		psg->tone[i].pvol = &psg->envvol;
 	}
 	for (i=0; i<sizeof(psggen_deftbl); i++) {
-		psggen_setreg(psg, (BYTE)i, psggen_deftbl[i]);
+		psggen_setreg(psg, (REG8)i, psggen_deftbl[i]);
 	}
 }
 
-void psggen_setreg(PSGGEN psg, BYTE reg, BYTE value) {
+void psggen_setreg(PSGGEN psg, REG8 reg, REG8 value) {
 
 	UINT	freq;
 	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:
@@ -113,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:
@@ -127,7 +129,8 @@ void psggen_setreg(PSGGEN psg, BYTE reg,
 				psg->tone[ch].pvol = ((BYTE *)&psg->reg) + reg;
 			}
 			psg->tone[ch].puchi = psggencfg.puchidec;
-//			TRACEOUT(("%d", value));
+			psg->puchicount = psggencfg.puchidec;
+//			TRACEOUT(("psg %x %x %d", (long)psg, reg, value));
 			break;
 
 		case 11:
@@ -148,8 +151,15 @@ void psggen_setreg(PSGGEN psg, BYTE reg,
 	}
 }
 
-BYTE psggen_getreg(PSGGEN psg, BYTE reg) {
+REG8 psggen_getreg(PSGGEN psg, REG8 reg) {
 
 	return(((BYTE *)&psg->reg)[reg & 15]);
 }
 
+void psggen_setpan(PSGGEN psg, UINT ch, REG8 pan) {
+
+	if ((psg) && (ch < 3)) {
+		psg->tone[ch].pan = pan;
+	}
+}
+