Merge pull request #539 from betrusted-io/issue-538

patches for #538
betrusted-io · May 12, 2024 · 4f30067 · 4f30067
2 parents fe7ee95 + 65caa55
commit 4f30067
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kernel/src/io.rs b/kernel/src/io.rs
@@ -2,12 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /// A trait for serial like drivers which are byte-oriented sinks.
+#[allow(dead_code)]
 pub trait SerialWrite {
     /// Write a single byte.
     fn putc(&mut self, b: u8);
 }
 
 /// A trait for serial like drivers which allows reading from a source.
+#[allow(dead_code)]
 pub trait SerialRead {
     /// Read a single byte.
     fn getc(&mut self) -> Option<u8>;

diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml
@@ -33,7 +33,7 @@ cramium-hal = { path = "../../libs/cramium-hal", optional = true, features = [
 ] }
 
 [target.'cfg(any(windows,unix))'.dependencies]
-minifb = "0.23.0"
+minifb = "0.26.0"
 
 [features]
 cramium-soc = [

diff --git a/services/graphics-server/src/backend/minifb.rs b/services/graphics-server/src/backend/minifb.rs
@@ -16,7 +16,7 @@ pub const FB_WIDTH_PIXELS: usize = WIDTH as usize;
 pub const FB_LINES: usize = HEIGHT as usize;
 pub const FB_SIZE: usize = WIDTH_WORDS * HEIGHT as usize; // 44 bytes by 536 lines
 
-const MAX_FPS: u64 = 60;
+const MAX_FPS: usize = 60;
 const DARK_COLOUR: u32 = 0xB5B5AD;
 const LIGHT_COLOUR: u32 = 0x1B1B19;
 
@@ -166,7 +166,7 @@ impl MinifbThread {
         });
 
         // Limit the maximum update rate
-        window.limit_update_rate(Some(std::time::Duration::from_micros(1000 * 1000 / MAX_FPS)));
+        window.set_target_fps(MAX_FPS);
 
         let xns = xous_names::XousNames::new().unwrap();
         let kbd = keyboard::Keyboard::new(&xns).expect("GFX|hosted can't connect to KBD for emulation");

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -98,7 +98,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             // security
             "root-keys",
             "trng",
-            "sha2@0.10.8",
+            "sha2",
             // "engine-25519",
             "jtag",
             // GUI front end
@@ -305,7 +305,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .add_services(&user_pkgs)
                 .add_feature("pddbtest")
                 .add_feature("ditherpunk")
-                .add_feature("tracking-alloc")
                 .add_feature("tls")
                 // .add_feature("test-rekey")
                 .add_apps(&get_cratespecs());