The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2025-01-13 19:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ekeeke/Genesis-Plus-GX

Browse Source
This commit is contained in:
EkeEke 2018-06-20 23:00:25 +02:00
commit d17b0be5c9
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/sound/ym3438.c
View File

@ -40,7 +40,7 @@
* OPLx decapsulated(Matthew Gambrell, Olli Niemitalo): * OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
* OPL2 ROMs. * OPL2 ROMs.
* *
* version: 1.0.7 * version: 1.0.8
*/ */
#include <string.h> #include <string.h>
@ -233,7 +233,7 @@ static const Bit32u fm_algorithm[4][6][8] = {
} }
}; };
static Bit32u chip_type = ym3438_type_discrete; static Bit32u chip_type = ym3438_mode_readmode;
void OPN2_DoIO(ym3438_t *chip) void OPN2_DoIO(ym3438_t *chip)
{ {
@ -995,7 +995,7 @@ void OPN2_ChOutput(ym3438_t *chip)
chip->mol = 0; chip->mol = 0;
chip->mor = 0; chip->mor = 0;
if (chip_type == ym3438_type_ym2612) if (chip_type & ym3438_mode_ym2612)
{ {
out_en = ((cycles & 3) == 3) || test_dac; out_en = ((cycles & 3) == 3) || test_dac;
/* YM2612 DAC emulation(not verified) */ /* YM2612 DAC emulation(not verified) */
@ -1028,11 +1028,6 @@ void OPN2_ChOutput(ym3438_t *chip)
else else
{ {
out_en = ((cycles & 3) != 0) || test_dac; out_en = ((cycles & 3) != 0) || test_dac;
/* Discrete YM3438 seems has the ladder effect too */
if (out >= 0 && chip_type == ym3438_type_discrete)
{
out++;
}
if (chip->ch_lock_l && out_en) if (chip->ch_lock_l && out_en)
{ {
chip->mol = out; chip->mol = out;
@ -1355,6 +1350,9 @@ void OPN2_Clock(ym3438_t *chip, Bit16s *buffer)
buffer[0] = chip->mol; buffer[0] = chip->mol;
buffer[1] = chip->mor; buffer[1] = chip->mor;
if (chip->status_time)
chip->status_time--;
} }
void OPN2_Write(ym3438_t *chip, Bit32u port, Bit8u data) void OPN2_Write(ym3438_t *chip, Bit32u port, Bit8u data)
@ -1394,7 +1392,7 @@ Bit32u OPN2_ReadIRQPin(ym3438_t *chip)
Bit8u OPN2_Read(ym3438_t *chip, Bit32u port) Bit8u OPN2_Read(ym3438_t *chip, Bit32u port)
{ {
if ((port & 3) == 0 || chip_type == ym3438_type_asic) if ((port & 3) == 0 || (chip_type & ym3438_mode_readmode))
{ {
if (chip->mode_test_21[6]) if (chip->mode_test_21[6])
{ {
@ -1411,18 +1409,30 @@ Bit8u OPN2_Read(ym3438_t *chip, Bit32u port)
} }
if (chip->mode_test_21[7]) if (chip->mode_test_21[7])
{ {
return testdata & 0xff; chip->status = testdata & 0xff;
} }
else else
{ {
return testdata >> 8; chip->status = testdata >> 8;
} }
} }
else else
{ {
return (chip->busy << 7) | (chip->timer_b_overflow_flag << 1) chip->status = (chip->busy << 7) | (chip->timer_b_overflow_flag << 1)
| chip->timer_a_overflow_flag; | chip->timer_a_overflow_flag;
} }
if (chip_type & ym3438_mode_ym2612)
{
chip->status_time = 300000;
}
else
{
chip->status_time = 40000000;
}
}
if (chip->status_time)
{
return chip->status;
} }
return 0; return 0;
} }

9
core/sound/ym3438.h
View File

@ -39,16 +39,15 @@
* OPLx decapsulated(Matthew Gambrell, Olli Niemitalo): * OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
* OPL2 ROMs. * OPL2 ROMs.
* *
* version: 1.0.7 * version: 1.0.8
*/ */
#ifndef YM3438_H #ifndef YM3438_H
#define YM3438_H #define YM3438_H
enum { enum {
ym3438_type_discrete = 0, /* Discrete YM3438 (Teradrive) */ ym3438_mode_ym2612 = 0x01, /* Enables YM2612 emulation (MD1, MD2 VA2) */
ym3438_type_asic = 1, /* ASIC YM3438 (MD1 VA7, MD2, MD3, etc) */ ym3438_mode_readmode = 0x02, /* Enables status read on any port (TeraDrive, MD1 VA7, MD2, etc) */
ym3438_type_ym2612 = 2 /* YM2612 (MD1, MD2 VA2) */
}; };
#include <stdint.h> #include <stdint.h>
@ -205,6 +204,8 @@ typedef struct
Bit8u pan_l[6], pan_r[6]; Bit8u pan_l[6], pan_r[6];
Bit8u ams[6]; Bit8u ams[6];
Bit8u pms[6]; Bit8u pms[6];
Bit8u status;
Bit32u status_time;
} ym3438_t; } ym3438_t;
void OPN2_Reset(ym3438_t *chip); void OPN2_Reset(ym3438_t *chip);

13
libretro/libretro.c
View File

@ -1156,19 +1156,14 @@ static void check_variables(void)
orig_value = config.ym3438; orig_value = config.ym3438;
if (!strcmp(var.value, "nuked (ym2612)")) if (!strcmp(var.value, "nuked (ym2612)"))
{ {
OPN2_SetChipType(ym3438_type_ym2612); OPN2_SetChipType(ym3438_mode_ym2612);
config.ym3438 = 1; config.ym3438 = 1;
} }
else if (!strcmp(var.value, "nuked (asic ym3438)")) else if (!strcmp(var.value, "nuked (ym3438)"))
{ {
OPN2_SetChipType(ym3438_type_asic); OPN2_SetChipType(ym3438_mode_readmode);
config.ym3438 = 2; config.ym3438 = 2;
} }
else if (!strcmp(var.value, "nuked (discrete ym3438)"))
{
OPN2_SetChipType(ym3438_type_discrete);
config.ym3438 = 3;
}
else else
{ {
config.ym3438 = 0; config.ym3438 = 0;
@ -1766,7 +1761,7 @@ void retro_set_environment(retro_environment_t cb)
{ "genesis_plus_gx_lock_on", "Cartridge lock-on; disabled|game genie|action replay (pro)|sonic & knuckles" }, { "genesis_plus_gx_lock_on", "Cartridge lock-on; disabled|game genie|action replay (pro)|sonic & knuckles" },
{ "genesis_plus_gx_ym2413", "Master System FM (YM2413); auto|disabled|enabled" }, { "genesis_plus_gx_ym2413", "Master System FM (YM2413); auto|disabled|enabled" },
#ifdef HAVE_YM3438_CORE #ifdef HAVE_YM3438_CORE
{ "genesis_plus_gx_ym2612", "Mega Drive / Genesis FM; mame (ym2612)|mame (asic ym3438)|mame (enhanced ym3438)|nuked (ym2612)|nuked (asic ym3438)|nuked (discrete ym3438)" }, { "genesis_plus_gx_ym2612", "Mega Drive / Genesis FM; mame (ym2612)|mame (asic ym3438)|mame (enhanced ym3438)|nuked (ym2612)|nuked (ym3438)" },
#else #else
{ "genesis_plus_gx_ym2612", "Mega Drive / Genesis FM; mame (ym2612)|mame (asic ym3438)|mame (enhanced ym3438)" }, { "genesis_plus_gx_ym2612", "Mega Drive / Genesis FM; mame (ym2612)|mame (asic ym3438)|mame (enhanced ym3438)" },
#endif #endif