mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
bump sha2 version number so it matches what's on crates.io (for clean patching)
This commit is contained in:
parent
8edb02ba40
commit
f0dd512d7d
3 changed files with 9 additions and 9 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -1823,7 +1823,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sha2"
|
name = "sha2"
|
||||||
version = "0.9.5"
|
version = "0.9.8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"block-buffer",
|
"block-buffer",
|
||||||
"digest",
|
"digest",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "sha2"
|
name = "sha2"
|
||||||
version = "0.9.5"
|
version = "0.9.8"
|
||||||
authors = ["bunnie <bunnie@kosagi.com>"]
|
authors = ["bunnie <bunnie@kosagi.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
description = "Sha512 hardware accelerator engine"
|
description = "Sha512 hardware accelerator engine"
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ use keyboard::RowCol;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use gam::modal::*;
|
use gam::modal::*;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
|
use core::fmt::Write;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Test {
|
pub struct Test {
|
||||||
|
|
@ -91,8 +92,6 @@ impl<'a> ShellCmdApi<'a> for Test {
|
||||||
cmd_api!(test);
|
cmd_api!(test);
|
||||||
|
|
||||||
fn process(&mut self, args: String::<1024>, env: &mut CommonEnv) -> Result<Option<String::<1024>>, xous::Error> {
|
fn process(&mut self, args: String::<1024>, env: &mut CommonEnv) -> Result<Option<String::<1024>>, xous::Error> {
|
||||||
use core::fmt::Write;
|
|
||||||
|
|
||||||
const SENTINEL: &'static str = "|TSTR";
|
const SENTINEL: &'static str = "|TSTR";
|
||||||
|
|
||||||
self.state += 1;
|
self.state += 1;
|
||||||
|
|
@ -401,13 +400,14 @@ impl<'a> ShellCmdApi<'a> for Test {
|
||||||
"oqc" => {
|
"oqc" => {
|
||||||
env.llio.wfi_override(true).unwrap();
|
env.llio.wfi_override(true).unwrap();
|
||||||
//xous::rsyscall(xous::SysCall::IncreaseHeap(65536, xous::MemoryFlags::R | xous::MemoryFlags::W)).expect("couldn't increase our heap");
|
//xous::rsyscall(xous::SysCall::IncreaseHeap(65536, xous::MemoryFlags::R | xous::MemoryFlags::W)).expect("couldn't increase our heap");
|
||||||
|
/* // temp clear so renode can run
|
||||||
ret.clear();
|
ret.clear();
|
||||||
if 0x362f093 != self.jtag.get_id().unwrap() {
|
if 0x362f093 != self.jtag.get_id().unwrap() {
|
||||||
write!(ret, "FAIL: JTAG self access").unwrap();
|
write!(ret, "FAIL: JTAG self access").unwrap();
|
||||||
return Ok(Some(ret));
|
return Ok(Some(ret));
|
||||||
}
|
}
|
||||||
env.com.set_backlight(196, 196).unwrap();
|
env.com.set_backlight(196, 196).unwrap();
|
||||||
|
*/
|
||||||
log::info!("building modal");
|
log::info!("building modal");
|
||||||
const OQC_SERVER: &str = "_OQC server_";
|
const OQC_SERVER: &str = "_OQC server_";
|
||||||
let kbdtest_sid = env.xns.register_name(OQC_SERVER, Some(1)).unwrap();
|
let kbdtest_sid = env.xns.register_name(OQC_SERVER, Some(1)).unwrap();
|
||||||
|
|
@ -417,12 +417,11 @@ impl<'a> ShellCmdApi<'a> for Test {
|
||||||
TestOp::UxGutter.to_u32().unwrap()
|
TestOp::UxGutter.to_u32().unwrap()
|
||||||
);
|
);
|
||||||
test_action.manual_dismiss = false;
|
test_action.manual_dismiss = false;
|
||||||
let mut bot_str = std::string::String::from("test");
|
|
||||||
let mut test_modal = Modal::new(
|
let mut test_modal = Modal::new(
|
||||||
"test modal",
|
"test modal",
|
||||||
ActionType::Notification(test_action),
|
ActionType::Notification(test_action),
|
||||||
Some("Keyboard Test"),
|
Some("Keyboard Test"),
|
||||||
Some(&bot_str),
|
Some("test"),
|
||||||
GlyphStyle::Small,
|
GlyphStyle::Small,
|
||||||
8
|
8
|
||||||
);
|
);
|
||||||
|
|
@ -451,6 +450,7 @@ impl<'a> ShellCmdApi<'a> for Test {
|
||||||
let mut count = 0;
|
let mut count = 0;
|
||||||
let mut remaining = populate_vectors();
|
let mut remaining = populate_vectors();
|
||||||
|
|
||||||
|
let mut bot_str = String::<1024>::new();
|
||||||
loop {
|
loop {
|
||||||
let msg = xous::receive_message(kbdtest_sid).unwrap();
|
let msg = xous::receive_message(kbdtest_sid).unwrap();
|
||||||
log::info!("got msg: {:?}", msg);
|
log::info!("got msg: {:?}", msg);
|
||||||
|
|
@ -463,13 +463,13 @@ impl<'a> ShellCmdApi<'a> for Test {
|
||||||
Some(_hit) => {
|
Some(_hit) => {
|
||||||
log::info!("got {}", map_codes(key));
|
log::info!("got {}", map_codes(key));
|
||||||
remaining.insert(key, true);
|
remaining.insert(key, true);
|
||||||
bot_str.push_str(map_codes(key));
|
write!(bot_str, "{}", map_codes(key)).unwrap();
|
||||||
},
|
},
|
||||||
None => log::warn!("got unexpected r/c: {:?}", key),
|
None => log::warn!("got unexpected r/c: {:?}", key),
|
||||||
};
|
};
|
||||||
log::info!("update modal");
|
log::info!("update modal");
|
||||||
test_modal.modify(None, None, false,
|
test_modal.modify(None, None, false,
|
||||||
Some(&bot_str), false, None);
|
Some(bot_str.as_str().unwrap()), false, None);
|
||||||
log::info!("redraw modal");
|
log::info!("redraw modal");
|
||||||
test_modal.redraw();
|
test_modal.redraw();
|
||||||
xous::yield_slice();
|
xous::yield_slice();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue