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

PSG/PSSJ out of dev branch

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-09-21 18:14:17 -04:00
parent 09f8388a43
commit 28ae786d62
7 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -158,7 +158,6 @@ cmake_dependent_option(OLIVETTI "Olivetti M290"
cmake_dependent_option(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF)
cmake_dependent_option(PAS16 "Pro Audio Spectrum 16" ON "DEV_BRANCH" OFF)
cmake_dependent_option(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF)
cmake_dependent_option(TANDY_ISA "Tandy PSG ISA clone boards" ON "DEV_BRANCH" OFF)
cmake_dependent_option(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF)
cmake_dependent_option(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF)

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

@@ -102,10 +102,10 @@ extern const device_t ps1snd_device;
/* Tandy PSSJ */
extern const device_t pssj_device;
# if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
extern const device_t pssj_isa_device;
/* Tandy PSG */
extern const device_t tndy_device;
# endif
/* Creative Labs Sound Blaster */
extern const device_t sb_1_device;

4
src/sound/CMakeLists.txt
View File

@@ -117,9 +117,5 @@ if(GUSMAX)
target_compile_definitions(snd PRIVATE USE_GUSMAX)
endif()
if(TANDY_ISA)
target_compile_definitions(snd PRIVATE USE_TANDY_ISA)
endif()
add_subdirectory(resid-fp)
target_link_libraries(86Box resid-fp)

6
src/sound/snd_pssj.c
View File

@@ -208,7 +208,6 @@ pssj_1e0_init(const device_t *info)
return pssj;
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
void *
pssj_isa_init(const device_t *info)
{
@@ -225,7 +224,6 @@ pssj_isa_init(const device_t *info)
return pssj;
}
#endif
void
pssj_close(void *p)
@@ -235,7 +233,6 @@ pssj_close(void *p)
free(pssj);
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
static const device_config_t pssj_isa_config[] = {
// clang-format off
{
@@ -277,7 +274,6 @@ static const device_config_t pssj_isa_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
#endif
const device_t pssj_device = {
.name = "Tandy PSSJ",
@@ -307,7 +303,6 @@ const device_t pssj_1e0_device = {
.config = NULL
};
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
const device_t pssj_isa_device = {
.name = "Tandy PSSJ Clone",
.internal_name = "pssj_isa",
@@ -321,4 +316,3 @@ const device_t pssj_isa_device = {
.force_redraw = NULL,
.config = pssj_isa_config
};
#endif

7
src/sound/snd_sn76489.c
View File

@@ -209,6 +209,7 @@ sn76489_device_init(const device_t *info)
return sn76489;
}
void *
ncr8496_device_init(const device_t *info)
{
@@ -220,7 +221,6 @@ ncr8496_device_init(const device_t *info)
return sn76489;
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
void *
tndy_device_init(const device_t *info)
{
@@ -233,7 +233,6 @@ tndy_device_init(const device_t *info)
return sn76489;
}
#endif
void
sn76489_device_close(void *p)
@@ -243,7 +242,6 @@ sn76489_device_close(void *p)
free(sn76489);
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
static const device_config_t tndy_config[] = {
// clang-format off
{
@@ -285,7 +283,6 @@ static const device_config_t tndy_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
#endif
const device_t sn76489_device = {
.name = "TI SN74689 PSG",
@@ -315,7 +312,6 @@ const device_t ncr8496_device = {
.config = NULL
};
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
const device_t tndy_device = {
.name = "TNDY",
.internal_name = "tndy",
@@ -329,4 +325,3 @@ const device_t tndy_device = {
.force_redraw = NULL,
.config = tndy_config
};
#endif

2
src/sound/sound.c
View File

@@ -131,10 +131,8 @@ static const SOUND_CARD sound_cards[] = {
#if defined(DEV_BRANCH) && defined(USE_PAS16)
{ &pas16_device },
#endif
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
{ &pssj_isa_device },
{ &tndy_device },
#endif
{ &wss_device },
{ &adlib_mca_device },
{ &ncr_business_audio_device },

10
src/win/Makefile.mingw
View File

@@ -79,9 +79,6 @@ ifeq ($(DEV_BUILD), y)
ifndef SIO_DETECT
SIO_DETECT := y
endif
ifndef TANDY_ISA
TANDY_ISA := y
endif
ifndef VGAWONDER
VGAWONDER := y
endif
@@ -143,9 +140,6 @@ else
ifndef SIO_DETECT
SIO_DETECT := n
endif
ifndef TANDY_ISA
TANDY_ISA := n
endif
ifndef VGAWONDER
VGAWONDER := n
endif
@@ -495,10 +489,6 @@ OPTS += -DUSE_SIO_DETECT
DEVBROBJ += sio_detect.o
endif
ifeq ($(TANDY_ISA), y)
OPTS += -DUSE_TANDY_ISA
endif
ifeq ($(VGAWONDER), y)
OPTS += -DUSE_VGAWONDER
endif