start to remove heapless and commit to libstd flow

This commit is contained in:
bunnie 2021-08-04 00:07:47 +08:00
parent cabcce9ab2
commit 34d44ee9e7
6 changed files with 15 additions and 13 deletions

1
Cargo.lock generated
View file

@ -425,7 +425,6 @@ name = "com"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"com_rs-ref", "com_rs-ref",
"heapless 0.7.0",
"log", "log",
"log-server", "log-server",
"num-derive", "num-derive",

View file

@ -5,8 +5,13 @@ REM cargo xtask minimal precursors/soc.svd
CertUtil -hashfile precursors/bbram-test1.nky MD5 CertUtil -hashfile precursors/bbram-test1.nky MD5
CertUtil -hashfile precursors/soc_csr.bin 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 CertUtil -hashfile target/riscv32imac-unknown-xous-elf/release/loader.bin 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/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 REM wishbone-tool --load-name target/riscv32imac-unknown-none-elf/release/xous.img --load-address 0x980000 --load-flash

View file

@ -7,8 +7,8 @@ UPDATE_KERNEL=1
UPDATE_LOADER=1 UPDATE_LOADER=1
USE_USB=1 USE_USB=1
FPGA_IMAGE=precursors/soc_csr.bin FPGA_IMAGE=precursors/soc_csr.bin
KERNEL_IMAGE=target/riscv32imac-unknown-none-elf/release/xous.img KERNEL_IMAGE=target/riscv32imac-unknown-xous-elf/release/xous.img
LOADER_IMAGE=target/riscv32imac-unknown-none-elf/release/loader.bin LOADER_IMAGE=target/riscv32imac-unknown-xous-elf/release/loader.bin
CSR_CSV= CSR_CSV=
USE_IDENTITY=0 USE_IDENTITY=0
USE_NIGHTLY= USE_NIGHTLY=

View file

@ -7,7 +7,7 @@ version = "0.1.0"
[dependencies] [dependencies]
com_rs-ref = {path = "../../imports/com_rs-ref"} com_rs-ref = {path = "../../imports/com_rs-ref"}
heapless = "0.7" #heapless = "0.7"
log = "0.4" log = "0.4"
log-server = {path = "../log-server"} log-server = {path = "../log-server"}
ticktimer-server = {path = "../ticktimer-server"} ticktimer-server = {path = "../ticktimer-server"}

View file

@ -40,15 +40,13 @@ mod implementation {
use utralib::generated::*; use utralib::generated::*;
use susres::{RegManager, RegOrField, SuspendResume}; use susres::{RegManager, RegOrField, SuspendResume};
use heapless::Vec;
const STD_TIMEOUT: u32 = 100; const STD_TIMEOUT: u32 = 100;
pub struct XousCom { pub struct XousCom {
csr: utralib::CSR<u32>, csr: utralib::CSR<u32>,
susres: RegManager::<{utra::com::COM_NUMREGS}>, susres: RegManager::<{utra::com::COM_NUMREGS}>,
ticktimer: ticktimer_server::Ticktimer, ticktimer: ticktimer_server::Ticktimer,
pub workqueue: Vec<WorkRequest, 64>, pub workqueue: Vec<WorkRequest>,
busy: bool, busy: bool,
stby_current: Option<i16>, stby_current: Option<i16>,
} }
@ -487,8 +485,8 @@ fn xmain() -> ! {
.push(WorkRequest { .push(WorkRequest {
work: ComState::STAT, work: ComState::STAT,
sender: conn, sender: conn,
}) });
.unwrap(); //.unwrap();
} }
} }
} }

View file

@ -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) { 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")] #[cfg(feature = "hazardous-debug")]