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

2026-03-02 10:48:24 -07:00 · 2023-02-09 17:37:14 -05:00
parent dda1e31f18 14eda6bd75
commit fa1e1b3638
12 changed files with 1115 additions and 500 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