Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

2021-10-26 01:59:08 +02:00
parent 77d73ed3c2 10c571c6c6
commit bad67c4f4d
13 changed files with 560 additions and 323 deletions
--- a/src/sound/snd_cms.c
+++ b/src/sound/snd_cms.c
@@ -207,7 +207,7 @@ static const device_config_t cms_config[] =
 const device_t cms_device =
 {
        "Creative Music System / Game Blaster",
-        0, 0,
+        DEVICE_ISA, 0,
        cms_init, cms_close, NULL,
        { NULL }, NULL, NULL,
        cms_config
--- a/src/sound/snd_gus.c
+++ b/src/sound/snd_gus.c
@@ -1315,7 +1315,7 @@ static const device_config_t gus_config[] = {
 const device_t gus_device =
 {
        "Gravis UltraSound",
-        DEVICE_ISA,
+        DEVICE_ISA | DEVICE_AT,
 	0,
        gus_init, gus_close, NULL,
 	{ NULL },
--- a/src/sound/snd_ssi2001.c
+++ b/src/sound/snd_ssi2001.c
@@ -118,7 +118,7 @@ static const device_config_t ssi2001_config[] =
 const device_t ssi2001_device =
 {
        "Innovation SSI-2001",
-        0, 0,
+        DEVICE_ISA, 0,
        ssi2001_init, ssi2001_close, NULL,
 	{ NULL }, NULL, NULL,
        ssi2001_config