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

Removed DOSBox OPL code, and made NukedOPL, the CD-ROM image code (incl. former cdrom_dosbox.cpp/h), and Raw Input mouse code C instead of C++, and fixed OPL2 emulation with NukedOPL.

Browse Source
This commit is contained in:
OBattler
2019-12-21 20:06:34 +01:00
parent 6881b6ec64
commit 51b06be28c
25 changed files with 1476 additions and 3437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

274
src/sound/snd_opl.c
View File

@@ -12,70 +12,93 @@
#include "../timer.h"
#include "sound.h"
#include "snd_opl.h"
#include "snd_dbopl.h"
#include "snd_opl_backend.h"
/*Interfaces between 86Box and the actual OPL emulator*/
uint8_t opl2_read(uint16_t a, void *priv)
uint8_t
opl2_read(uint16_t a, void *priv)
{
opl_t *opl = (opl_t *)priv;
opl_t *opl = (opl_t *)priv;
sub_cycles((int)(isa_timing * 8));
opl2_update2(opl);
return opl_read(0, a);
}
void opl2_write(uint16_t a, uint8_t v, void *priv)
{
opl_t *opl = (opl_t *)priv;
sub_cycles((int) (isa_timing * 8));
opl2_update2(opl);
opl2_update2(opl);
opl_write(0, a, v);
opl_write(1, a, v);
return opl_read(0, a);
}
uint8_t opl2_l_read(uint16_t a, void *priv)
{
opl_t *opl = (opl_t *)priv;
sub_cycles((int)(isa_timing * 8));
opl2_update2(opl);
return opl_read(0, a);
}
void opl2_l_write(uint16_t a, uint8_t v, void *priv)
void
opl2_write(uint16_t a, uint8_t v, void *priv)
{
opl_t *opl = (opl_t *)priv;
opl_t *opl = (opl_t *)priv;
opl2_update2(opl);
opl_write(0, a, v);
opl2_update2(opl);
opl_write(0, a, v);
opl_write(1, a, v);
}
uint8_t opl2_r_read(uint16_t a, void *priv)
{
opl_t *opl = (opl_t *)priv;
sub_cycles((int)(isa_timing * 8));
opl2_update2(opl);
return opl_read(1, a);
}
void opl2_r_write(uint16_t a, uint8_t v, void *priv)
uint8_t
opl2_l_read(uint16_t a, void *priv)
{
opl_t *opl = (opl_t *)priv;
opl_t *opl = (opl_t *)priv;
opl2_update2(opl);
opl_write(1, a, v);
sub_cycles((int)(isa_timing * 8));
opl2_update2(opl);
return opl_read(0, a);
}
uint8_t opl3_read(uint16_t a, void *priv)
{
opl_t *opl = (opl_t *)priv;
sub_cycles((int)(isa_timing * 8));
opl3_update2(opl);
return opl_read(0, a);
void
opl2_l_write(uint16_t a, uint8_t v, void *priv)
{
opl_t *opl = (opl_t *)priv;
opl2_update2(opl);
opl_write(0, a, v);
}
void opl3_write(uint16_t a, uint8_t v, void *priv)
uint8_t
opl2_r_read(uint16_t a, void *priv)
{
opl_t *opl = (opl_t *)priv;
sub_cycles((int)(isa_timing * 8));
opl2_update2(opl);
return opl_read(1, a);
}
void
opl2_r_write(uint16_t a, uint8_t v, void *priv)
{
opl_t *opl = (opl_t *)priv;
opl2_update2(opl);
opl_write(1, a, v);
}
uint8_t
opl3_read(uint16_t a, void *priv)
{
opl_t *opl = (opl_t *)priv;
sub_cycles((int)(isa_timing * 8));
opl3_update2(opl);
return opl_read(0, a);
}
void
opl3_write(uint16_t a, uint8_t v, void *priv)
{
opl_t *opl = (opl_t *)priv;
@@ -84,93 +107,116 @@ void opl3_write(uint16_t a, uint8_t v, void *priv)
}
void opl2_update2(opl_t *opl)
void
opl2_update2(opl_t *opl)
{
if (opl->pos < sound_pos_global)
{
opl2_update(0, &opl->buffer[opl->pos*2], sound_pos_global - opl->pos);
opl2_update(1, &opl->buffer[opl->pos*2 + 1], sound_pos_global - opl->pos);
for (; opl->pos < sound_pos_global; opl->pos++)
{
opl->filtbuf[0] = opl->buffer[opl->pos*2] = (opl->buffer[opl->pos*2] / 2);
opl->filtbuf[1] = opl->buffer[opl->pos*2+1] = (opl->buffer[opl->pos*2+1] / 2);
}
}
if (opl->pos < sound_pos_global) {
opl2_update(0, &opl->buffer[opl->pos << 1], sound_pos_global - opl->pos);
opl2_update(1, &opl->buffer2[opl->pos << 1], sound_pos_global - opl->pos);
for (; opl->pos < sound_pos_global; opl->pos++) {
opl->buffer[(opl->pos << 1) + 1] = opl->buffer2[(opl->pos << 1) + 1];
opl->filtbuf[0] = opl->buffer[opl->pos << 1] = (opl->buffer[opl->pos << 1] / 2);
opl->filtbuf[1] = opl->buffer[(opl->pos << 1) + 1] = (opl->buffer[(opl->pos << 1) + 1] / 2);
}
}
}
void opl3_update2(opl_t *opl)
void
opl3_update2(opl_t *opl)
{
if (opl->pos < sound_pos_global)
{
opl3_update(0, &opl->buffer[opl->pos*2], sound_pos_global - opl->pos);
for (; opl->pos < sound_pos_global; opl->pos++)
{
opl->filtbuf[0] = opl->buffer[opl->pos*2] = (opl->buffer[opl->pos*2] / 2);
opl->filtbuf[1] = opl->buffer[opl->pos*2+1] = (opl->buffer[opl->pos*2+1] / 2);
}
}
if (opl->pos < sound_pos_global) {
opl3_update(0, &opl->buffer[(opl->pos << 1)], sound_pos_global - opl->pos);
for (; opl->pos < sound_pos_global; opl->pos++) {
opl->filtbuf[0] = opl->buffer[opl->pos << 1] = (opl->buffer[opl->pos << 1] / 2);
opl->filtbuf[1] = opl->buffer[(opl->pos << 1) + 1] = (opl->buffer[(opl->pos << 1) + 1] / 2);
}
}
}
void ym3812_timer_set_0(void *param, int timer, uint64_t period)
{
opl_t *opl = (opl_t *)param;
if (period)
timer_set_delay_u64(&opl->timers[0][timer], period * TIMER_USEC * 20);
else
timer_disable(&opl->timers[0][timer]);
}
void ym3812_timer_set_1(void *param, int timer, uint64_t period)
{
opl_t *opl = (opl_t *)param;
if (period)
timer_set_delay_u64(&opl->timers[1][timer], period * TIMER_USEC * 20);
else
timer_disable(&opl->timers[1][timer]);
void
ym3812_timer_set_0(void *param, int timer, uint64_t period)
{
opl_t *opl = (opl_t *)param;
if (period)
timer_set_delay_u64(&opl->timers[0][timer], period * TIMER_USEC * 20);
else
timer_disable(&opl->timers[0][timer]);
}
void ymf262_timer_set(void *param, int timer, uint64_t period)
{
opl_t *opl = (opl_t *)param;
if (period)
timer_set_delay_u64(&opl->timers[0][timer], period * TIMER_USEC * 20);
else
timer_disable(&opl->timers[0][timer]);
void
ym3812_timer_set_1(void *param, int timer, uint64_t period)
{
opl_t *opl = (opl_t *)param;
if (period)
timer_set_delay_u64(&opl->timers[1][timer], period * TIMER_USEC * 20);
else
timer_disable(&opl->timers[1][timer]);
}
static void opl_timer_callback00(void *p)
void
ymf262_timer_set(void *param, int timer, uint64_t period)
{
opl_timer_over(0, 0);
}
static void opl_timer_callback01(void *p)
{
opl_timer_over(0, 1);
}
static void opl_timer_callback10(void *p)
{
opl_timer_over(1, 0);
}
static void opl_timer_callback11(void *p)
{
opl_timer_over(1, 1);
}
void opl2_init(opl_t *opl)
{
opl_init(ym3812_timer_set_0, opl, 0, 0);
opl_init(ym3812_timer_set_1, opl, 1, 0);
timer_add(&opl->timers[0][0], opl_timer_callback00, (void *)opl, 0);
timer_add(&opl->timers[0][1], opl_timer_callback01, (void *)opl, 0);
timer_add(&opl->timers[1][0], opl_timer_callback10, (void *)opl, 0);
timer_add(&opl->timers[1][1], opl_timer_callback11, (void *)opl, 0);
opl_t *opl = (opl_t *)param;
if (period)
timer_set_delay_u64(&opl->timers[0][timer], period * TIMER_USEC * 20);
else
timer_disable(&opl->timers[0][timer]);
}
void opl3_init(opl_t *opl)
static void
opl_timer_callback00(void *p)
{
opl_init(ymf262_timer_set, opl, 0, 1);
timer_add(&opl->timers[0][0], opl_timer_callback00, (void *)opl, 0);
timer_add(&opl->timers[0][1], opl_timer_callback01, (void *)opl, 0);
opl_timer_over(0, 0);
}
static void
opl_timer_callback01(void *p)
{
opl_timer_over(0, 1);
}
static void
opl_timer_callback10(void *p)
{
opl_timer_over(1, 0);
}
static void
opl_timer_callback11(void *p)
{
opl_timer_over(1, 1);
}
void
opl2_init(opl_t *opl)
{
opl_init(ym3812_timer_set_0, opl, 0, 0);
opl_init(ym3812_timer_set_1, opl, 1, 0);
timer_add(&opl->timers[0][0], opl_timer_callback00, (void *)opl, 0);
timer_add(&opl->timers[0][1], opl_timer_callback01, (void *)opl, 0);
timer_add(&opl->timers[1][0], opl_timer_callback10, (void *)opl, 0);
timer_add(&opl->timers[1][1], opl_timer_callback11, (void *)opl, 0);
}
void
opl3_init(opl_t *opl)
{
opl_init(ymf262_timer_set, opl, 0, 1);
timer_add(&opl->timers[0][0], opl_timer_callback00, (void *)opl, 0);
timer_add(&opl->timers[0][1], opl_timer_callback01, (void *)opl, 0);
}