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

patches for #538
This commit is contained in:
bunnie 2024-05-12 10:06:27 +05:30 committed by GitHub
commit 4f30067244
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 18 deletions

17
Cargo.lock generated
View file

@ -1143,12 +1143,6 @@ dependencies = [
"cipher",
]
[[package]]
name = "cty"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]]
name = "curve25519-dalek"
version = "4.1.2"
@ -2884,9 +2878,9 @@ checksum = "c3c8dda44ff03a2f238717214da50f65d5a53b45cd213a7370424ffdb6fae815"
[[package]]
name = "minifb"
version = "0.23.0"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9e21c5f89bb820c7878c300c5b944e65de0f1b2a75e0be92ce670b95943740e"
checksum = "36eac3001258de903d8e8f79b91b6c03cb19214f823c01db1505ef250cb980f9"
dependencies = [
"cc",
"dlib",
@ -4010,12 +4004,9 @@ dependencies = [
[[package]]
name = "raw-window-handle"
version = "0.4.3"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
dependencies = [
"cty",
]
checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b"
[[package]]
name = "rayon"

View file

@ -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>;

View file

@ -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 = [

View file

@ -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");

View file

@ -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());