diff --git a/.gitmodules b/.gitmodules index cb2b5ae..7b6d891 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "emulator/libraries/femtos"] path = emulator/libraries/femtos url = git@github.com:transistorfet/femtos.git +[submodule "emulator/libraries/emulator-hal"] + path = emulator/libraries/emulator-hal + url = git@github.com:transistorfet/emulator-hal.git diff --git a/Cargo.lock b/Cargo.lock index d71adab..1c2f7d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -420,6 +420,10 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "emulator-hal" version = "0.1.0" +dependencies = [ + "femtos", + "fugit", +] [[package]] name = "env_logger" @@ -480,6 +484,21 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "fugit" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17186ad64927d5ac8f02c1e77ccefa08ccd9eaa314d5a4772278aa204a22f7e7" +dependencies = [ + "gcd", +] + +[[package]] +name = "gcd" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" + [[package]] name = "glob" version = "0.3.1" diff --git a/emulator/core/Cargo.toml b/emulator/core/Cargo.toml index c3cb2e7..ec434d7 100644 --- a/emulator/core/Cargo.toml +++ b/emulator/core/Cargo.toml @@ -8,4 +8,4 @@ log = "0.4" femtos = "0.1" thiserror = "1.0" moa-host = { path = "../libraries/host" } -emulator-hal = { path = "/media/work/projects/emulator-hal/emulator-hal" } +emulator-hal = { path = "../libraries/emulator-hal/emulator-hal" } diff --git a/emulator/cpus/m68k/Cargo.toml b/emulator/cpus/m68k/Cargo.toml index 483a72f..6124799 100644 --- a/emulator/cpus/m68k/Cargo.toml +++ b/emulator/cpus/m68k/Cargo.toml @@ -9,4 +9,4 @@ thiserror = "1.0" femtos = "0.1" moa-core = { path = "../../core" } moa-parsing = { path = "../../libraries/parsing" } -emulator-hal = { path = "/media/work/projects/emulator-hal/emulator-hal" } +emulator-hal = { path = "../../libraries/emulator-hal/emulator-hal" } diff --git a/emulator/cpus/z80/Cargo.toml b/emulator/cpus/z80/Cargo.toml index 0478736..29a194d 100644 --- a/emulator/cpus/z80/Cargo.toml +++ b/emulator/cpus/z80/Cargo.toml @@ -9,4 +9,4 @@ thiserror = "1.0" femtos = "0.1" moa-core = { path = "../../core" } moa-signals = { path = "../../libraries/signals" } -emulator-hal = { path = "/media/work/projects/emulator-hal/emulator-hal" } +emulator-hal = { path = "../../libraries/emulator-hal/emulator-hal" } diff --git a/emulator/libraries/emulator-hal b/emulator/libraries/emulator-hal new file mode 160000 index 0000000..84e665c --- /dev/null +++ b/emulator/libraries/emulator-hal @@ -0,0 +1 @@ +Subproject commit 84e665ce5749187d0c323f77971c288d0964fa96