claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Enable YM2164

Browse Source
This commit is contained in:
Jasmine Iwanek
2024-12-19 03:08:22 -05:00
parent c36510a9f2
commit 7b9d025a26
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/snd_opl.h
View File

@@ -37,9 +37,7 @@ enum fm_type {
FM_YM2612 = 16, /* OPN2 */ FM_YM2612 = 16, /* OPN2 */
FM_YM3438 = 17, /* OPN2C */ FM_YM3438 = 17, /* OPN2C */
FM_YMF276 = 18, /* OPN2L */ FM_YMF276 = 18, /* OPN2L */
#if 0
FM_YM2164 = 19, /* OPP */ FM_YM2164 = 19, /* OPP */
#endif
FM_ESFM = 20, /* ESFM */ FM_ESFM = 20, /* ESFM */
FM_OPL2BOARD = 21, /* OPL2Board (External Device) */ FM_OPL2BOARD = 21, /* OPL2Board (External Device) */
FM_MAX = 22 FM_MAX = 22
@@ -97,10 +95,8 @@ extern const device_t ym2612_ymfm_device;
extern const device_t ym3438_ymfm_device; extern const device_t ym3438_ymfm_device;
extern const device_t ymf276_ymfm_device; extern const device_t ymf276_ymfm_device;
#if 0
/* OPP Series */ /* OPP Series */
extern const device_t ym2164_ymfm_device; extern const device_t ym2164_ymfm_device;
#endif
extern const device_t esfm_esfmu_device; extern const device_t esfm_esfmu_device;

2
src/sound/snd_opl.c
View File

@@ -144,12 +144,10 @@ fm_driver_get(int chip_id, fm_drv_t *drv)
drv->priv = device_add_inst(&ymf276_ymfm_device, fm_dev_inst[fm_driver][chip_id]++); drv->priv = device_add_inst(&ymf276_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
break; break;
#if 0
case FM_YM2164: /* OPP */ case FM_YM2164: /* OPP */
*drv = ymfm_drv; *drv = ymfm_drv;
drv->priv = device_add_inst(&ym2164_ymfm_device, fm_dev_inst[fm_driver][chip_id]++); drv->priv = device_add_inst(&ym2164_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
break; break;
#endif
case FM_ESFM: case FM_ESFM:
*drv = esfmu_opl_drv; *drv = esfmu_opl_drv;

4
src/sound/snd_opl_ymfm.cpp
View File

@@ -416,12 +416,10 @@ ymfm_drv_init(const device_t *info)
fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf276>(14318181, FM_YMF276, FREQ_49716); fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf276>(14318181, FM_YMF276, FREQ_49716);
break; break;
#if 0
case FM_YM2164: /* OPP */ case FM_YM2164: /* OPP */
// TODO: Check rates and frequency // TODO: Check rates and frequency
fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2164>(14318181, FM_YM2164, FREQ_49716); fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2164>(14318181, FM_YM2164, FREQ_49716);
break; break;
#endif
} }
fm->set_do_cycles(1); fm->set_do_cycles(1);
@@ -768,7 +766,6 @@ const device_t ymf276_ymfm_device = {
.config = NULL .config = NULL
}; };
#if 0
const device_t ym2164_ymfm_device = { const device_t ym2164_ymfm_device = {
.name = "Yamaha YM2164 OPP (YMFM)", .name = "Yamaha YM2164 OPP (YMFM)",
.internal_name = "ym2164_ymfm", .internal_name = "ym2164_ymfm",
@@ -782,7 +779,6 @@ const device_t ym2164_ymfm_device = {
.force_redraw = NULL, .force_redraw = NULL,
.config = NULL .config = NULL
}; };
#endif
const fm_drv_t ymfm_drv { const fm_drv_t ymfm_drv {
.read = &ymfm_drv_read, .read = &ymfm_drv_read,