Added the AcerMagic S20 based on the AzTech Washington, closes #859.

src/include/86box/sound.h

@@ -80,6 +80,7 @@ extern const device_t adgold_device;
 
 /* Aztech Sound Galaxy 16 */
 extern const device_t azt2316a_device;
+extern const device_t acermagic_s20_device;
 extern const device_t azt1605_device;
 
 /* Ensoniq AudioPCI */

src/sound/snd_azt2316a.c

@@ -891,12 +891,15 @@ azt_init(const device_t *info)
     azt2316a_t *azt2316a = malloc(sizeof(azt2316a_t));
     memset(azt2316a, 0, sizeof(azt2316a_t));
 
-    azt2316a->type = info->local;
+    azt2316a->type = info->local & 0x7fffffff;
 
     if (azt2316a->type == SB_SUBTYPE_CLONE_AZT1605_0X0C) {
         fn = "azt1605.nvr";
     } else if (azt2316a->type == SB_SUBTYPE_CLONE_AZT2316A_0X11) {
-        fn = "azt2316a.nvr";
+        if (info->local & 0x80000000)
+            fn = "acermagic_s20.nvr";
+        else
+            fn = "azt2316a.nvr";
     }
 
     /* config */
@@ -982,7 +985,9 @@ azt_init(const device_t *info)
         else
             fatal("AZT2316A: invalid sb irq in config word %08X\n", azt2316a->config_word);
 
-        switch (azt2316a->config_word & (3 << 6)) {
+        if (info->local & 0x80000000)
+            azt2316a->cur_dma = 1;
+        else  switch (azt2316a->config_word & (3 << 6)) {
             case 1 << 6:
                 azt2316a->cur_dma = 0;
                 break;
@@ -1112,7 +1117,10 @@ azt_init(const device_t *info)
             azt2316a->cur_wss_enabled = 0;
 
         // these are not present on the EEPROM
-        azt2316a->cur_dma     = device_get_config_int("sb_dma8"); // TODO: investigate TSR to make this work with it - there is no software configurable DMA8?
+        if (info->local & 0x80000000)
+            azt2316a->cur_dma     = 1;
+        else
+            azt2316a->cur_dma     = device_get_config_int("sb_dma8"); // TODO: investigate TSR to make this work with it - there is no software configurable DMA8?
         azt2316a->cur_wss_irq = device_get_config_int("wss_irq");
         azt2316a->cur_wss_dma = device_get_config_int("wss_dma");
         azt2316a->cur_mode    = 0;
@@ -1125,7 +1133,10 @@ azt_init(const device_t *info)
     azt2316a->wss_interrupt_after_config = device_get_config_int("wss_interrupt_after_config");
 
     /* wss part */
-    ad1848_init(&azt2316a->ad1848, device_get_config_int("codec"));
+    if (info->local & 0x80000000)
+        ad1848_init(&azt2316a->ad1848, AD1848_TYPE_CS4231);
+    else
+        ad1848_init(&azt2316a->ad1848, device_get_config_int("codec"));
 
     ad1848_setirq(&azt2316a->ad1848, azt2316a->cur_wss_irq);
     ad1848_setdma(&azt2316a->ad1848, azt2316a->cur_wss_dma);
@@ -1491,6 +1502,88 @@ static const device_config_t azt2316a_config[] = {
 // clang-format on
 };
 
+static const device_config_t acermagic_s20_config[] = {
+  // clang-format off
+    {
+        .name = "wss_interrupt_after_config",
+        .description = "Raise CODEC interrupt on CODEC setup (needed by some drivers)",
+        .type = CONFIG_BINARY,
+        .default_int = 0
+    },
+    {
+        .name = "addr",
+        .description = "SB Address",
+        .type = CONFIG_HEX16,
+        .default_string = "",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            {
+                .description = "0x220",
+                .value = 0x220
+            },
+            {
+                .description = "0x240",
+                .value = 0x240
+            },
+            {
+                .description = "Use EEPROM setting",
+                .value = 0
+            },
+            {
+                .description = ""
+            }
+        }
+    },
+    {
+        .name = "wss_irq",
+        .description = "WSS IRQ",
+        .type = CONFIG_SELECTION,
+        .selection = {
+            {
+                .description = "IRQ 11",
+                .value = 11
+            },
+            {
+                .description = "IRQ 10",
+                .value = 10
+            },
+            {
+                .description = "IRQ 7",
+                .value = 7
+            },
+            {
+                .description = ""
+            }
+        },
+        .default_int = 10
+    },
+    {
+        .name = "opl",
+        .description = "Enable OPL",
+        .type = CONFIG_BINARY,
+        .default_string = "",
+        .default_int = 1
+    },
+    {
+        .name = "receive_input",
+        .description = "Receive input (SB MIDI)",
+        .type = CONFIG_BINARY,
+        .default_string = "",
+        .default_int = 1
+    },
+    {
+        .name = "receive_input401",
+        .description = "Receive input (MPU-401)",
+        .type = CONFIG_BINARY,
+        .default_string = "",
+        .default_int = 0
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
+// clang-format on
+};
+
 const device_t azt2316a_device = {
     .name          = "Aztech Sound Galaxy Pro 16 AB (Washington)",
     .internal_name = "azt2316a",
@@ -1505,6 +1598,20 @@ const device_t azt2316a_device = {
     .config        = azt2316a_config
 };
 
+const device_t acermagic_s20_device = {
+    .name          = "AcerMagic S20",
+    .internal_name = "acermagic_s20",
+    .flags         = DEVICE_ISA | DEVICE_AT,
+    .local         = SB_SUBTYPE_CLONE_AZT2316A_0X11 | 0x80000000,
+    .init          = azt_init,
+    .close         = azt_close,
+    .reset         = NULL,
+    { .available = NULL },
+    .speed_changed = azt_speed_changed,
+    .force_redraw  = NULL,
+    .config        = acermagic_s20_config
+};
+
 const device_t azt1605_device = {
     .name          = "Aztech Sound Galaxy Nova 16 Extra (Clinton)",
     .internal_name = "azt1605",

src/sound/sound.c

@@ -109,6 +109,7 @@ static const SOUND_CARD sound_cards[] = {
     // clang-format off
     { &sound_none_device         },
     { &sound_internal_device     },
+    { &acermagic_s20_device      },
     { &adlib_device              },
     { &adgold_device             },
     { &azt2316a_device           },