From 4044a1d2c1cd0dc0bcf5d767b629ebbf7c7e4715 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 18 Mar 2022 03:10:28 +0800 Subject: [PATCH 1/2] unbreak hosted mode audio --- services/codec/src/backend/hostaudio.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/codec/src/backend/hostaudio.rs b/services/codec/src/backend/hostaudio.rs index 61328bf6f..5f47f3bf2 100644 --- a/services/codec/src/backend/hostaudio.rs +++ b/services/codec/src/backend/hostaudio.rs @@ -90,7 +90,7 @@ impl Codec { 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) { } } From fbf90efe0e9c983cf18853c4da156c2ee1c0d584 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 18 Mar 2022 03:21:46 +0800 Subject: [PATCH 2/2] add a broader CI target for hosted mode this will help prevent bugs slipping through where I forget to update hosted mode stubs when tweaking hardware APIs --- xtask/src/main.rs | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 4bae45272..30ef214c1 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -312,8 +312,10 @@ fn main() -> Result<(), Box> { Some("pddb-ci") => { generate_app_menus(&Vec::::new()); run(false, &hw_pkgs, Some( - &["--features", "pddb/ci", "--features", "pddb/deterministic"] - ))?}, + &["--features", "pddb/ci", "--features", "pddb/deterministic"], + ), + false, + )?}, Some("run") => { let mut args = env::args(); args.nth(1); @@ -328,7 +330,18 @@ fn main() -> Result<(), Box> { pkgs.push(app); } 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 = 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") => { let mut args = env::args(); @@ -344,7 +357,7 @@ fn main() -> Result<(), Box> { pkgs.push(app); } generate_app_menus(&apps); - run(true, &pkgs, None)? + run(true, &pkgs, None, false)? }, Some("app-image") => { let mut args = env::args(); @@ -377,7 +390,7 @@ fn main() -> Result<(), Box> { &pkgs, lkey, kkey, None, &[], None)? } 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( false, @@ -388,7 +401,7 @@ fn main() -> Result<(), Box> { 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( false, 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" }; 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(); dir.push("kernel"); - println!("Building and running kernel..."); - let status = Command::new(cargo()) - .current_dir(dir) - .args(&args) - .status()?; - if !status.success() { - return Err("cargo build failed".into()); + if !dry_run { + println!("Building and running kernel..."); + let status = Command::new(cargo()) + .current_dir(dir) + .args(&args) + .status()?; + if !status.success() { + return Err("cargo build failed".into()); + } } Ok(())