X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fym2612.h;h=f5e98a05786508e859bf3650d5a803613fb91e31;hb=eaa9417a9b52389534f0dcbae6263781ea809ab2;hp=39c3cf6629c7d64beaa248444d755409603b3d3c;hpb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;p=picodrive.git diff --git a/Pico/sound/ym2612.h b/Pico/sound/ym2612.h index 39c3cf6..f5e98a0 100644 --- a/Pico/sound/ym2612.h +++ b/Pico/sound/ym2612.h @@ -22,14 +22,14 @@ typedef signed int INT32; /* signed 32bit */ typedef struct { INT32 *DT; /* #0x00 detune :dt_tab[DT] */ - UINT8 ar; /* #0x04 attack rate */ + UINT8 ar; /* #0x04 attack rate */ UINT8 d1r; /* #0x05 decay rate */ UINT8 d2r; /* #0x06 sustain rate */ - UINT8 rr; /* #0x07 release rate */ + UINT8 rr; /* #0x07 release rate */ UINT32 mul; /* #0x08 multiple :ML_TABLE[ML] */ /* Phase Generator */ - UINT32 phase; /* #0x0c phase counter */ + UINT32 phase; /* #0x0c phase counter | need_save */ UINT32 Incr; /* #0x10 phase step */ UINT8 KSR; /* #0x14 key scale rate :3-KSR */ @@ -38,15 +38,15 @@ typedef struct UINT8 key; /* #0x16 0=last key was KEY OFF, 1=KEY ON */ /* Envelope Generator */ - UINT8 state; /* #0x17 phase type: EG_OFF=0, EG_REL, EG_SUS, EG_DEC, EG_ATT */ - UINT16 tl; /* #0x18 total level: TL << 3 */ - INT16 volume; /* #0x1a envelope counter */ - UINT32 sl; /* #0x1c sustain level:sl_table[SL] */ + UINT8 state; /* #0x17 phase type: EG_OFF=0, EG_REL, EG_SUS, EG_DEC, EG_ATT | need_save */ + UINT16 tl; /* #0x18 total level: TL << 3 */ + INT16 volume; /* #0x1a envelope counter | need_save */ + UINT32 sl; /* #0x1c sustain level:sl_table[SL] */ - UINT32 eg_pack_ar; /* #0x20 (attack state) */ + UINT32 eg_pack_ar; /* #0x20 (attack state) */ UINT32 eg_pack_d1r; /* #0x24 (decay state) */ UINT32 eg_pack_d2r; /* #0x28 (sustain state) */ - UINT32 eg_pack_rr; /* #0x2c (release state) */ + UINT32 eg_pack_rr; /* #0x2c (release state) */ } FM_SLOT; @@ -54,22 +54,25 @@ typedef struct { FM_SLOT SLOT[4]; /* four SLOTs (operators) */ - UINT8 ALGO; /* algorithm */ - UINT8 FB; /* feedback shift */ + UINT8 ALGO; /* +00 algorithm */ + UINT8 FB; /* feedback shift */ + UINT8 pad[2]; INT32 op1_out; /* op1 output for feedback */ - INT32 mem_value; /* delayed sample (MEM) value */ + INT32 mem_value; /* +08 delayed sample (MEM) value */ INT32 pms; /* channel PMS */ UINT8 ams; /* channel AMS */ - UINT8 kcode; /* key code: */ - UINT32 fc; /* fnum,blk:adjusted to sample rate */ + UINT8 kcode; /* +11 key code: */ + UINT8 fn_h; /* freq latch */ + UINT8 pad2; + UINT32 fc; /* fnum,blk:adjusted to sample rate */ UINT32 block_fnum; /* current blk/fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */ /* LFO */ UINT8 AMmasks; /* AM enable flag */ - + UINT8 pad3[3]; } FM_CH; typedef struct @@ -77,17 +80,17 @@ typedef struct int clock; /* master clock (Hz) */ int rate; /* sampling rate (Hz) */ double freqbase; /* 08 frequency base */ - UINT8 address; /* 10 address register */ - UINT8 status; /* 11 status flag */ + UINT8 address; /* 10 address register | need_save */ + UINT8 status; /* 11 status flag | need_save */ UINT8 mode; /* mode CSM / 3SLOT */ - UINT8 fn_h; /* freq latch */ + UINT8 pad; int TA; /* timer a */ int TAC; /* timer a maxval */ - int TAT; /* timer a ticker */ + int TAT; /* timer a ticker | need_save */ UINT8 TB; /* timer b */ - UINT8 pad[3]; + UINT8 pad2[3]; int TBC; /* timer b maxval */ - int TBT; /* timer b ticker */ + int TBT; /* timer b ticker | need_save */ /* local time tables */ INT32 dt_tab[8][32];/* DeTune table */ } FM_ST; @@ -112,12 +115,12 @@ typedef struct FM_3SLOT SL3; /* 3 slot mode state */ UINT32 pan; /* fm channels output mask (bit 1 = enable) */ - UINT32 eg_cnt; /* #0xb38 global envelope generator counter */ - UINT32 eg_timer; /* #0xb3c global envelope generator counter works at frequency = chipclock/64/3 */ - UINT32 eg_timer_add; /* #0xb40 step of eg_timer */ + UINT32 eg_cnt; /* global envelope generator counter | need_save */ + UINT32 eg_timer; /* global envelope generator counter works at frequency = chipclock/64/3 | need_save */ + UINT32 eg_timer_add; /* step of eg_timer */ /* LFO */ - UINT32 lfo_cnt; + UINT32 lfo_cnt; /* need_save */ UINT32 lfo_inc; UINT32 lfo_freq[8]; /* LFO FREQ table */ @@ -126,13 +129,13 @@ typedef struct /* here's the virtual YM2612 */ typedef struct { - UINT8 REGS[0x200]; /* registers (for save states) */ - INT32 addr_A1; /* address line A1 */ + UINT8 REGS[0x200]; /* registers (for save states) */ + INT32 addr_A1; /* address line A1 | need_save */ - FM_CH CH[6]; /* channel state (0x168 bytes each)? */ + FM_CH CH[6]; /* channel state */ /* dac output (YM2612) */ - int dacen; + int dacen; INT32 dacout; FM_OPN OPN; /* OPN state */ @@ -141,40 +144,23 @@ typedef struct } YM2612; #endif -extern FM_ST *ym2612_st; #ifndef EXTERNAL_YM2612 extern YM2612 ym2612; #endif -#define YM2612Read() ym2612_st->status - -#define YM2612PicoTick(n) \ -{ \ - /* timer A */ \ - if(ym2612_st->mode & 0x01 && (ym2612_st->TAT+=64*n) >= ym2612_st->TAC) { \ - ym2612_st->TAT -= ym2612_st->TAC; \ - if(ym2612_st->mode & 0x04) ym2612_st->status |= 1; \ - } \ - \ - /* timer B */ \ - if(ym2612_st->mode & 0x02 && (ym2612_st->TBT+=64*n) >= ym2612_st->TBC) { \ - ym2612_st->TBT -= ym2612_st->TBC; \ - if(ym2612_st->mode & 0x08) ym2612_st->status |= 2; \ - } \ -} - - void YM2612Init_(int baseclock, int rate); void YM2612ResetChip_(void); 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); void *YM2612GetRegs(void); +void YM2612PicoStateSave2(int tat, int tbt); +int YM2612PicoStateLoad2(int *tat, int *tbt); #ifndef __GP2X__ #define YM2612Init YM2612Init_