80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Reverted the LPT DAC and DSS changes.

Browse Source
This commit is contained in:
OBattler
2024-05-03 19:06:31 +02:00
parent 907daed3b1
commit 93ffbdee51
2 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/sound/snd_lpt_dac.c
View File

@@ -5,14 +5,12 @@
#include <wchar.h> #include <wchar.h>
#include "cpu.h" #include "cpu.h"
#include <specstrings.h>
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/filters.h> #include <86box/filters.h>
#include <86box/timer.h>
#include <86box/lpt.h> #include <86box/lpt.h>
#include <86box/machine.h> #include <86box/machine.h>
#include <86box/sound.h> #include <86box/sound.h>
#include <86box/timer.h>
#include <86box/plat_unused.h> #include <86box/plat_unused.h>
typedef struct lpt_dac_t { typedef struct lpt_dac_t {
@@ -52,14 +50,6 @@ dac_write_data(uint8_t val, void *priv)
dac_update(lpt_dac); dac_update(lpt_dac);
} }
static void
dac_strobe(uint8_t old, uint8_t val, void *priv)
{
lpt_dac_t *lpt_dac = (lpt_dac_t *) priv;
lpt_dac->channel = val;
}
static void static void
dac_write_ctrl(uint8_t val, void *priv) dac_write_ctrl(uint8_t val, void *priv)
{ {
@@ -120,31 +110,25 @@ dac_close(void *priv)
} }
const lpt_device_t lpt_dac_device = { const lpt_device_t lpt_dac_device = {
.name = "LPT DAC / Covox Speech Thing", .name = "LPT DAC / Covox Speech Thing",
.internal_name = "lpt_dac", .internal_name = "lpt_dac",
.init = dac_init, .init = dac_init,
.close = dac_close, .close = dac_close,
.write_data = dac_write_data, .write_data = dac_write_data,
.write_ctrl = dac_write_ctrl, .write_ctrl = dac_write_ctrl,
.autofeed = NULL, .read_data = NULL,
.strobe = dac_strobe, .read_status = dac_read_status,
.read_status = dac_read_status, .read_ctrl = NULL
.read_ctrl = NULL,
.epp_write_data = NULL,
.epp_request_read = NULL
}; };
const lpt_device_t lpt_dac_stereo_device = { const lpt_device_t lpt_dac_stereo_device = {
.name = "Stereo LPT DAC", .name = "Stereo LPT DAC",
.internal_name = "lpt_dac_stereo", .internal_name = "lpt_dac_stereo",
.init = dac_stereo_init, .init = dac_stereo_init,
.close = dac_close, .close = dac_close,
.write_data = dac_write_data, .write_data = dac_write_data,
.write_ctrl = dac_write_ctrl, .write_ctrl = dac_write_ctrl,
.autofeed = NULL, .read_data = NULL,
.strobe = dac_strobe, .read_status = dac_read_status,
.read_status = dac_read_status, .read_ctrl = NULL
.read_ctrl = NULL,
.epp_write_data = NULL,
.epp_request_read = NULL
}; };

23
src/sound/snd_lpt_dss.c
View File

@@ -7,10 +7,10 @@
#include "cpu.h" #include "cpu.h"
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/filters.h> #include <86box/filters.h>
#include <86box/timer.h>
#include <86box/lpt.h> #include <86box/lpt.h>
#include <86box/machine.h> #include <86box/machine.h>
#include <86box/sound.h> #include <86box/sound.h>
#include <86box/timer.h>
#include <86box/plat_unused.h> #include <86box/plat_unused.h>
typedef struct dss_t { typedef struct dss_t {
@@ -134,16 +134,13 @@ dss_close(void *priv)
} }
const lpt_device_t dss_device = { const lpt_device_t dss_device = {
.name = "Disney Sound Source", .name = "Disney Sound Source",
.internal_name = "dss", .internal_name = "dss",
.init = dss_init, .init = dss_init,
.close = dss_close, .close = dss_close,
.write_data = dss_write_data, .write_data = dss_write_data,
.autofeed = NULL, .write_ctrl = dss_write_ctrl,
.strobe = NULL, .read_data = NULL,
.write_ctrl = dss_write_ctrl, .read_status = dss_read_status,
.read_status = dss_read_status, .read_ctrl = NULL
.read_ctrl = NULL,
.epp_write_data = NULL,
.epp_request_read = NULL
}; };