--- np2/sound/pcm86.h	2004/03/30 07:12:03	1.3
+++ np2/sound/pcm86.h	2004/06/02 11:02:53	1.5
@@ -13,10 +13,8 @@ enum {
 #define	PCM86_EXTBUF		pcm86.rescue					// µßºÑ±äÂÚ¡Ä
 #define	PCM86_REALBUFSIZE	(PCM86_LOGICALBUF + PCM86_EXTBUF)
 
-#define RECALC_NOWCLKWAIT {												\
-		past /= pcm86.stepclock;										\
-		pcm86.lastclock += (past * pcm86.stepclock);					\
-		pcm86.virbuf -= (past << pcm86.stepbit);						\
+#define RECALC_NOWCLKWAIT(cnt) {										\
+		pcm86.virbuf -= (cnt << pcm86.stepbit);							\
 		if (pcm86.virbuf < 0) {											\
 			pcm86.virbuf &= pcm86.stepmask;								\
 		}																\
@@ -47,13 +45,14 @@ typedef struct {
 	UINT32	stepclock;
 	UINT	stepmask;
 
-	BYTE	fifo;
-	BYTE	extfunc;
-	BYTE	dactrl;
-	BYTE	write;
-	BYTE	stepbit;
-	BYTE	reqirq;
-	BYTE	padding[2];
+	UINT8	fifo;
+	UINT8	extfunc;
+	UINT8	dactrl;
+	UINT8	_write;
+	UINT8	stepbit;
+	UINT8	reqirq;
+	UINT8	irqflag;
+	UINT8	padding[1];
 
 	BYTE	buffer[PCM86_BUFSIZE];
 } _PCM86, *PCM86;