chore: Cleanup remaining userlib namespace imports

app/lpc55xpresso/app-sprot.toml

@@ -55,7 +55,7 @@ start = true
 [tasks.update_server]
 name = "lpc55-update-server"
 priority = 3
-stacksize = 3000
+stacksize = 3200
 start = true
 sections = {bootstate = "usbsram"}
 uses = ["flash_controller", "hash_crypt"]
@@ -142,7 +142,7 @@ uses = ["flexcomm5", "iocon"]
 start = true
 stacksize = 1000
 task-slots = ["gpio_driver", "syscon_driver"]
-notifications = ["spi-irq"]
+notifications = ["spi-irq", "timer"]
 interrupts = {"flexcomm5.irq" = "spi-irq"}
 
 [tasks.swd.config]
@@ -167,6 +167,8 @@ pins = [
     # SCK
     { pin = { port = 0, pin = 7 }, alt = 3 },
     { name = "SD0_CARD_DET", pin = { port = 0, pin = 17 }, alt = 0, direction = "input" },
+    { name = "SP_TO_ROT_JTAG_DETECT_L", pin = { port = 0, pin = 20 }, alt = 0, direction = "input" },
+    { name = "ROT_TO_SP_RESET_L", pin = { port = 0, pin = 13 }, alt = 0, value = true, direction = "output", opendrain = "opendrain" },
 ]
 spi_num = 5
 
