From 02f97015465522d456ccc4ae6481d6ba1bee576d Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Thu, 8 Dec 2022 17:42:12 +0800
Subject: [PATCH] make an explicit dvt feature to simplify flags

---
 services/keyboard/Cargo.toml  | 1 +
 services/keyboard/src/main.rs | 4 ++--
 services/llio/Cargo.toml      | 1 +
 services/llio/src/main.rs     | 4 ++--
 xtask/src/main.rs             | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/keyboard/Cargo.toml b/services/keyboard/Cargo.toml
index 7f5531704..21e29c687 100644
--- a/services/keyboard/Cargo.toml
+++ b/services/keyboard/Cargo.toml
@@ -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 = []
diff --git a/services/keyboard/src/main.rs b/services/keyboard/src/main.rs
index 5ab413ffe..8b0db6483 100644
--- a/services/keyboard/src/main.rs
+++ b/services/keyboard/src/main.rs
@@ -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");
diff --git a/services/llio/Cargo.toml b/services/llio/Cargo.toml
index c261074da..ddf1a25c3 100644
--- a/services/llio/Cargo.toml
+++ b/services/llio/Cargo.toml
@@ -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"
diff --git a/services/llio/src/main.rs b/services/llio/src/main.rs
index e7fb0e11b..5abbd8964 100644
--- a/services/llio/src/main.rs
+++ b/services/llio/src/main.rs
@@ -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");
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 018e32b1a..d79dd0436 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -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") => {