Merge remote-tracking branch 'upstream/master' into feature/ich2

2026-02-24 02:18:20 -07:00 · 2023-02-09 17:25:26 -05:00
parent 82bf8c7c07 14eda6bd75
commit dcfeb669c0
7 changed files with 1017 additions and 344 deletions
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -138,7 +138,7 @@ int
 machine_available(int m)
 {
    int       ret;
-    device_t *d = (device_t *) machine_getdevice(m);
+    device_t *d = (device_t *) machine_get_device(m);

    bios_only = 1;

--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c