From 34d44ee9e7c725a16b3b605288e0c00f091cd765 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 4 Aug 2021 00:07:47 +0800 Subject: [PATCH] start to remove heapless and commit to libstd flow --- Cargo.lock | 1 - buildpush.bat | 11 ++++++++--- buildpush.sh | 4 ++-- services/com/Cargo.toml | 2 +- services/com/src/main.rs | 8 +++----- services/root-keys/src/implementation.rs | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16f7fdeb3..b62d05029 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -425,7 +425,6 @@ name = "com" version = "0.1.0" dependencies = [ "com_rs-ref", - "heapless 0.7.0", "log", "log-server", "num-derive", diff --git a/buildpush.bat b/buildpush.bat index 41f007c08..b2770df13 100644 --- a/buildpush.bat +++ b/buildpush.bat @@ -5,8 +5,13 @@ REM cargo xtask minimal precursors/soc.svd CertUtil -hashfile precursors/bbram-test1.nky MD5 CertUtil -hashfile precursors/soc_csr.bin MD5 -CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/loader.bin MD5 -CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/xous.img MD5 -scp -i c:/users/bunnie/.ssh/id_pi target/riscv32imac-unknown-none-elf/release/xous.img target/riscv32imac-unknown-none-elf/release/loader.bin precursors/soc_csr.bin precursors/bbram-test1.nky pi@10.0.245.90:code/precursors/ + +CertUtil -hashfile target/riscv32imac-unknown-xous-elf/release/loader.bin MD5 +CertUtil -hashfile target/riscv32imac-unknown-xous-elf/release/xous.img MD5 +scp -i c:/users/bunnie/.ssh/id_pi target/riscv32imac-unknown-xous-elf/release/xous.img target/riscv32imac-unknown-xous-elf/release/loader.bin precursors/soc_csr.bin precursors/bbram-test1.nky pi@10.0.245.90:code/precursors/ + +REM CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/loader.bin MD5 +REM CertUtil -hashfile target/riscv32imac-unknown-none-elf/release/xous.img MD5 +REM scp -i c:/users/bunnie/.ssh/id_pi target/riscv32imac-unknown-none-elf/release/xous.img target/riscv32imac-unknown-none-elf/release/loader.bin precursors/soc_csr.bin precursors/bbram-test1.nky pi@10.0.245.90:code/precursors/ REM wishbone-tool --load-name target/riscv32imac-unknown-none-elf/release/xous.img --load-address 0x980000 --load-flash diff --git a/buildpush.sh b/buildpush.sh index 9dca11736..34605f605 100755 --- a/buildpush.sh +++ b/buildpush.sh @@ -7,8 +7,8 @@ UPDATE_KERNEL=1 UPDATE_LOADER=1 USE_USB=1 FPGA_IMAGE=precursors/soc_csr.bin -KERNEL_IMAGE=target/riscv32imac-unknown-none-elf/release/xous.img -LOADER_IMAGE=target/riscv32imac-unknown-none-elf/release/loader.bin +KERNEL_IMAGE=target/riscv32imac-unknown-xous-elf/release/xous.img +LOADER_IMAGE=target/riscv32imac-unknown-xous-elf/release/loader.bin CSR_CSV= USE_IDENTITY=0 USE_NIGHTLY= diff --git a/services/com/Cargo.toml b/services/com/Cargo.toml index 6c174d5ab..505590ac2 100644 --- a/services/com/Cargo.toml +++ b/services/com/Cargo.toml @@ -7,7 +7,7 @@ version = "0.1.0" [dependencies] com_rs-ref = {path = "../../imports/com_rs-ref"} -heapless = "0.7" +#heapless = "0.7" log = "0.4" log-server = {path = "../log-server"} ticktimer-server = {path = "../ticktimer-server"} diff --git a/services/com/src/main.rs b/services/com/src/main.rs index cb23a6147..00c122cd2 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -40,15 +40,13 @@ mod implementation { use utralib::generated::*; use susres::{RegManager, RegOrField, SuspendResume}; - use heapless::Vec; - const STD_TIMEOUT: u32 = 100; pub struct XousCom { csr: utralib::CSR, susres: RegManager::<{utra::com::COM_NUMREGS}>, ticktimer: ticktimer_server::Ticktimer, - pub workqueue: Vec, + pub workqueue: Vec, busy: bool, stby_current: Option, } @@ -487,8 +485,8 @@ fn xmain() -> ! { .push(WorkRequest { work: ComState::STAT, sender: conn, - }) - .unwrap(); + }); + //.unwrap(); } } } diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index 9ebfb7766..60fba9232 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -533,7 +533,7 @@ impl RootKeys { } fn make_gateware_backup(&mut self, prog_start: u32, prog_end: u32, progress_modal: &mut Modal, progress_action: &mut Slider) { - println!("test"); + // println!("this is a test of stdlib"); } #[cfg(feature = "hazardous-debug")]