X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fym2612.h;h=a1124de4df2b618d40713f335ed3a48ca856d150;hb=43e6eaad0b73b37907be3342e0fd4cf65919e9f6;hp=c575baefdd978ee8f0d35948efa9c4992e32f862;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git

diff --git a/Pico/sound/ym2612.h b/Pico/sound/ym2612.h
index c575bae..a1124de 100644
--- a/Pico/sound/ym2612.h
+++ b/Pico/sound/ym2612.h
@@ -76,15 +76,16 @@ typedef struct
 {
 	int		clock;		/* master clock  (Hz)   */
 	int		rate;		/* sampling rate (Hz)   */
-	double	freqbase;	/* frequency base       */
-	UINT8	address;	/* address register     */
-	UINT8	status;		/* status flag          */
+	double	freqbase;	/* 08 frequency base       */
+	UINT8	address;	/* 10 address register     */
+	UINT8	status;		/* 11 status flag          */
 	UINT8	mode;		/* mode  CSM / 3SLOT    */
 	UINT8	fn_h;		/* freq latch           */
 	int		TA;			/* timer a              */
 	int		TAC;		/* timer a maxval       */
 	int		TAT;		/* timer a ticker       */
 	UINT8	TB;			/* timer b              */
+	UINT8	pad[3];
 	int		TBC;		/* timer b maxval       */
 	int		TBT;		/* timer b ticker       */
 	/* local time tables */
@@ -135,17 +136,21 @@ typedef struct
 	INT32		dacout;
 
 	FM_OPN		OPN;				/* OPN state            */
+
+	UINT32		slot_mask;			/* active slot mask (performance hack) */
 } YM2612;
 #endif
 
-
+#ifndef EXTERNAL_YM2612
+extern YM2612 ym2612;
+#endif
 
 void YM2612Init_(int baseclock, int rate);
 void YM2612ResetChip_(void);
-void YM2612UpdateOne_(short *buffer, int length, int stereo);
+int  YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty);
 
 int  YM2612Write_(unsigned int a, unsigned int v);
-unsigned char YM2612Read_(void);
+//unsigned char YM2612Read_(void);
 
 int  YM2612PicoTick_(int n);
 void YM2612PicoStateLoad_(void);
@@ -156,13 +161,10 @@ void *YM2612GetRegs(void);
 #define YM2612Init          YM2612Init_
 #define YM2612ResetChip     YM2612ResetChip_
 #define YM2612UpdateOne     YM2612UpdateOne_
-#define YM2612Write         YM2612Write_
-#define YM2612Read          YM2612Read_
-#define YM2612PicoTick      YM2612PicoTick_
 #define YM2612PicoStateLoad YM2612PicoStateLoad_
 #else
 /* GP2X specific */
-#include "../../platform/gp2x/940ctl_ym2612.h"
+#include "../../platform/gp2x/940ctl.h"
 extern int PicoOpt;
 #define YM2612Init(baseclock,rate) { \
 	if (PicoOpt&0x200) YM2612Init_940(baseclock, rate); \
@@ -172,16 +174,9 @@ extern int PicoOpt;
 	if (PicoOpt&0x200) YM2612ResetChip_940(); \
 	else               YM2612ResetChip_(); \
 }
-#define YM2612UpdateOne(buffer,length,stereo) { \
-	if (PicoOpt&0x200) YM2612UpdateOne_940(buffer, length, stereo); \
-	else               YM2612UpdateOne_(buffer, length, stereo); \
-}
-#define YM2612Write(a,v) \
-	(PicoOpt&0x200) ?  YM2612Write_940(a, v) : YM2612Write_(a, v)
-#define YM2612Read() \
-	(PicoOpt&0x200) ?  YM2612Read_940()      : YM2612Read_()
-#define YM2612PicoTick(n) \
-	(PicoOpt&0x200) ?  YM2612PicoTick_940(n) : YM2612PicoTick_(n)
+#define YM2612UpdateOne(buffer,length,stereo,is_buf_empty) \
+	(PicoOpt&0x200) ? YM2612UpdateOne_940(buffer, length, stereo, is_buf_empty) : \
+				YM2612UpdateOne_(buffer, length, stereo, is_buf_empty);
 #define YM2612PicoStateLoad() { \
 	if (PicoOpt&0x200) YM2612PicoStateLoad_940(); \
 	else               YM2612PicoStateLoad_(); \