mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
Merge branch 'main' of github.com:betrusted-io/xous-core
This commit is contained in:
commit
00e2f6f505
2 changed files with 30 additions and 15 deletions
|
|
@ -90,7 +90,7 @@ impl Codec {
|
||||||
pub fn set_speaker_gain_db(&mut self, _gain_db: f32) {
|
pub fn set_speaker_gain_db(&mut self, _gain_db: f32) {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_headphone_gain_db(&mut self, _gain_db: f32) {
|
pub fn set_headphone_gain_db(&mut self, _gain_db_l: f32, _gain_db_r: f32) {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -312,8 +312,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
Some("pddb-ci") => {
|
Some("pddb-ci") => {
|
||||||
generate_app_menus(&Vec::<String>::new());
|
generate_app_menus(&Vec::<String>::new());
|
||||||
run(false, &hw_pkgs, Some(
|
run(false, &hw_pkgs, Some(
|
||||||
&["--features", "pddb/ci", "--features", "pddb/deterministic"]
|
&["--features", "pddb/ci", "--features", "pddb/deterministic"],
|
||||||
))?},
|
),
|
||||||
|
false,
|
||||||
|
)?},
|
||||||
Some("run") => {
|
Some("run") => {
|
||||||
let mut args = env::args();
|
let mut args = env::args();
|
||||||
args.nth(1);
|
args.nth(1);
|
||||||
|
|
@ -328,7 +330,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
pkgs.push(app);
|
pkgs.push(app);
|
||||||
}
|
}
|
||||||
generate_app_menus(&apps);
|
generate_app_menus(&apps);
|
||||||
run(false, &pkgs, None)?
|
run(false, &pkgs, None, false)?
|
||||||
|
},
|
||||||
|
Some("hosted-ci") => {
|
||||||
|
let mut pkgs = hw_pkgs.to_vec();
|
||||||
|
let mut apps: Vec<String> = args.collect();
|
||||||
|
apps.push("ball".to_string());
|
||||||
|
apps.push("repl".to_string());
|
||||||
|
for app in &apps {
|
||||||
|
pkgs.push(app);
|
||||||
|
}
|
||||||
|
generate_app_menus(&apps);
|
||||||
|
run(false, &pkgs, None, true)?
|
||||||
},
|
},
|
||||||
Some("debug") => {
|
Some("debug") => {
|
||||||
let mut args = env::args();
|
let mut args = env::args();
|
||||||
|
|
@ -344,7 +357,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
pkgs.push(app);
|
pkgs.push(app);
|
||||||
}
|
}
|
||||||
generate_app_menus(&apps);
|
generate_app_menus(&apps);
|
||||||
run(true, &pkgs, None)?
|
run(true, &pkgs, None, false)?
|
||||||
},
|
},
|
||||||
Some("app-image") => {
|
Some("app-image") => {
|
||||||
let mut args = env::args();
|
let mut args = env::args();
|
||||||
|
|
@ -377,7 +390,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
&pkgs, lkey, kkey, None, &[], None)?
|
&pkgs, lkey, kkey, None, &[], None)?
|
||||||
}
|
}
|
||||||
Some("gfx-dev") => {
|
Some("gfx-dev") => {
|
||||||
run(true, &gfx_dev_pkgs, Some(&["--features", "graphics-server/testing"]))?
|
run(true, &gfx_dev_pkgs, Some(&["--features", "graphics-server/testing"]), false)?
|
||||||
}
|
}
|
||||||
Some("pddb-dev") => build_hw_image(
|
Some("pddb-dev") => build_hw_image(
|
||||||
false,
|
false,
|
||||||
|
|
@ -388,7 +401,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
None,
|
None,
|
||||||
&[], None,
|
&[], None,
|
||||||
)?,
|
)?,
|
||||||
Some("pddb-hosted") => run(false, &pddb_dev_pkgs, None)?,
|
Some("pddb-hosted") => run(false, &pddb_dev_pkgs, None, false)?,
|
||||||
Some("benchmark") => build_hw_image(
|
Some("benchmark") => build_hw_image(
|
||||||
false,
|
false,
|
||||||
env::args().nth(2),
|
env::args().nth(2),
|
||||||
|
|
@ -829,7 +842,7 @@ fn renode_image(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run(debug: bool, init: &[&str], features: Option<&[&str]>) -> Result<(), DynError> {
|
fn run(debug: bool, init: &[&str], features: Option<&[&str]>, dry_run: bool) -> Result<(), DynError> {
|
||||||
let stream = if debug { "debug" } else { "release" };
|
let stream = if debug { "debug" } else { "release" };
|
||||||
|
|
||||||
build(init, debug, None, None, None, features)?;
|
build(init, debug, None, None, None, features)?;
|
||||||
|
|
@ -860,13 +873,15 @@ fn run(debug: bool, init: &[&str], features: Option<&[&str]>) -> Result<(), DynE
|
||||||
let mut dir = project_root();
|
let mut dir = project_root();
|
||||||
dir.push("kernel");
|
dir.push("kernel");
|
||||||
|
|
||||||
println!("Building and running kernel...");
|
if !dry_run {
|
||||||
let status = Command::new(cargo())
|
println!("Building and running kernel...");
|
||||||
.current_dir(dir)
|
let status = Command::new(cargo())
|
||||||
.args(&args)
|
.current_dir(dir)
|
||||||
.status()?;
|
.args(&args)
|
||||||
if !status.success() {
|
.status()?;
|
||||||
return Err("cargo build failed".into());
|
if !status.success() {
|
||||||
|
return Err("cargo build failed".into());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue