timers implemented for new z80 mode

[picodrive.git] / Pico / sound / ym2612.h

diff --git a/Pico/sound/ym2612.h b/Pico/sound/ym2612.h
index e87cbc1..a1124de 100644 (file)
--- a/Pico/sound/ym2612.h
+++ b/Pico/sound/ym2612.h
@@ -141,35 +141,16 @@ typedef struct
 } YM2612;\r
 #endif\r
 \r
-extern int   *ym2612_dacen;\r
-extern INT32 *ym2612_dacout;\r
-extern FM_ST *ym2612_st;\r
-\r
-\r
-#define YM2612Read() ym2612_st->status\r
-\r
-#define YM2612PicoTick(n) \\r
-{ \\r
-       /* timer A */ \\r
-       if(ym2612_st->mode & 0x01 && (ym2612_st->TAT+=64*n) >= ym2612_st->TAC) { \\r
-               ym2612_st->TAT -= ym2612_st->TAC; \\r
-               if(ym2612_st->mode & 0x04) ym2612_st->status |= 1; \\r
-       } \\r
- \\r
-       /* timer B */ \\r
-       if(ym2612_st->mode & 0x02 && (ym2612_st->TBT+=64*n) >= ym2612_st->TBC) { \\r
-               ym2612_st->TBT -= ym2612_st->TBC; \\r
-               if(ym2612_st->mode & 0x08) ym2612_st->status |= 2; \\r
-       } \\r
-}\r
-\r
+#ifndef EXTERNAL_YM2612\r
+extern YM2612 ym2612;\r
+#endif\r
 \r
 void YM2612Init_(int baseclock, int rate);\r
 void YM2612ResetChip_(void);\r
 int  YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty);\r
 \r
 int  YM2612Write_(unsigned int a, unsigned int v);\r
-unsigned char YM2612Read_(void);\r
+//unsigned char YM2612Read_(void);\r
 \r
 int  YM2612PicoTick_(int n);\r
 void YM2612PicoStateLoad_(void);\r
@@ -180,7 +161,6 @@ void *YM2612GetRegs(void);
 #define YM2612Init          YM2612Init_\r
 #define YM2612ResetChip     YM2612ResetChip_\r
 #define YM2612UpdateOne     YM2612UpdateOne_\r
-#define YM2612Write         YM2612Write_\r
 #define YM2612PicoStateLoad YM2612PicoStateLoad_\r
 #else\r
 /* GP2X specific */\r
@@ -197,8 +177,6 @@ extern int PicoOpt;
 #define YM2612UpdateOne(buffer,length,stereo,is_buf_empty) \\r
        (PicoOpt&0x200) ? YM2612UpdateOne_940(buffer, length, stereo, is_buf_empty) : \\r
                                YM2612UpdateOne_(buffer, length, stereo, is_buf_empty);\r
-#define YM2612Write(a,v) \\r
-       (PicoOpt&0x200) ?  YM2612Write_940(a, v) : YM2612Write_(a, v)\r
 #define YM2612PicoStateLoad() { \\r
        if (PicoOpt&0x200) YM2612PicoStateLoad_940(); \\r
        else               YM2612PicoStateLoad_(); \\r