Merge remote-tracking branch 'origin/master' into cdrom_changes

2025-02-14 07:40:18 +01:00
parent a96437753c 2c197000ea
commit c8d88d1dd0
40 changed files with 167 additions and 163 deletions
--- a/src/cdrom/cdrom_mitsumi.c
+++ b/src/cdrom/cdrom_mitsumi.c
@@ -459,7 +459,7 @@ mitsumi_cdrom_close(void *priv)
 const device_t mitsumi_cdrom_device = {
    .name          = "Mitsumi CD-ROM interface",
    .internal_name = "mcd",
-    .flags         = DEVICE_ISA | DEVICE_AT,
+    .flags         = DEVICE_ISA16,
    .local         = 0,
    .init          = mitsumi_cdrom_init,
    .close         = mitsumi_cdrom_close,