@@ -208,7 +210,7 @@ pins = [
 [tasks.attest]
 name = "task-attest"
 priority = 5
-max-sizes = {flash = 33904, ram = 16384}
+max-sizes = {flash = 34336, ram = 16384}
 stacksize = 12304
 start = true
 extern-regions = ["dice_alias", "dice_certs"]

drv/lpc55-swd/src/main.rs

@@ -70,10 +70,11 @@ use idol_runtime::{
 };
 use lpc55_pac as device;
 use ringbuf::*;
-use userlib::{
-    hl, set_timer_relative, sys_set_timer, task_slot, RecvMessage, TaskId,
-    UnwrapLite,
-};
+// use userlib::{
+//     hl, set_timer_relative, sys_set_timer, task_slot, RecvMessage, TaskId,
+//     UnwrapLite,
+// };
+use userlib::*;
 
 #[derive(Copy, Clone, PartialEq)]
 enum Trace {

drv/lpc55-syscon-api/src/lib.rs

@@ -10,7 +10,7 @@
 
 #![no_std]
 
-use userlib::*;
+use userlib::{sys_send, FromPrimitive};
 use zerocopy::AsBytes;
 
 /// Peripheral numbering.

drv/lpc55-update-server/src/main.rs

@@ -27,7 +27,10 @@ use stage0_handoff::{
     HandoffData, HandoffDataLoadError, ImageVersion, RotBootState,
     RotBootStateV2,
 };
-use userlib::*;
+use userlib::{
+    sys_irq_control, sys_recv_notification, task_slot, ImageHeader,
+    RecvMessage, UnwrapLite, CABOOSE_MAGIC, HEADER_MAGIC,
+};
 use zerocopy::{AsBytes, FromBytes};
 
 mod images;

drv/lpc55-usart/src/main.rs

@@ -20,7 +20,10 @@ use core::ops::Deref;
 use drv_lpc55_syscon_api::*;
 use lib_lpc55_usart::{Usart, Write};
 use lpc55_pac as device;
-use userlib::*;
+use userlib::{
+    sys_borrow_info, sys_borrow_read, sys_irq_control, sys_recv_open,
+    sys_reply, task_slot, LeaseAttributes, TaskId, UnwrapLite,
+};
 use zerocopy::AsBytes;
 
 task_slot!(SYSCON, syscon_driver);

drv/meanwell-api/src/lib.rs

@@ -7,7 +7,7 @@
 #![no_std]
 
 use derive_idol_err::IdolError;
-use userlib::*;
+use userlib::{sys_send, FromPrimitive};
 
 #[derive(Copy, Clone, Debug, FromPrimitive, IdolError, counters::Count)]
 pub enum MeanwellError {

drv/meanwell/src/main.rs

@@ -17,7 +17,9 @@
 use drv_meanwell_api::MeanwellError;
 use idol_runtime::NotificationHandler;
 use idol_runtime::RequestError;
-use userlib::*;
+use userlib::{
+    set_timer_relative, sys_get_timer, sys_set_timer, task_slot, RecvMessage,
+};
 
 use drv_stm32xx_sys_api as sys_api;
 

drv/medusa-seq-server/src/main.rs

@@ -14,7 +14,9 @@ use drv_medusa_seq_api::{MedusaError, RailName};
 use drv_sidecar_front_io::phy_smi::PhyOscState;
 use idol_runtime::{NotificationHandler, RequestError};
 use ringbuf::{ringbuf, ringbuf_entry};
-use userlib::*;
+use userlib::{
+    sys_get_timer, sys_set_timer, task_slot, RecvMessage, UnwrapLite,
+};
 
 task_slot!(I2C, i2c_driver);
 task_slot!(FRONT_IO, front_io);

drv/monorail-api/src/lib.rs

@@ -7,7 +7,7 @@
 use derive_idol_err::IdolError;
 use hubpack::SerializedSize;
 use serde::{Deserialize, Serialize};
-use userlib::*;
+use userlib::{sys_send, FromPrimitive, ToPrimitive};
 
 pub use vsc85xx::{
     tesla::{TeslaSerdes6gObConfig, TeslaSerdes6gPatch},

drv/onewire/src/lib.rs

@@ -12,7 +12,7 @@
 
 #![no_std]
 
-use userlib::*;
+use userlib::FromPrimitive;
 
 /// 1-wire commands.  Most devices support more commands, but these commands
 /// are supported by all devices.

drv/psc-seq-server/src/main.rs

@@ -104,7 +104,10 @@ use drv_psc_seq_api::PowerState;
 use drv_stm32xx_sys_api as sys_api;
 use sys_api::{Edge, IrqControl, OutputType, PinSet, Pull, Speed};
 use task_jefe_api::Jefe;
-use userlib::*;
+use userlib::{
+    hl, sys_get_timer, sys_recv_notification, sys_set_timer, task_slot,
+    UnwrapLite,
+};
 
 use ringbuf::{ringbuf, ringbuf_entry};
 

drv/sbrmi-api/src/lib.rs

@@ -8,7 +8,7 @@
 
 use derive_idol_err::IdolError;
 use drv_i2c_devices::sbrmi;
-use userlib::*;
+use userlib::{sys_send, FromPrimitive};
 
 #[derive(Copy, Clone, Debug, FromPrimitive, IdolError, counters::Count)]
 pub enum SbrmiError {

drv/sbrmi/src/main.rs

@@ -11,7 +11,7 @@ use drv_i2c_devices::sbrmi::{CpuidResult, Sbrmi};
 use drv_sbrmi_api::SbrmiError;
 use idol_runtime::{NotificationHandler, RequestError};
 use ringbuf::*;
-use userlib::*;
+use userlib::{task_slot, RecvMessage};
 use zerocopy::FromBytes;
 
 include!(concat!(env!("OUT_DIR"), "/i2c_config.rs"));

drv/sidecar-mainboard-i2c-emulator/src/main.rs

@@ -11,7 +11,6 @@
 
 use drv_i2c_api::*;
 use ringbuf::*;
-use userlib::*;
 
 #[derive(Copy, Clone, PartialEq)]
 enum Trace {

drv/sidecar-seq-api/src/lib.rs

@@ -19,7 +19,7 @@ pub use drv_sidecar_mainboard_controller::{
 
 use hubpack::SerializedSize;
 use serde::{Deserialize, Serialize};
-use userlib::*;
+use userlib::{sys_send, FromPrimitive};
 use zerocopy::AsBytes;
 
 #[derive(

drv/sidecar-seq-server/src/main.rs

@@ -26,7 +26,10 @@ use idol_runtime::{
     ClientError, Leased, NotificationHandler, RequestError, R, W,
 };
 use ringbuf::*;
-use userlib::*;
+use userlib::{
+    hl, sys_get_timer, sys_set_timer, task_slot, FromPrimitive, RecvMessage,
+    UnwrapLite,
+};
 
 task_slot!(I2C, i2c_driver);
 task_slot!(MAINBOARD, mainboard);

drv/sp-ctrl-api/src/lib.rs

@@ -7,7 +7,7 @@
 #![no_std]
 
 use derive_idol_err::IdolError;
-use userlib::*;
+use userlib::{sys_send, FromPrimitive};
 
 #[derive(Copy, Clone, Debug, FromPrimitive, Eq, PartialEq, IdolError)]
 #[repr(u32)]

drv/spi-api/src/lib.rs

@@ -12,7 +12,7 @@ use derive_idol_err::IdolError;
 use gateway_messages::SpiError as GwSpiError;
 use hubpack::SerializedSize;
 use serde::{Deserialize, Serialize};
-use userlib::*;
+use userlib::{sys_send, FromPrimitive};
 
 #[derive(
     Copy,

drv/stm32fx-rcc/src/main.rs

@@ -56,7 +56,7 @@ use stm32f3::stm32f303 as device;
 #[cfg(feature = "stm32f4")]
 use stm32f4::stm32f407 as device;
 
-use userlib::*;
+use userlib::{hl, FromPrimitive};
 use zerocopy::AsBytes;
 
 #[derive(FromPrimitive)]

drv/stm32fx-usart/src/main.rs

@@ -19,7 +19,7 @@ use stm32f4::stm32f407 as device;
 #[cfg(feature = "stm32f3")]
 use stm32f3::stm32f303 as device;
 
-use userlib::*;
+use userlib::{hl, sys_irq_control, task_slot, FromPrimitive, LeaseAttributes};
 use zerocopy::AsBytes;
 
 task_slot!(RCC, rcc_driver);

drv/stm32g0-usart/src/main.rs

@@ -22,7 +22,7 @@ use stm32g0::stm32g070 as device;
 #[cfg(feature = "g0b1")]
 use stm32g0::stm32g0b1 as device;
 
-use userlib::*;
+use userlib::{hl, sys_irq_control, task_slot, FromPrimitive, LeaseAttributes};
 
 task_slot!(SYS, sys);
 

drv/stm32h7-fmc-demo-server/src/main.rs

@@ -14,7 +14,7 @@ use sys_api::{Alternate, OutputType, Peripheral, Port, Pull, Speed};
 use task_net_api::{
     LargePayloadBehavior, Net, RecvError, SendError, SocketName,
 };
-use userlib::*;
+use userlib::{sys_recv_notification, task_slot, RecvMessage};
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "h743")] {

drv/stm32h7-hash-server/src/main.rs

@@ -11,7 +11,7 @@
 #![no_main]
 
 // use core::convert::TryInto;
-use userlib::*;
+use userlib::{task_slot, RecvMessage};
 
 use drv_stm32h7_hash::Hash;
 use drv_stm32xx_sys_api as sys_api;

drv/stm32h7-hash/src/lib.rs

@@ -30,7 +30,7 @@ use drv_hash_api::HashError;
 use stm32h7::stm32h753 as device;
 
 use core::mem::size_of;
-use userlib::*;
+use userlib::{hl, sys_irq_control, sys_recv_notification};
 use zerocopy::AsBytes;
 
 enum State {

drv/stm32h7-rng/src/main.rs

@@ -19,7 +19,7 @@ use stm32h7::stm32h743 as device;
 #[cfg(feature = "h753")]
 use stm32h7::stm32h753 as device;
 
-use userlib::*;
+use userlib::{hl, task_slot, RecvMessage};
 
 task_slot!(SYS, sys);
 

drv/stm32h7-spi-server-core/src/lib.rs

@@ -26,7 +26,7 @@ use stm32h7::stm32h743 as device;
 #[cfg(feature = "h753")]
 use stm32h7::stm32h753 as device;
 
-use userlib::*;
+use userlib::{sys_irq_control, sys_recv_notification, TaskId, UnwrapLite};
 
 use drv_stm32h7_spi as spi_core;
 use drv_stm32xx_sys_api as sys_api;

drv/stm32h7-spi-server/src/main.rs

@@ -17,7 +17,7 @@ use idol_runtime::{
     LeaseBufReader, LeaseBufWriter, Leased, LenLimit, NotificationHandler,
     RequestError, R, W,
 };
-use userlib::*;
+use userlib::{task_slot, RecvMessage};
 
 use drv_stm32h7_spi_server_core::SpiServerCore;
 use drv_stm32xx_sys_api as sys_api;

drv/stm32h7-sprot-server/src/main.rs

@@ -20,7 +20,10 @@ use idol_runtime::{NotificationHandler, RequestError};
 use ringbuf::*;
 use static_cell::ClaimOnceCell;
 use sys_api::IrqControl;
-use userlib::*;
+use userlib::{
+    hl, set_timer_relative, sys_get_timer, sys_recv_notification,
+    sys_set_timer, task_slot, RecvMessage, UnwrapLite,
+};
 
 cfg_if::cfg_if! {
     // Select local vs server SPI communication

drv/stm32h7-update-server/src/main.rs

@@ -21,7 +21,10 @@ use idol_runtime::{
 };
 use ringbuf::*;
 use stm32h7::stm32h753 as device;
-use userlib::*;
+use userlib::{
+    sys_irq_control, sys_recv_notification, ImageHeader, RecvMessage,
+    CABOOSE_MAGIC, HEADER_MAGIC,
+};
 use zerocopy::AsBytes;
 
 // Internally we deal with flash blocks in groups of u32 words.

drv/stm32xx-i2c-server/src/main.rs

@@ -13,7 +13,10 @@ use drv_stm32xx_sys_api::{Mode, OutputType, PinSet, Pull, Speed, Sys};
 
 use fixedmap::*;
 use ringbuf::*;
-use userlib::*;
+use userlib::{
+    hl, sys_get_timer, sys_irq_control, sys_recv_notification, sys_set_timer,
+    task_slot, FromPrimitive, LeaseAttributes,
+};
 
 task_slot!(SYS, sys);
 

drv/stm32xx-i2c/src/lib.rs

@@ -40,7 +40,7 @@ pub mod max7358;
 pub mod pca9548;
 
 use ringbuf::*;
-use userlib::*;
+use userlib::{hl, sys_irq_status, IrqStatus};
 
 use drv_stm32xx_sys_api as sys_api;
 
@@ -885,7 +885,7 @@ impl I2cController<'_> {
 
         #[rustfmt::skip]
         i2c.oar1.modify(|_, w| { w
-            .oa1en().clear_bit()                    // own-address disable 
+            .oa1en().clear_bit()                    // own-address disable
         });
 
         #[rustfmt::skip]
@@ -898,7 +898,7 @@ impl I2cController<'_> {
         i2c.cr1.modify(|_, w| { w
             .gcen().clear_bit()           // disable General Call
             .nostretch().clear_bit()      // enable clock stretching
-            .sbc().clear_bit()            // disable byte control 
+            .sbc().clear_bit()            // disable byte control
             .errie().clear_bit()          // \
             .tcie().clear_bit()           //  |
             .stopie().clear_bit()         //  | disable

drv/stm32xx-i2c/src/ltc4306.rs

@@ -8,7 +8,7 @@ use crate::*;
 use bitfield::bitfield;
 use drv_i2c_api::{ResponseCode, Segment};
 use ringbuf::*;
-use userlib::*;
+use userlib::FromPrimitive;
 
 pub struct Ltc4306;
 

drv/stm32xx-i2c/src/max7358.rs

@@ -8,7 +8,7 @@ use crate::*;
 use bitfield::bitfield;
 use drv_i2c_api::{ResponseCode, Segment};
 use ringbuf::*;
-use userlib::*;
+use userlib::FromPrimitive;
 
 pub struct Max7358;
 

drv/stm32xx-sys-api/src/lib.rs

@@ -19,7 +19,7 @@ cfg_if::cfg_if! {
 }
 
 use derive_idol_err::IdolError;
-use userlib::*;
+use userlib::{sys_send, FromPrimitive};
 use zerocopy::AsBytes;
 
 pub use drv_stm32xx_gpio_common::{