From 671517aab7d58f5b48b4a291ca6c5e581f2ef04d Mon Sep 17 00:00:00 2001 From: transistor Date: Sat, 24 Feb 2024 19:16:46 -0800 Subject: [PATCH] Modified to use crates.io version of femtos --- Cargo.lock | 17 +++++++++++++++++ Cargo.toml | 1 + emulator/core/Cargo.toml | 2 +- emulator/cpus/m68k/Cargo.toml | 2 +- emulator/cpus/z80/Cargo.toml | 2 +- emulator/frontends/common/Cargo.toml | 2 +- emulator/frontends/console/Cargo.toml | 2 +- emulator/frontends/minifb/Cargo.toml | 2 +- emulator/frontends/pixels/Cargo.toml | 2 +- emulator/peripherals/generic/Cargo.toml | 2 +- emulator/peripherals/mos/Cargo.toml | 2 +- emulator/peripherals/motorola/Cargo.toml | 2 +- emulator/peripherals/yamaha/Cargo.toml | 2 +- emulator/peripherals/zilog/Cargo.toml | 2 +- emulator/systems/computie/Cargo.toml | 2 +- emulator/systems/genesis/Cargo.toml | 2 +- emulator/systems/macintosh/Cargo.toml | 2 +- emulator/systems/trs80/Cargo.toml | 2 +- tests/harte_tests/Cargo.toml | 2 +- tests/rad_tests/Cargo.toml | 2 +- 20 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52af98d..5fae6f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,6 +463,8 @@ dependencies = [ [[package]] name = "femtos" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b90ac969e2dfcc103ec34948f65290b7616edc460922bd6d33ad75f525964f7d" [[package]] name = "flate2" @@ -575,6 +577,12 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +[[package]] +name = "iz80" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e13cd358184c4b647f19a858246b82e3327ed29c2893d232f01ed016ac5d3c" + [[package]] name = "jni" version = "0.19.0" @@ -724,6 +732,15 @@ dependencies = [ "adler", ] +[[package]] +name = "moa-iz80" +version = "0.1.0" +dependencies = [ + "femtos", + "iz80", + "moa_core", +] + [[package]] name = "moa_audio" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index f78450f..cc15b72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ members = [ "emulator/frontends/common", "emulator/frontends/console", "emulator/frontends/minifb", + "emulator/cpus/moa-iz80", "tests/harte_tests", "tests/rad_tests" ] diff --git a/emulator/core/Cargo.toml b/emulator/core/Cargo.toml index 3989536..8cb1d1c 100644 --- a/emulator/core/Cargo.toml +++ b/emulator/core/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../libraries/femtos" } +femtos = "0.1" diff --git a/emulator/cpus/m68k/Cargo.toml b/emulator/cpus/m68k/Cargo.toml index b6c783b..99f2c80 100644 --- a/emulator/cpus/m68k/Cargo.toml +++ b/emulator/cpus/m68k/Cargo.toml @@ -5,6 +5,6 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_parsing = { path = "../../libraries/parsing" } diff --git a/emulator/cpus/z80/Cargo.toml b/emulator/cpus/z80/Cargo.toml index 8d7d0c6..e525715 100644 --- a/emulator/cpus/z80/Cargo.toml +++ b/emulator/cpus/z80/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } diff --git a/emulator/frontends/common/Cargo.toml b/emulator/frontends/common/Cargo.toml index e935fae..b576042 100644 --- a/emulator/frontends/common/Cargo.toml +++ b/emulator/frontends/common/Cargo.toml @@ -9,7 +9,7 @@ audio = ["cpal"] [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } nix = { version = "0.25", optional = true } diff --git a/emulator/frontends/console/Cargo.toml b/emulator/frontends/console/Cargo.toml index 6e74418..c93a305 100644 --- a/emulator/frontends/console/Cargo.toml +++ b/emulator/frontends/console/Cargo.toml @@ -8,7 +8,7 @@ default-run = "moa-computie" log = "0.4" clap = "^4" simple_logger = "^2" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_common = { path = "../common", features = ["tty"] } diff --git a/emulator/frontends/minifb/Cargo.toml b/emulator/frontends/minifb/Cargo.toml index 5b830e3..10e4f34 100644 --- a/emulator/frontends/minifb/Cargo.toml +++ b/emulator/frontends/minifb/Cargo.toml @@ -9,7 +9,7 @@ log = "0.4" minifb = "^0.19" clap = "^4" simple_logger = "^2" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_common = { path = "../common", features = ["audio"] } diff --git a/emulator/frontends/pixels/Cargo.toml b/emulator/frontends/pixels/Cargo.toml index e806d15..44766e8 100644 --- a/emulator/frontends/pixels/Cargo.toml +++ b/emulator/frontends/pixels/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" log = "0.4" pixels = "0.12" winit = "0.28" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_common = { path = "../common", features = ["audio"] } diff --git a/emulator/peripherals/generic/Cargo.toml b/emulator/peripherals/generic/Cargo.toml index 1a97b2e..1a5a3d8 100644 --- a/emulator/peripherals/generic/Cargo.toml +++ b/emulator/peripherals/generic/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } diff --git a/emulator/peripherals/mos/Cargo.toml b/emulator/peripherals/mos/Cargo.toml index 264b9de..dc21359 100644 --- a/emulator/peripherals/mos/Cargo.toml +++ b/emulator/peripherals/mos/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } diff --git a/emulator/peripherals/motorola/Cargo.toml b/emulator/peripherals/motorola/Cargo.toml index 641b854..69d1bcc 100644 --- a/emulator/peripherals/motorola/Cargo.toml +++ b/emulator/peripherals/motorola/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } diff --git a/emulator/peripherals/yamaha/Cargo.toml b/emulator/peripherals/yamaha/Cargo.toml index edcfa6f..4a611b2 100644 --- a/emulator/peripherals/yamaha/Cargo.toml +++ b/emulator/peripherals/yamaha/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] log = "^0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_audio = { path = "../../libraries/audio" } lazy_static = "1.4.0" diff --git a/emulator/peripherals/zilog/Cargo.toml b/emulator/peripherals/zilog/Cargo.toml index c49b55b..5e3b5da 100644 --- a/emulator/peripherals/zilog/Cargo.toml +++ b/emulator/peripherals/zilog/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } diff --git a/emulator/systems/computie/Cargo.toml b/emulator/systems/computie/Cargo.toml index c5d67b7..3aadfb9 100644 --- a/emulator/systems/computie/Cargo.toml +++ b/emulator/systems/computie/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_m68k = { path = "../../cpus/m68k" } moa_peripherals_generic = { path = "../../peripherals/generic" } diff --git a/emulator/systems/genesis/Cargo.toml b/emulator/systems/genesis/Cargo.toml index 27c505c..e4684cb 100644 --- a/emulator/systems/genesis/Cargo.toml +++ b/emulator/systems/genesis/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_peripherals_yamaha = { path = "../../peripherals/yamaha" } moa_m68k = { path = "../../cpus/m68k" } diff --git a/emulator/systems/macintosh/Cargo.toml b/emulator/systems/macintosh/Cargo.toml index 635bf6d..a37ae92 100644 --- a/emulator/systems/macintosh/Cargo.toml +++ b/emulator/systems/macintosh/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_m68k = { path = "../../cpus/m68k" } moa_peripherals_mos = { path = "../../peripherals/mos" } diff --git a/emulator/systems/trs80/Cargo.toml b/emulator/systems/trs80/Cargo.toml index dfc8da9..8dd4ef1 100644 --- a/emulator/systems/trs80/Cargo.toml +++ b/emulator/systems/trs80/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] log = "0.4" -femtos = { path = "../../libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../core" } moa_z80 = { path = "../../cpus/z80" } diff --git a/tests/harte_tests/Cargo.toml b/tests/harte_tests/Cargo.toml index 9a6b67f..2ba9f17 100644 --- a/tests/harte_tests/Cargo.toml +++ b/tests/harte_tests/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -femtos = { path = "../../emulator/libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../emulator/core" } moa_m68k = { path = "../../emulator/cpus/m68k" } diff --git a/tests/rad_tests/Cargo.toml b/tests/rad_tests/Cargo.toml index 82636a3..dbf44cf 100644 --- a/tests/rad_tests/Cargo.toml +++ b/tests/rad_tests/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -femtos = { path = "../../emulator/libraries/femtos" } +femtos = "0.1" moa_core = { path = "../../emulator/core" } moa_z80 = { path = "../../emulator/cpus/z80" } serde = "1.0"