joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-08 19:32:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Jonathan Campbell 2018-02-17 14:50:28 -08:00
parent 91a218589b
commit dbcdb5c127
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/Makefile.am
View File

@ -18,5 +18,5 @@ libhardware_a_SOURCES = adlib.cpp dma.cpp gameblaster.cpp hardware.cpp iohandler
snd_pc98/common/parts.c snd_pc98/generic/keydisp.c snd_pc98/sound/adpcmc.c snd_pc98/sound/adpcmg.c \
snd_pc98/sound/rhythmc.c snd_pc98/sound/sound.c snd_pc98/sound/getsnd/getwave.c snd_pc98/sound/getsnd/getsmix.c \
snd_pc98/sound/getsnd/getsnd.c snd_pc98/x11/dosio.c snd_pc98/sound/fmboard.c snd_pc98/sound/soundrom.c \
snd_pc98/cbus/board86.c snd_pc98/sound/fmtimer.c
snd_pc98/cbus/board86.c snd_pc98/sound/fmtimer.c snd_pc98/cbus/board26k.c

8
src/hardware/Makefile.in
View File

@ -139,7 +139,8 @@ am_libhardware_a_OBJECTS = adlib.$(OBJEXT) dma.$(OBJEXT) \
snd_pc98/x11/dosio.$(OBJEXT) snd_pc98/sound/fmboard.$(OBJEXT) \
snd_pc98/sound/soundrom.$(OBJEXT) \
snd_pc98/cbus/board86.$(OBJEXT) \
snd_pc98/sound/fmtimer.$(OBJEXT)
snd_pc98/sound/fmtimer.$(OBJEXT) \
snd_pc98/cbus/board26k.$(OBJEXT)
libhardware_a_OBJECTS = $(am_libhardware_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@ -377,7 +378,7 @@ libhardware_a_SOURCES = adlib.cpp dma.cpp gameblaster.cpp hardware.cpp iohandler
snd_pc98/common/parts.c snd_pc98/generic/keydisp.c snd_pc98/sound/adpcmc.c snd_pc98/sound/adpcmg.c \
snd_pc98/sound/rhythmc.c snd_pc98/sound/sound.c snd_pc98/sound/getsnd/getwave.c snd_pc98/sound/getsnd/getsmix.c \
snd_pc98/sound/getsnd/getsnd.c snd_pc98/x11/dosio.c snd_pc98/sound/fmboard.c snd_pc98/sound/soundrom.c \
snd_pc98/cbus/board86.c snd_pc98/sound/fmtimer.c
snd_pc98/cbus/board86.c snd_pc98/sound/fmtimer.c snd_pc98/cbus/board26k.c
all: all-recursive
@ -499,6 +500,8 @@ snd_pc98/cbus/board86.$(OBJEXT): snd_pc98/cbus/$(am__dirstamp) \
snd_pc98/cbus/$(DEPDIR)/$(am__dirstamp)
snd_pc98/sound/fmtimer.$(OBJEXT): snd_pc98/sound/$(am__dirstamp) \
snd_pc98/sound/$(DEPDIR)/$(am__dirstamp)
snd_pc98/cbus/board26k.$(OBJEXT): snd_pc98/cbus/$(am__dirstamp) \
snd_pc98/cbus/$(DEPDIR)/$(am__dirstamp)
libhardware.a: $(libhardware_a_OBJECTS) $(libhardware_a_DEPENDENCIES) $(EXTRA_libhardware_a_DEPENDENCIES)
$(AM_V_at)-rm -f libhardware.a
@ -573,6 +576,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/voodoo_interface.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/voodoo_opengl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/voodoo_vogl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@snd_pc98/cbus/$(DEPDIR)/board26k.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@snd_pc98/cbus/$(DEPDIR)/board86.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@snd_pc98/common/$(DEPDIR)/parts.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@snd_pc98/generic/$(DEPDIR)/keydisp.Po@am__quote@

13
src/hardware/snd_pc98/cbus/board26k.c
View File

@ -1,7 +1,8 @@
#include "compiler.h"
#include "pccore.h"
#include "iocore.h"
#include "cbuscore.h"
#include "np2glue.h"
//#include "compiler.h"
//#include "pccore.h"
//#include "iocore.h"
//#include "cbuscore.h"
#include "board26k.h"
#include "sound.h"
#include "fmboard.h"
@ -92,8 +93,8 @@ void board26k_bind(void) {
fmboard_fmrestore(0, 0);
psggen_restore(&psg1);
sound_streamregist(&opngen, (SOUNDCB)opngen_getpcm);
sound_streamregist(&psg1, (SOUNDCB)psggen_getpcm);
// sound_streamregist(&opngen, (SOUNDCB)opngen_getpcm);
// sound_streamregist(&psg1, (SOUNDCB)psggen_getpcm);
cbuscore_attachsndex(0x188 - opn.base, opn_o, opn_i);
}

4
src/hardware/snd_pc98/sound/fmboard.c
View File

@ -184,7 +184,7 @@ void fmboard_reset(const NP2CFG *pConfig, UINT32 type) {
break;
case 0x02:
// board26k_reset(pConfig);
board26k_reset(pConfig);
break;
case 0x04:
@ -245,7 +245,7 @@ void fmboard_bind(void) {
break;
case 0x02:
// board26k_bind();
board26k_bind();
break;
case 0x04: