Merge branch '86Box:master' into machine_23

2024-01-27 09:34:42 +01:00
parent 0e43058923 65a4ef6ae3
commit fc834decb9
30 changed files with 815 additions and 597 deletions
--- a/src/machine/m_at_socket7.c
+++ b/src/machine/m_at_socket7.c
@@ -1240,11 +1240,11 @@ machine_at_ms5146_init(const machine_t *model)
 }

 int
-machine_at_cb52x_si_init(const machine_t *model)
+machine_at_cb52xsi_init(const machine_t *model)
 {
    int ret;

-    ret = bios_load_linear("roms/machines/cb52x_si/CD5205S.ROM",
+    ret = bios_load_linear("roms/machines/cb52xsi/CD5205S.ROM",
                           0x000e0000, 131072, 0);

    if (bios_only || !ret)