PSG/PSSJ out of dev branch

src/sound/CMakeLists.txt

@@ -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)

src/sound/snd_pssj.c

@@ -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

src/sound/snd_sn76489.c

@@ -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

src/sound/sound.c

@@ -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 },