From b1bd0cacf67a2fffc21ed03130b96db874fbed3a Mon Sep 17 00:00:00 2001 From: Able Date: Sun, 28 Nov 2021 23:45:23 -0600 Subject: [PATCH] Working on supporrt for relib --- ableos/Cargo.lock | 7 ------- ableos/Cargo.toml | 3 +-- ableos/src/relib/graphics/images_formats/mod.rs | 3 --- ableos/src/relib/graphics/mod.rs | 0 ableos/src/relib/image/mod.rs | 1 + ableos/src/relib/math/ciphers/mod.rs | 2 +- ableos/src/relib/mod.rs | 2 +- ableos/src/relib/security/mod.rs | 1 + 8 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 ableos/src/relib/graphics/images_formats/mod.rs delete mode 100644 ableos/src/relib/graphics/mod.rs create mode 100644 ableos/src/relib/image/mod.rs create mode 100644 ableos/src/relib/security/mod.rs diff --git a/ableos/Cargo.lock b/ableos/Cargo.lock index 7a085b90..d3d38a55 100644 --- a/ableos/Cargo.lock +++ b/ableos/Cargo.lock @@ -14,7 +14,6 @@ dependencies = [ "pic8259", "psp", "qoi_rs", - "rotcipher", "spin", "uart_16550", "volatile 0.2.7", @@ -240,12 +239,6 @@ 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 f23b08e4..30d92b75 100644 --- a/ableos/Cargo.toml +++ b/ableos/Cargo.toml @@ -17,8 +17,7 @@ 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" +qoi_rs = "*" [dependencies.wasmi] diff --git a/ableos/src/relib/graphics/images_formats/mod.rs b/ableos/src/relib/graphics/images_formats/mod.rs deleted file mode 100644 index 3e03af41..00000000 --- a/ableos/src/relib/graphics/images_formats/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index e69de29b..00000000 diff --git a/ableos/src/relib/image/mod.rs b/ableos/src/relib/image/mod.rs new file mode 100644 index 00000000..fd2938d5 --- /dev/null +++ b/ableos/src/relib/image/mod.rs @@ -0,0 +1 @@ +use qoi_rs; diff --git a/ableos/src/relib/math/ciphers/mod.rs b/ableos/src/relib/math/ciphers/mod.rs index b63a4762..8b137891 100644 --- a/ableos/src/relib/math/ciphers/mod.rs +++ b/ableos/src/relib/math/ciphers/mod.rs @@ -1 +1 @@ -pub use rotcipher; + diff --git a/ableos/src/relib/mod.rs b/ableos/src/relib/mod.rs index e185807b..3104cf57 100644 --- a/ableos/src/relib/mod.rs +++ b/ableos/src/relib/mod.rs @@ -1,4 +1,4 @@ -pub mod graphics; +pub mod image; pub mod math; pub mod time; pub struct VectorTwo { diff --git a/ableos/src/relib/security/mod.rs b/ableos/src/relib/security/mod.rs new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/ableos/src/relib/security/mod.rs @@ -0,0 +1 @@ +