#ifndef EXTERNAL_YM2612\r
#include <stdlib.h>\r
// let it be 1 global to simplify things\r
-static YM2612 ym2612;\r
+YM2612 ym2612;\r
\r
#else\r
extern YM2612 *ym2612_940;\r
\r
static chan_rend_context crct;\r
\r
+static void chan_render_prep(void)\r
+{\r
+ crct.eg_timer_add = ym2612.OPN.eg_timer_add;\r
+ crct.lfo_inc = ym2612.OPN.lfo_inc;\r
+}\r
+\r
+static void chan_render_finish(void)\r
+{\r
+ ym2612.OPN.eg_cnt = crct.eg_cnt;\r
+ ym2612.OPN.eg_timer = crct.eg_timer;\r
+ g_lfo_ampm = crct.pack >> 16; // need_save\r
+ ym2612.OPN.lfo_cnt = crct.lfo_cnt;\r
+}\r
+\r
static int chan_render(int *buffer, int length, int c, UINT32 flags) // flags: stereo, ?, disabled, ?, pan_r, pan_l\r
{\r
crct.CH = &ym2612.CH[c];\r
crct.mem = crct.CH->mem_value; /* one sample delay memory */\r
crct.lfo_cnt = ym2612.OPN.lfo_cnt;\r
- crct.lfo_inc = ym2612.OPN.lfo_inc;\r
\r
flags &= 0x35;\r
\r
\r
crct.eg_cnt = ym2612.OPN.eg_cnt; /* envelope generator counter */\r
crct.eg_timer = ym2612.OPN.eg_timer;\r
- crct.eg_timer_add = ym2612.OPN.eg_timer_add;\r
\r
/* precalculate phase modulation incr */\r
crct.phase1 = crct.CH->SLOT[SLOT1].phase;\r
else\r
ym2612.slot_mask &= ~(0xf << (c*4));\r
\r
- // if this the last call, write back persistent stuff:\r
- if ((ym2612.slot_mask >> ((c+1)*4)) == 0)\r
- {\r
- ym2612.OPN.eg_cnt = crct.eg_cnt;\r
- ym2612.OPN.eg_timer = crct.eg_timer;\r
- g_lfo_ampm = crct.pack >> 16;\r
- ym2612.OPN.lfo_cnt = crct.lfo_cnt;\r
- }\r
-\r
return (crct.algo & 8) >> 3; // had output\r
}\r
\r
SLOT->ksr = ksr;\r
\r
/* calculate envelope generator rates */\r
- if ((SLOT->ar + SLOT->ksr) < 32+62)\r
+ if ((SLOT->ar + ksr) < 32+62)\r
{\r
- eg_sh = eg_rate_shift [SLOT->ar + SLOT->ksr ];\r
- eg_sel = eg_rate_select[SLOT->ar + SLOT->ksr ];\r
+ eg_sh = eg_rate_shift [SLOT->ar + ksr ];\r
+ eg_sel = eg_rate_select[SLOT->ar + ksr ];\r
}\r
else\r
{\r
\r
SLOT->eg_pack_ar = eg_inc_pack[eg_sel] | (eg_sh<<24);\r
\r
- eg_sh = eg_rate_shift [SLOT->d1r + SLOT->ksr];\r
- eg_sel = eg_rate_select[SLOT->d1r + SLOT->ksr];\r
+ eg_sh = eg_rate_shift [SLOT->d1r + ksr];\r
+ eg_sel = eg_rate_select[SLOT->d1r + ksr];\r
\r
SLOT->eg_pack_d1r = eg_inc_pack[eg_sel] | (eg_sh<<24);\r
\r
- eg_sh = eg_rate_shift [SLOT->d2r + SLOT->ksr];\r
- eg_sel = eg_rate_select[SLOT->d2r + SLOT->ksr];\r
+ eg_sh = eg_rate_shift [SLOT->d2r + ksr];\r
+ eg_sel = eg_rate_select[SLOT->d2r + ksr];\r
\r
SLOT->eg_pack_d2r = eg_inc_pack[eg_sel] | (eg_sh<<24);\r
\r
- eg_sh = eg_rate_shift [SLOT->rr + SLOT->ksr];\r
- eg_sel = eg_rate_select[SLOT->rr + SLOT->ksr];\r
+ eg_sh = eg_rate_shift [SLOT->rr + ksr];\r
+ eg_sel = eg_rate_select[SLOT->rr + ksr];\r
\r
SLOT->eg_pack_rr = eg_inc_pack[eg_sel] | (eg_sh<<24);\r
}\r
/* YM2612 local section */\r
/*******************************************************************************/\r
\r
-int *ym2612_dacen;\r
-INT32 *ym2612_dacout;\r
-FM_ST *ym2612_st;\r
-\r
-\r
/* Generate samples for YM2612 */\r
int YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty)\r
{\r
\r
/* mix to 32bit dest */\r
// flags: stereo, ?, disabled, ?, pan_r, pan_l\r
+ chan_render_prep();\r
if (ym2612.slot_mask & 0x00000f) active_chs |= chan_render(buffer, length, 0, stereo|((pan&0x003)<<4)) << 0;\r
if (ym2612.slot_mask & 0x0000f0) active_chs |= chan_render(buffer, length, 1, stereo|((pan&0x00c)<<2)) << 1;\r
if (ym2612.slot_mask & 0x000f00) active_chs |= chan_render(buffer, length, 2, stereo|((pan&0x030) )) << 2;\r
if (ym2612.slot_mask & 0x00f000) active_chs |= chan_render(buffer, length, 3, stereo|((pan&0x0c0)>>2)) << 3;\r
if (ym2612.slot_mask & 0x0f0000) active_chs |= chan_render(buffer, length, 4, stereo|((pan&0x300)>>4)) << 4;\r
if (ym2612.slot_mask & 0xf00000) active_chs |= chan_render(buffer, length, 5, stereo|((pan&0xc00)>>6)|(ym2612.dacen<<2)) << 5;\r
+ chan_render_finish();\r
\r
return active_chs; // 1 if buffer updated\r
}\r
/* initialize YM2612 emulator */\r
void YM2612Init_(int clock, int rate)\r
{\r
- // notaz\r
- ym2612_dacen = &ym2612.dacen;\r
- ym2612_dacout = &ym2612.dacout;\r
- ym2612_st = &ym2612.OPN.ST;\r
-\r
memset(&ym2612, 0, sizeof(ym2612));\r
init_tables();\r
\r
}\r
\r
addr = ym2612.OPN.ST.address;\r
-#ifndef EXTERNAL_YM2612\r
- ym2612.REGS[addr] = v;\r
-#endif\r
\r
switch( addr & 0xf0 )\r
{\r
ym2612.OPN.lfo_inc = 0;\r
}\r
break;\r
+#if 0 // handled elsewhere\r
case 0x24: { // timer A High 8\r
int TAnew = (ym2612.OPN.ST.TA & 0x03)|(((int)v)<<2);\r
if(ym2612.OPN.ST.TA != TAnew) {\r
set_timers( v );\r
ret=0;\r
break;\r
+#endif\r
case 0x28: /* key on / off */\r
{\r
UINT8 c;\r
if(v&0x80) FM_KEYON(c,SLOT4); else FM_KEYOFF(c,SLOT4);\r
break;\r
}\r
+#if 0\r
case 0x2a: /* DAC data (YM2612) */\r
ym2612.dacout = ((int)v - 0x80) << 6; /* level unknown (notaz: 8 seems to be too much) */\r
ret=0;\r
ym2612.dacen = v & 0x80;\r
ret=0;\r
break;\r
+#endif\r
default:\r
break;\r
}\r
}\r
\r
addr = ym2612.OPN.ST.address | 0x100;\r
-#ifndef EXTERNAL_YM2612\r
- ym2612.REGS[addr] = v;\r
-#endif\r
\r
ret = OPNWriteReg(addr, v);\r
break;\r
\r
void YM2612PicoStateLoad_(void)\r
{\r
-#ifndef EXTERNAL_YM2612\r
- int i, real_A1 = ym2612.addr_A1;\r
-\r
reset_channels( &ym2612.CH[0] );\r
+ ym2612.slot_mask = 0xffffff;\r
+}\r
+\r
+typedef struct\r
+{\r
+ UINT32 state_phase;\r
+ INT16 volume;\r
+} ym_save_addon_slot;\r
\r
- // feed all the registers and update internal state\r
- for(i = 0; i < 0x100; i++) {\r
- YM2612Write_(0, i);\r
- YM2612Write_(1, ym2612.REGS[i]);\r
+typedef struct\r
+{\r
+ UINT32 magic;\r
+ UINT8 address;\r
+ UINT8 status;\r
+ UINT8 addr_A1;\r
+ UINT8 unused;\r
+ int TAT;\r
+ int TBT;\r
+ UINT32 eg_cnt;\r
+ UINT32 eg_timer;\r
+ UINT32 lfo_cnt;\r
+ UINT16 lfo_ampm;\r
+ UINT16 unused2;\r
+} ym_save_addon;\r
+\r
+void YM2612PicoStateSave2(int tat, int tbt)\r
+{\r
+ ym_save_addon_slot ss;\r
+ ym_save_addon sa;\r
+ unsigned char *ptr;\r
+ int c, s;\r
+\r
+ // chans 1,2,3\r
+ ptr = &ym2612.REGS[0x0b8];\r
+ for (c = 0; c < 3; c++)\r
+ {\r
+ for (s = 0; s < 4; s++) {\r
+ ss.state_phase = (ym2612.CH[c].SLOT[s].state << 29) | (ym2612.CH[c].SLOT[s].phase >> 3);\r
+ ss.volume = ym2612.CH[c].SLOT[s].volume;\r
+ memcpy(ptr, &ss, 6);\r
+ ptr += 6;\r
+ }\r
+ }\r
+ // chans 4,5,6\r
+ ptr = &ym2612.REGS[0x1b8];\r
+ for (; c < 6; c++)\r
+ {\r
+ for (s = 0; s < 4; s++) {\r
+ ss.state_phase = (ym2612.CH[c].SLOT[s].state << 29) | (ym2612.CH[c].SLOT[s].phase >> 3);\r
+ ss.volume = ym2612.CH[c].SLOT[s].volume;\r
+ memcpy(ptr, &ss, 6);\r
+ ptr += 6;\r
+ }\r
}\r
+ // other things\r
+ ptr = &ym2612.REGS[0x100];\r
+ sa.magic = 0x41534d59; // 'YMSA'\r
+ sa.address = ym2612.OPN.ST.address;\r
+ sa.status = ym2612.OPN.ST.status;\r
+ sa.addr_A1 = ym2612.addr_A1;\r
+ sa.unused = 0;\r
+ sa.TAT = tat;\r
+ sa.TBT = tbt;\r
+ sa.eg_cnt = ym2612.OPN.eg_cnt;\r
+ sa.eg_timer = ym2612.OPN.eg_timer;\r
+ sa.lfo_cnt = ym2612.OPN.lfo_cnt;\r
+ sa.lfo_ampm = g_lfo_ampm;\r
+ sa.unused2 = 0;\r
+ memcpy(ptr, &sa, sizeof(sa)); // 0x30 max\r
+}\r
\r
- for(i = 0; i < 0x100; i++) {\r
- YM2612Write_(2, i);\r
- YM2612Write_(3, ym2612.REGS[i|0x100]);\r
+int YM2612PicoStateLoad2(int *tat, int *tbt)\r
+{\r
+ ym_save_addon_slot ss;\r
+ ym_save_addon sa;\r
+ unsigned char *ptr;\r
+ int c, s;\r
+\r
+ ptr = &ym2612.REGS[0x100];\r
+ memcpy(&sa, ptr, sizeof(sa)); // 0x30 max\r
+ if (sa.magic != 0x41534d59) return -1;\r
+\r
+ ym2612.OPN.ST.address = sa.address;\r
+ ym2612.OPN.ST.status = sa.status;\r
+ ym2612.addr_A1 = sa.addr_A1;\r
+ ym2612.OPN.eg_cnt = sa.eg_cnt;\r
+ ym2612.OPN.eg_timer = sa.eg_timer;\r
+ ym2612.OPN.lfo_cnt = sa.lfo_cnt;\r
+ g_lfo_ampm = sa.lfo_ampm;\r
+ if (tat != NULL) *tat = sa.TAT;\r
+ if (tbt != NULL) *tbt = sa.TBT;\r
+\r
+ // chans 1,2,3\r
+ ptr = &ym2612.REGS[0x0b8];\r
+ for (c = 0; c < 3; c++)\r
+ {\r
+ for (s = 0; s < 4; s++) {\r
+ memcpy(&ss, ptr, 6);\r
+ ym2612.CH[c].SLOT[s].state = ss.state_phase >> 29;\r
+ ym2612.CH[c].SLOT[s].phase = ss.state_phase << 3;\r
+ ym2612.CH[c].SLOT[s].volume = ss.volume;\r
+ ptr += 6;\r
+ }\r
+ }\r
+ // chans 4,5,6\r
+ ptr = &ym2612.REGS[0x1b8];\r
+ for (; c < 6; c++)\r
+ {\r
+ for (s = 0; s < 4; s++) {\r
+ memcpy(&ss, ptr, 6);\r
+ ym2612.CH[c].SLOT[s].state = ss.state_phase >> 29;\r
+ ym2612.CH[c].SLOT[s].phase = ss.state_phase << 3;\r
+ ym2612.CH[c].SLOT[s].volume = ss.volume;\r
+ ptr += 6;\r
+ }\r
}\r
\r
- ym2612.addr_A1 = real_A1;\r
-#else\r
- reset_channels( &ym2612.CH[0] );\r
-#endif\r
+ return 0;\r
}\r
\r
#ifndef EXTERNAL_YM2612\r
notaz.gp2x.de / picodrive.git / blobdiff