From d29ac66bac969ae1f48eae5ab181f9ecb531b984 Mon Sep 17 00:00:00 2001 From: Able Date: Sun, 28 Nov 2021 20:54:43 -0600 Subject: [PATCH] work on relib --- ableos/Cargo.lock | 14 ++++++++++++++ ableos/Cargo.toml | 19 +++---------------- .../src/relib/graphics/images_formats/mod.rs | 3 +++ ableos/src/relib/graphics/mod.rs | 0 ableos/src/relib/math/ciphers/mod.rs | 1 + ableos/src/relib/math/mod.rs | 1 + ableos/src/relib/mod.rs | 5 +++-- 7 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 ableos/src/relib/graphics/images_formats/mod.rs create mode 100644 ableos/src/relib/graphics/mod.rs create mode 100644 ableos/src/relib/math/ciphers/mod.rs diff --git a/ableos/Cargo.lock b/ableos/Cargo.lock index 60b24d7..7a085b9 100644 --- a/ableos/Cargo.lock +++ b/ableos/Cargo.lock @@ -13,6 +13,8 @@ dependencies = [ "lliw", "pic8259", "psp", + "qoi_rs", + "rotcipher", "spin", "uart_16550", "volatile 0.2.7", @@ -223,6 +225,12 @@ dependencies = [ "paste", ] +[[package]] +name = "qoi_rs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7ac44f12a8cec33865a699b2257e8454499fb4c3b13835710ff35c66bb65669" + [[package]] name = "quote" version = "1.0.10" @@ -232,6 +240,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rotcipher" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de32300b108f8ad8d30fb1f0d0b76fe9848488d274fa6cf0f5e022e4b609519f" + [[package]] name = "scopeguard" version = "1.1.0" diff --git a/ableos/Cargo.toml b/ableos/Cargo.toml index 1b836a3..f23b08e 100644 --- a/ableos/Cargo.toml +++ b/ableos/Cargo.toml @@ -17,32 +17,19 @@ run-args=["-serial", "stdio"] spin = "0.5.2" linked_list_allocator = "0.9.0" lliw = "0.2.0" +qoi_rs = "0.1.1" +rotcipher = "0.1.3" + [dependencies.wasmi] version = "*" default-features = false features = ["core"] - - [dependencies.lazy_static] features = ["spin_no_std"] version = "1.0" - - - -# [dependencies.rhai] -# version = "*" -# features = ["no_std"] - -# alloc required -# [dependencies.wasmi] -# version = "*" -# default-features = false -# features = ["core"] - - [target.'cfg(target_arch = "mips")'.dependencies] psp = "0.1.5" diff --git a/ableos/src/relib/graphics/images_formats/mod.rs b/ableos/src/relib/graphics/images_formats/mod.rs new file mode 100644 index 0000000..3e03af4 --- /dev/null +++ b/ableos/src/relib/graphics/images_formats/mod.rs @@ -0,0 +1,3 @@ +pub mod image; + +pub use qoi_rs as qoi; diff --git a/ableos/src/relib/graphics/mod.rs b/ableos/src/relib/graphics/mod.rs new file mode 100644 index 0000000..e69de29 diff --git a/ableos/src/relib/math/ciphers/mod.rs b/ableos/src/relib/math/ciphers/mod.rs new file mode 100644 index 0000000..b63a476 --- /dev/null +++ b/ableos/src/relib/math/ciphers/mod.rs @@ -0,0 +1 @@ +pub use rotcipher; diff --git a/ableos/src/relib/math/mod.rs b/ableos/src/relib/math/mod.rs index 63945bc..bd4b7e1 100644 --- a/ableos/src/relib/math/mod.rs +++ b/ableos/src/relib/math/mod.rs @@ -1 +1,2 @@ +pub mod ciphers; pub mod rand; diff --git a/ableos/src/relib/mod.rs b/ableos/src/relib/mod.rs index 9be1b43..e185807 100644 --- a/ableos/src/relib/mod.rs +++ b/ableos/src/relib/mod.rs @@ -1,6 +1,7 @@ +pub mod graphics; pub mod math; pub mod time; pub struct VectorTwo { - pub x: i32, - pub y: i32, + pub x: i32, + pub y: i32, }