saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-08 04:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make an explicit dvt feature to simplify flags

Browse source
This commit is contained in:
bunnie 2022-12-08 17:42:12 +08:00
parent 4dd983bfc4
commit 02f9701546
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/keyboard/Cargo.toml
View file

@ -27,6 +27,7 @@ utralib = {version = "0.1.12", optional = true, default-features = false }
precursor = ["utralib/precursor"]
hosted = ["utralib/hosted"]
renode = ["utralib/renode"]
dvt = []
debugprint = []
debuginject = [] # used only if you want key injection via the UART
rawserial = []

4
services/keyboard/src/main.rs
View file

@ -741,9 +741,9 @@ fn main() -> ! {
// - status sub system (for setting the layout, autobacklight feature)
// - USB (for getting layout)
// - Preference manager
#[cfg(all(any(feature="precursor", feature="renode"), not(feature="utralib/precursor-2753c12-dvt")))]
#[cfg(all(any(feature="precursor", feature="renode"), not(feature="dvt")))]
let kbd_sid = xns.register_name(api::SERVER_NAME_KBD, Some(5)).expect("can't register server");
#[cfg(all(any(feature="precursor", feature="renode"), feature="utralib/precursor-2753c12-dvt"))] // dvt build has less in it
#[cfg(all(any(feature="precursor", feature="renode"), feature="dvt"))] // dvt build has less in it
let kbd_sid = xns.register_name(api::SERVER_NAME_KBD, Some(4)).expect("can't register server");
#[cfg(not(target_os = "xous"))]
let kbd_sid = xns.register_name(api::SERVER_NAME_KBD, Some(5)).expect("can't register server");

1
services/llio/Cargo.toml
View file

@ -41,5 +41,6 @@ debugprint = []
wfi_off = [] # useful for serial port debugging, forces power on so the UART characters can finish printing
tts = []
test-rekey = []
dvt = []
default = [] # "debugprint"
#default = ["debugprint"] # , "fccagent"

4
services/llio/src/main.rs
View file

@ -125,9 +125,9 @@ fn main() -> ! {
// - time server
// - llio
// I2C can be used to set time, which can have security implications; we are more strict on counting who can have access to this resource.
#[cfg(all(any(feature="precursor", feature="renode"), not(feature="utralib/precursor-2753c12-dvt")))]
#[cfg(all(any(feature="precursor", feature="renode"), not(feature="dvt")))]
let i2c_sid = xns.register_name(api::SERVER_NAME_I2C, Some(3)).expect("can't register I2C thread");
#[cfg(all(any(feature="precursor", feature="renode"), feature="utralib/precursor-2753c12-dvt"))] // dvt build has less in it
#[cfg(all(any(feature="precursor", feature="renode"), feature="dvt"))] // dvt build has less in it
let i2c_sid = xns.register_name(api::SERVER_NAME_I2C, Some(2)).expect("can't register I2C thread");
#[cfg(not(target_os = "xous"))]
let i2c_sid = xns.register_name(api::SERVER_NAME_I2C, Some(1)).expect("can't register I2C thread");

1
xtask/src/main.rs
View file

@ -302,6 +302,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
builder.target_precursor("2753c12-dvt")
.add_services(&services)
.add_feature("no-codec")
.add_feature("dvt")
.add_apps(&get_cratespecs());
}
Some("tts") => {