From 7badf908d5e3f045ae1f12da16502dc8961c824e Mon Sep 17 00:00:00 2001 From: Aapo Alasuutari Date: Fri, 23 Aug 2024 22:53:47 +0300 Subject: [PATCH 1/5] Remove the rest of userlib namespace imports --- drv/lpc55-update-server/src/main.rs | 5 ++++- drv/lpc55-usart/src/main.rs | 5 ++++- drv/meanwell-api/src/lib.rs | 2 +- drv/meanwell/src/main.rs | 4 +++- drv/medusa-seq-server/src/main.rs | 4 +++- drv/monorail-api/src/lib.rs | 2 +- drv/onewire/src/lib.rs | 2 +- drv/psc-seq-server/src/main.rs | 5 ++++- drv/sbrmi-api/src/lib.rs | 2 +- drv/sbrmi/src/main.rs | 2 +- drv/sidecar-mainboard-i2c-emulator/src/main.rs | 1 - drv/sidecar-seq-api/src/lib.rs | 2 +- drv/sidecar-seq-server/src/main.rs | 5 ++++- drv/sp-ctrl-api/src/lib.rs | 2 +- drv/spi-api/src/lib.rs | 2 +- drv/stm32fx-rcc/src/main.rs | 2 +- drv/stm32fx-usart/src/main.rs | 2 +- drv/stm32g0-usart/src/main.rs | 2 +- drv/stm32h7-fmc-demo-server/src/main.rs | 2 +- drv/stm32h7-hash-server/src/main.rs | 2 +- drv/stm32h7-hash/src/lib.rs | 2 +- drv/stm32h7-rng/src/main.rs | 2 +- drv/stm32h7-spi-server-core/src/lib.rs | 2 +- drv/stm32h7-spi-server/src/main.rs | 2 +- drv/stm32h7-sprot-server/src/main.rs | 5 ++++- drv/stm32h7-update-server/src/main.rs | 5 ++++- drv/stm32xx-i2c-server/src/main.rs | 5 ++++- drv/stm32xx-i2c/src/lib.rs | 6 +++--- drv/stm32xx-i2c/src/ltc4306.rs | 2 +- drv/stm32xx-i2c/src/max7358.rs | 2 +- drv/stm32xx-sys-api/src/lib.rs | 2 +- drv/stm32xx-sys/src/main.rs | 8 +++++--- drv/user-leds-api/src/lib.rs | 2 +- drv/user-leds/src/main.rs | 7 ++++++- task/caboose-reader/src/main.rs | 2 +- task/control-plane-agent-api/src/lib.rs | 2 +- task/dump-agent-api/src/lib.rs | 2 +- task/dump-agent/src/main.rs | 2 +- task/dump-agent/src/udp.rs | 2 +- task/dumper-api/src/lib.rs | 2 +- task/dumper/src/main.rs | 2 +- task/gimlet-inspector/src/main.rs | 2 +- task/hiffy/src/lpc55.rs | 2 +- task/hiffy/src/main.rs | 2 +- task/hiffy/src/stm32g0.rs | 2 +- task/hiffy/src/stm32h7.rs | 2 +- task/host-sp-comms-api/src/lib.rs | 2 +- task/jefe-api/src/lib.rs | 2 +- task/monorail-server/src/main.rs | 2 +- task/net-api/src/lib.rs | 2 +- task/net/src/main.rs | 2 +- task/nucleo-user-button/src/main.rs | 2 +- task/packrat-api/src/lib.rs | 2 +- task/ping/src/main.rs | 2 +- task/pong/src/main.rs | 2 +- task/power/src/main.rs | 7 +++++-- task/sensor-api/src/lib.rs | 3 +-- task/sensor-polling/src/main.rs | 2 +- task/sensor/src/main.rs | 2 +- task/sp_measure/src/main.rs | 2 +- task/template/src/main.rs | 2 +- task/thermal/src/main.rs | 6 ++++-- task/uartecho/src/main.rs | 2 +- task/udpbroadcast/src/main.rs | 2 +- task/udpecho/src/main.rs | 2 +- task/udprpc/src/main.rs | 5 ++++- task/validate-api/src/lib.rs | 2 +- task/validate/src/main.rs | 2 +- task/vpd-api/src/lib.rs | 2 +- task/vpd/src/main.rs | 2 +- 70 files changed, 115 insertions(+), 77 deletions(-) diff --git a/drv/lpc55-update-server/src/main.rs b/drv/lpc55-update-server/src/main.rs index 7e013d63fb..7562bbc881 100644 --- a/drv/lpc55-update-server/src/main.rs +++ b/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; diff --git a/drv/lpc55-usart/src/main.rs b/drv/lpc55-usart/src/main.rs index 50cca3bd15..8c5869c28b 100644 --- a/drv/lpc55-usart/src/main.rs +++ b/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); diff --git a/drv/meanwell-api/src/lib.rs b/drv/meanwell-api/src/lib.rs index c9d0e7c85a..89c41ec862 100644 --- a/drv/meanwell-api/src/lib.rs +++ b/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 { diff --git a/drv/meanwell/src/main.rs b/drv/meanwell/src/main.rs index 1342573392..787aef5b11 100644 --- a/drv/meanwell/src/main.rs +++ b/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; diff --git a/drv/medusa-seq-server/src/main.rs b/drv/medusa-seq-server/src/main.rs index dac64e3423..df98feb241 100644 --- a/drv/medusa-seq-server/src/main.rs +++ b/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); diff --git a/drv/monorail-api/src/lib.rs b/drv/monorail-api/src/lib.rs index e43ca3b88e..726d54d063 100644 --- a/drv/monorail-api/src/lib.rs +++ b/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}, diff --git a/drv/onewire/src/lib.rs b/drv/onewire/src/lib.rs index 4e0c6a9b0a..0a851d4c2e 100644 --- a/drv/onewire/src/lib.rs +++ b/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. diff --git a/drv/psc-seq-server/src/main.rs b/drv/psc-seq-server/src/main.rs index 1b082216fb..5194d98d7b 100644 --- a/drv/psc-seq-server/src/main.rs +++ b/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}; diff --git a/drv/sbrmi-api/src/lib.rs b/drv/sbrmi-api/src/lib.rs index f8f4353b27..e37b647f97 100644 --- a/drv/sbrmi-api/src/lib.rs +++ b/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 { diff --git a/drv/sbrmi/src/main.rs b/drv/sbrmi/src/main.rs index cc089f3047..3fc751f4d6 100644 --- a/drv/sbrmi/src/main.rs +++ b/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")); diff --git a/drv/sidecar-mainboard-i2c-emulator/src/main.rs b/drv/sidecar-mainboard-i2c-emulator/src/main.rs index bff7026759..47c3975882 100644 --- a/drv/sidecar-mainboard-i2c-emulator/src/main.rs +++ b/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 { diff --git a/drv/sidecar-seq-api/src/lib.rs b/drv/sidecar-seq-api/src/lib.rs index df5de90777..23a6176def 100644 --- a/drv/sidecar-seq-api/src/lib.rs +++ b/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( diff --git a/drv/sidecar-seq-server/src/main.rs b/drv/sidecar-seq-server/src/main.rs index d2424d3d40..53bd5ce105 100644 --- a/drv/sidecar-seq-server/src/main.rs +++ b/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); diff --git a/drv/sp-ctrl-api/src/lib.rs b/drv/sp-ctrl-api/src/lib.rs index 9b948dc8bc..bcb8eb4e38 100644 --- a/drv/sp-ctrl-api/src/lib.rs +++ b/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)] diff --git a/drv/spi-api/src/lib.rs b/drv/spi-api/src/lib.rs index 5ac81bd488..0230fc6d77 100644 --- a/drv/spi-api/src/lib.rs +++ b/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, diff --git a/drv/stm32fx-rcc/src/main.rs b/drv/stm32fx-rcc/src/main.rs index 2f04977876..02db2beec1 100644 --- a/drv/stm32fx-rcc/src/main.rs +++ b/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)] diff --git a/drv/stm32fx-usart/src/main.rs b/drv/stm32fx-usart/src/main.rs index d0e8019008..953aa4c352 100644 --- a/drv/stm32fx-usart/src/main.rs +++ b/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); diff --git a/drv/stm32g0-usart/src/main.rs b/drv/stm32g0-usart/src/main.rs index 4b17baa3a6..8a8f08ea0d 100644 --- a/drv/stm32g0-usart/src/main.rs +++ b/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); diff --git a/drv/stm32h7-fmc-demo-server/src/main.rs b/drv/stm32h7-fmc-demo-server/src/main.rs index 95a5f8a95c..dfda6a36a0 100644 --- a/drv/stm32h7-fmc-demo-server/src/main.rs +++ b/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")] { diff --git a/drv/stm32h7-hash-server/src/main.rs b/drv/stm32h7-hash-server/src/main.rs index 009cdf0b39..0a9c1734cc 100644 --- a/drv/stm32h7-hash-server/src/main.rs +++ b/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; diff --git a/drv/stm32h7-hash/src/lib.rs b/drv/stm32h7-hash/src/lib.rs index c67d136834..0ae6591dec 100644 --- a/drv/stm32h7-hash/src/lib.rs +++ b/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 { diff --git a/drv/stm32h7-rng/src/main.rs b/drv/stm32h7-rng/src/main.rs index 074b4c862a..6dc554de0c 100644 --- a/drv/stm32h7-rng/src/main.rs +++ b/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); diff --git a/drv/stm32h7-spi-server-core/src/lib.rs b/drv/stm32h7-spi-server-core/src/lib.rs index caef849dbe..cb4af54458 100644 --- a/drv/stm32h7-spi-server-core/src/lib.rs +++ b/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; diff --git a/drv/stm32h7-spi-server/src/main.rs b/drv/stm32h7-spi-server/src/main.rs index 83a8df3583..b8e4d94d12 100644 --- a/drv/stm32h7-spi-server/src/main.rs +++ b/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; diff --git a/drv/stm32h7-sprot-server/src/main.rs b/drv/stm32h7-sprot-server/src/main.rs index 036fdeee1d..1bebd69bb1 100644 --- a/drv/stm32h7-sprot-server/src/main.rs +++ b/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 diff --git a/drv/stm32h7-update-server/src/main.rs b/drv/stm32h7-update-server/src/main.rs index ce7a73fead..db11e23f9a 100644 --- a/drv/stm32h7-update-server/src/main.rs +++ b/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. diff --git a/drv/stm32xx-i2c-server/src/main.rs b/drv/stm32xx-i2c-server/src/main.rs index 5073c77505..1f968d05c9 100644 --- a/drv/stm32xx-i2c-server/src/main.rs +++ b/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); diff --git a/drv/stm32xx-i2c/src/lib.rs b/drv/stm32xx-i2c/src/lib.rs index 19e81957b4..c18ae3be9a 100644 --- a/drv/stm32xx-i2c/src/lib.rs +++ b/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 diff --git a/drv/stm32xx-i2c/src/ltc4306.rs b/drv/stm32xx-i2c/src/ltc4306.rs index 82f38b64f3..cf9eaed338 100644 --- a/drv/stm32xx-i2c/src/ltc4306.rs +++ b/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; diff --git a/drv/stm32xx-i2c/src/max7358.rs b/drv/stm32xx-i2c/src/max7358.rs index 7822342d23..3216c72a21 100644 --- a/drv/stm32xx-i2c/src/max7358.rs +++ b/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; diff --git a/drv/stm32xx-sys-api/src/lib.rs b/drv/stm32xx-sys-api/src/lib.rs index 5931eb2301..344a87b2f6 100644 --- a/drv/stm32xx-sys-api/src/lib.rs +++ b/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::{ diff --git a/drv/stm32xx-sys/src/main.rs b/drv/stm32xx-sys/src/main.rs index 8e7849c9fb..47cc621fd8 100644 --- a/drv/stm32xx-sys/src/main.rs +++ b/drv/stm32xx-sys/src/main.rs @@ -186,7 +186,7 @@ //! ```rust,no-run //! # mod notifications { pub const MY_GPIO_NOTIFICATION_MASK: u32 = 1 << 0; } //! use drv_stm32xx_sys_api::{PinSet, Port, Pull}; -//! use userlib::*; +//! use userlib::task_slot; //! //! task_slot!(SYS, sys); //! @@ -229,7 +229,7 @@ //! # fn handle_interrupt() {} //! # mod notifications { pub const MY_GPIO_NOTIFICATION_MASK: u32 = 1 << 0; } //! use drv_stm32xx_sys_api::{PinSet, Port, Pull, Edge, IrqControl}; -//! use userlib::*; +//! use userlib::{sys_recv_notification, task_slot}; //! //! task_slot!(SYS, sys); //! @@ -326,7 +326,9 @@ use idol_runtime::{ClientError, NotificationHandler, RequestError}; #[cfg(not(feature = "test"))] use task_jefe_api::{Jefe, ResetReason}; -use userlib::*; +#[cfg(feature = "exti")] +use userlib::{sys_irq_control, sys_post, sys_refresh_task_id, TaskId}; +use userlib::{task_slot, FromPrimitive, RecvMessage}; #[cfg(not(feature = "test"))] task_slot!(JEFE, jefe); diff --git a/drv/user-leds-api/src/lib.rs b/drv/user-leds-api/src/lib.rs index 4125ce2866..c10df81567 100644 --- a/drv/user-leds-api/src/lib.rs +++ b/drv/user-leds-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 LedError { diff --git a/drv/user-leds/src/main.rs b/drv/user-leds/src/main.rs index 549fac5ea7..b2783ea581 100644 --- a/drv/user-leds/src/main.rs +++ b/drv/user-leds/src/main.rs @@ -39,7 +39,7 @@ use drv_user_leds_api::LedError; use enum_map::EnumMap; use idol_runtime::RequestError; -use userlib::*; +use userlib::{set_timer_relative, task_slot, FromPrimitive, RecvMessage}; task_config::optional_task_config! { blink_at_start: &'static [Led], @@ -417,6 +417,8 @@ fn led_off(led: Led) { #[cfg(feature = "stm32g0")] fn led_toggle(led: Led) { + use userlib::UnwrapLite; + use drv_stm32xx_sys_api::*; let sys = SYS.get_task_id(); @@ -567,6 +569,7 @@ fn led_off(led: Led) { #[cfg(feature = "stm32h7")] fn led_toggle(led: Led) { use drv_stm32xx_sys_api::*; + use userlib::UnwrapLite; let sys = SYS.get_task_id(); let sys = Sys::from(sys); @@ -668,6 +671,8 @@ fn led_off(led: Led) { #[cfg(feature = "lpc55")] fn led_toggle(led: Led) { + use userlib::UnwrapLite; + let gpio_driver = GPIO.get_task_id(); let gpio_driver = drv_lpc55_gpio_api::Pins::from(gpio_driver); diff --git a/task/caboose-reader/src/main.rs b/task/caboose-reader/src/main.rs index ed534a3845..cddde398fe 100644 --- a/task/caboose-reader/src/main.rs +++ b/task/caboose-reader/src/main.rs @@ -7,7 +7,7 @@ use drv_caboose::{CabooseError, CabooseReader}; use idol_runtime::{ClientError, Leased, NotificationHandler, RequestError, W}; -use userlib::*; +use userlib::RecvMessage; #[export_name = "main"] fn main() -> ! { diff --git a/task/control-plane-agent-api/src/lib.rs b/task/control-plane-agent-api/src/lib.rs index 955982b65c..d03326beaa 100644 --- a/task/control-plane-agent-api/src/lib.rs +++ b/task/control-plane-agent-api/src/lib.rs @@ -8,7 +8,7 @@ use derive_idol_err::IdolError; use serde::{Deserialize, Serialize}; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; pub use host_sp_messages::HostStartupOptions; pub use oxide_barcode::ParseError as BarcodeParseError; diff --git a/task/dump-agent-api/src/lib.rs b/task/dump-agent-api/src/lib.rs index f025792d03..3fb7f04bd5 100644 --- a/task/dump-agent-api/src/lib.rs +++ b/task/dump-agent-api/src/lib.rs @@ -8,7 +8,7 @@ use derive_idol_err::IdolError; use dumper_api::DumperError; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; pub use humpty::*; diff --git a/task/dump-agent/src/main.rs b/task/dump-agent/src/main.rs index dc16f2bfbe..1e2acf0fc9 100644 --- a/task/dump-agent/src/main.rs +++ b/task/dump-agent/src/main.rs @@ -12,7 +12,7 @@ use idol_runtime::RequestError; use ringbuf::*; use static_assertions::const_assert; use task_jefe_api::Jefe; -use userlib::*; +use userlib::{task_slot, RecvMessage}; #[cfg(feature = "net")] mod udp; diff --git a/task/dump-agent/src/udp.rs b/task/dump-agent/src/udp.rs index c180168758..569034327e 100644 --- a/task/dump-agent/src/udp.rs +++ b/task/dump-agent/src/udp.rs @@ -8,7 +8,7 @@ use ringbuf::*; use task_net_api::{ LargePayloadBehavior, RecvError, SendError, SocketName, UdpMetadata, }; -use userlib::*; +use userlib::kipc; static_assertions::const_assert_eq!( DUMP_READ_SIZE, diff --git a/task/dumper-api/src/lib.rs b/task/dumper-api/src/lib.rs index 55d7fa8cb8..6d21dde89b 100644 --- a/task/dumper-api/src/lib.rs +++ b/task/dumper-api/src/lib.rs @@ -9,7 +9,7 @@ use derive_idol_err::IdolError; use hubpack::SerializedSize; use serde::{Deserialize, Serialize}; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; /// /// These constitute an interface between the RoT and the SP in that the diff --git a/task/dumper/src/main.rs b/task/dumper/src/main.rs index 31c1cfdde6..24946caae8 100644 --- a/task/dumper/src/main.rs +++ b/task/dumper/src/main.rs @@ -11,7 +11,7 @@ use drv_sp_ctrl_api::{SpCtrl, SpCtrlError}; use dumper_api::*; use idol_runtime::{NotificationHandler, RequestError}; use ringbuf::*; -use userlib::*; +use userlib::{task_slot, RecvMessage}; use zerocopy::FromBytes; #[derive(Copy, Clone, PartialEq)] diff --git a/task/gimlet-inspector/src/main.rs b/task/gimlet-inspector/src/main.rs index 228a9132d3..90e1388e55 100644 --- a/task/gimlet-inspector/src/main.rs +++ b/task/gimlet-inspector/src/main.rs @@ -17,7 +17,7 @@ use gimlet_inspector_protocol::{ }; use hubpack::SerializedSize; use task_net_api::*; -use userlib::*; +use userlib::{sys_recv_notification, task_slot, UnwrapLite}; task_slot!(NET, net); task_slot!(SEQ, seq); diff --git a/task/hiffy/src/lpc55.rs b/task/hiffy/src/lpc55.rs index de050a452b..d9323a7644 100644 --- a/task/hiffy/src/lpc55.rs +++ b/task/hiffy/src/lpc55.rs @@ -9,7 +9,7 @@ use drv_lpc55_gpio_api::*; use hif::*; use hubris_num_tasks::Task; use ringbuf::*; -use userlib::*; +use userlib::{task_slot, FromPrimitive}; #[cfg(feature = "gpio")] task_slot!(GPIO, gpio_driver); diff --git a/task/hiffy/src/main.rs b/task/hiffy/src/main.rs index b34541d20e..7ab58c3f41 100644 --- a/task/hiffy/src/main.rs +++ b/task/hiffy/src/main.rs @@ -29,7 +29,7 @@ use armv6m_atomic_hack::AtomicU32Ext; use core::sync::atomic::{AtomicU32, Ordering}; use hif::*; use static_cell::*; -use userlib::*; +use userlib::hl; mod common; diff --git a/task/hiffy/src/stm32g0.rs b/task/hiffy/src/stm32g0.rs index cd0011dfbf..952fbef841 100644 --- a/task/hiffy/src/stm32g0.rs +++ b/task/hiffy/src/stm32g0.rs @@ -7,7 +7,7 @@ use hif::*; use hubris_num_tasks::Task; #[cfg(any(feature = "gpio", feature = "i2c"))] -use userlib::*; +use userlib::{task_slot, FromPrimitive}; #[cfg(feature = "gpio")] task_slot!(SYS, sys); diff --git a/task/hiffy/src/stm32h7.rs b/task/hiffy/src/stm32h7.rs index 7f46acd43f..d22e49872c 100644 --- a/task/hiffy/src/stm32h7.rs +++ b/task/hiffy/src/stm32h7.rs @@ -12,7 +12,7 @@ use hif::*; use hubris_num_tasks::Task; use ringbuf::*; #[cfg(any(feature = "spi", feature = "gpio", feature = "i2c"))] -use userlib::*; +use userlib::{task_slot, FromPrimitive}; #[cfg(feature = "i2c")] use drv_i2c_api::{ diff --git a/task/host-sp-comms-api/src/lib.rs b/task/host-sp-comms-api/src/lib.rs index 9d697886af..877423c13c 100644 --- a/task/host-sp-comms-api/src/lib.rs +++ b/task/host-sp-comms-api/src/lib.rs @@ -7,7 +7,7 @@ #![no_std] use derive_idol_err::IdolError; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; pub use host_sp_messages::{HostStartupOptions, Status}; diff --git a/task/jefe-api/src/lib.rs b/task/jefe-api/src/lib.rs index cadee2e961..9cdc1273b2 100644 --- a/task/jefe-api/src/lib.rs +++ b/task/jefe-api/src/lib.rs @@ -9,7 +9,7 @@ use derive_idol_err::IdolError; pub use dump_agent_api::DumpAgentError; use serde::{Deserialize, Serialize}; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; /// Platform-agnostic (but heavily influenced) reset status bits. #[derive( diff --git a/task/monorail-server/src/main.rs b/task/monorail-server/src/main.rs index 0add1f7e2c..62f1f23fe9 100644 --- a/task/monorail-server/src/main.rs +++ b/task/monorail-server/src/main.rs @@ -21,7 +21,7 @@ use crate::{bsp::Bsp, server::ServerImpl}; use drv_spi_api::SpiServer; use drv_stm32xx_sys_api::Sys; use ringbuf::*; -use userlib::*; +use userlib::{sys_get_timer, task_slot}; use vsc7448::{spi::Vsc7448Spi, Vsc7448, VscError}; cfg_if::cfg_if! { diff --git a/task/net-api/src/lib.rs b/task/net-api/src/lib.rs index 454fae027f..acfd064917 100644 --- a/task/net-api/src/lib.rs +++ b/task/net-api/src/lib.rs @@ -11,7 +11,7 @@ use crate as task_net_api; use derive_idol_err::IdolError; use hubpack::SerializedSize; use serde::{Deserialize, Serialize}; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; use zerocopy::{AsBytes, FromBytes}; pub use task_packrat_api::MacAddressBlock; diff --git a/task/net/src/main.rs b/task/net/src/main.rs index 0edb919911..761364e4ef 100644 --- a/task/net/src/main.rs +++ b/task/net/src/main.rs @@ -77,7 +77,7 @@ use stm32h7::stm32h753 as device; use counters::*; use drv_stm32h7_eth as eth; use drv_stm32xx_sys_api::Sys; -use userlib::*; +use userlib::{sys_get_timer, task_slot}; use crate::bsp::BspImpl; use crate::bsp_support::Bsp; diff --git a/task/nucleo-user-button/src/main.rs b/task/nucleo-user-button/src/main.rs index 3e14e08690..720b14235a 100644 --- a/task/nucleo-user-button/src/main.rs +++ b/task/nucleo-user-button/src/main.rs @@ -13,7 +13,7 @@ use drv_stm32xx_sys_api::{Edge, IrqControl, Pull}; use ringbuf::ringbuf_entry; -use userlib::*; +use userlib::{sys_recv_notification, task_slot, UnwrapLite}; #[cfg(not(any( target_board = "nucleo-h753zi", diff --git a/task/packrat-api/src/lib.rs b/task/packrat-api/src/lib.rs index d211bcab0d..a018962e80 100644 --- a/task/packrat-api/src/lib.rs +++ b/task/packrat-api/src/lib.rs @@ -7,7 +7,7 @@ #![no_std] use derive_idol_err::IdolError; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; use zerocopy::{AsBytes, FromBytes, LittleEndian, U16}; pub use host_sp_messages::HostStartupOptions; diff --git a/task/ping/src/main.rs b/task/ping/src/main.rs index f45ed72980..5843714358 100644 --- a/task/ping/src/main.rs +++ b/task/ping/src/main.rs @@ -5,7 +5,7 @@ #![no_std] #![no_main] -use userlib::*; +use userlib::{sys_panic, sys_send, task_slot, Lease}; task_slot!(PEER, peer); #[cfg(feature = "uart")] diff --git a/task/pong/src/main.rs b/task/pong/src/main.rs index 22331a18ab..7feb77428b 100644 --- a/task/pong/src/main.rs +++ b/task/pong/src/main.rs @@ -5,7 +5,7 @@ #![no_std] #![no_main] -use userlib::*; +use userlib::{sys_recv_open, sys_reply, sys_set_timer, task_slot, TaskId}; task_slot!(USER_LEDS, user_leds); diff --git a/task/power/src/main.rs b/task/power/src/main.rs index e12ea8520c..15a4aabd47 100644 --- a/task/power/src/main.rs +++ b/task/power/src/main.rs @@ -24,8 +24,11 @@ use task_power_api::{ Bmr491Event, PmbusValue, RawPmbusBlock, RenesasBlackbox, MAX_BLOCK_LEN, }; use task_sensor_api as sensor_api; -use userlib::units::*; -use userlib::*; +use userlib::{ + sys_get_timer, task_slot, + units::{Amperes, Celsius, Ohms, Volts}, + TaskId, +}; use zerocopy::AsBytes; use drv_i2c_api::{I2cDevice, ResponseCode}; diff --git a/task/sensor-api/src/lib.rs b/task/sensor-api/src/lib.rs index 9f9917adc2..cf36c5f65e 100644 --- a/task/sensor-api/src/lib.rs +++ b/task/sensor-api/src/lib.rs @@ -6,12 +6,11 @@ #![no_std] -use userlib::*; +use userlib::{sys_get_timer, sys_send, FromPrimitive}; use derive_idol_err::IdolError; use drv_i2c_api::ResponseCode; use hubpack::SerializedSize; -use num_derive::FromPrimitive; use serde::{Deserialize, Serialize}; /// A validated sensor ID. diff --git a/task/sensor-polling/src/main.rs b/task/sensor-polling/src/main.rs index aef3d21fae..a43df42684 100644 --- a/task/sensor-polling/src/main.rs +++ b/task/sensor-polling/src/main.rs @@ -10,7 +10,7 @@ use drv_i2c_devices::mwocp68::{Error as Mwocp68Error, Mwocp68}; use ringbuf::*; use task_sensor_api::{Sensor, SensorId}; -use userlib::*; +use userlib::{hl, task_slot, TaskId}; task_slot!(I2C, i2c_driver); task_slot!(SENSOR, sensor); diff --git a/task/sensor/src/main.rs b/task/sensor/src/main.rs index f426ca1ce9..85b0750ba9 100644 --- a/task/sensor/src/main.rs +++ b/task/sensor/src/main.rs @@ -10,7 +10,7 @@ use core::convert::Infallible; use idol_runtime::{NotificationHandler, RequestError}; use task_sensor_api::{NoData, Reading, SensorError, SensorId}; -use userlib::*; +use userlib::RecvMessage; use task_sensor_api::config::NUM_SENSORS; diff --git a/task/sp_measure/src/main.rs b/task/sp_measure/src/main.rs index d64d69f499..8cae036ac0 100644 --- a/task/sp_measure/src/main.rs +++ b/task/sp_measure/src/main.rs @@ -8,7 +8,7 @@ use drv_sp_ctrl_api::*; use ringbuf::*; use sha3::{Digest, Sha3_256}; -use userlib::*; +use userlib::{sys_get_timer, sys_recv_notification, task_slot}; const READ_SIZE: usize = 256; diff --git a/task/template/src/main.rs b/task/template/src/main.rs index c826f676a1..49e85a6cb2 100644 --- a/task/template/src/main.rs +++ b/task/template/src/main.rs @@ -9,7 +9,7 @@ // we need to import userlib to get this to compile, but it throws a warning // because we're not actually using it yet! #[allow(unused_imports)] -use userlib::*; +use userlib::{}; #[export_name = "main"] fn main() -> ! { diff --git a/task/thermal/src/main.rs b/task/thermal/src/main.rs index 27100cae1d..d7be80730e 100644 --- a/task/thermal/src/main.rs +++ b/task/thermal/src/main.rs @@ -48,8 +48,10 @@ use task_thermal_api::{ SensorReadError, ThermalAutoState, ThermalError, ThermalMode, ThermalProperties, }; -use userlib::units::PWMDuty; -use userlib::*; +use userlib::{ + sys_get_timer, sys_set_timer, task_slot, units::PWMDuty, RecvMessage, + UnwrapLite, +}; // We define our own Fan type, as we may have more fans than any single // controller supports. diff --git a/task/uartecho/src/main.rs b/task/uartecho/src/main.rs index 3a66a175b8..1313a4d65f 100644 --- a/task/uartecho/src/main.rs +++ b/task/uartecho/src/main.rs @@ -11,7 +11,7 @@ use drv_stm32h7_usart as drv_usart; use drv_usart::Usart; use heapless::Deque; use ringbuf::*; -use userlib::*; +use userlib::{sys_irq_control, sys_recv_notification, task_slot, UnwrapLite}; task_slot!(SYS, sys); diff --git a/task/udpbroadcast/src/main.rs b/task/udpbroadcast/src/main.rs index 1fabad00e2..1fe00038d1 100644 --- a/task/udpbroadcast/src/main.rs +++ b/task/udpbroadcast/src/main.rs @@ -9,7 +9,7 @@ use hubpack::SerializedSize; use serde::Serialize; use task_net_api::*; use task_packrat_api::{Packrat, VpdIdentity}; -use userlib::*; +use userlib::{hl, kipc, task_slot, UnwrapLite}; #[cfg(feature = "vlan")] use enum_map::Enum; diff --git a/task/udpecho/src/main.rs b/task/udpecho/src/main.rs index 69cf047069..b51127152d 100644 --- a/task/udpecho/src/main.rs +++ b/task/udpecho/src/main.rs @@ -6,7 +6,7 @@ #![no_main] use task_net_api::*; -use userlib::*; +use userlib::{sys_recv_notification, task_slot}; task_slot!(NET, net); diff --git a/task/udprpc/src/main.rs b/task/udprpc/src/main.rs index 9556470a96..f2ffb7ccac 100644 --- a/task/udprpc/src/main.rs +++ b/task/udprpc/src/main.rs @@ -6,7 +6,10 @@ #![no_main] use task_net_api::*; -use userlib::*; +use userlib::{ + kipc, sys_recv_notification, sys_refresh_task_id, sys_send, task_slot, + TaskId, UnwrapLite, +}; use zerocopy::{AsBytes, FromBytes, LittleEndian, U16, U64}; task_slot!(NET, net); diff --git a/task/validate-api/src/lib.rs b/task/validate-api/src/lib.rs index 4cdad95e23..a91df1c08e 100644 --- a/task/validate-api/src/lib.rs +++ b/task/validate-api/src/lib.rs @@ -8,7 +8,7 @@ use derive_idol_err::IdolError; use drv_i2c_api::ResponseCode; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; use zerocopy::AsBytes; pub use task_sensor_api::SensorId; diff --git a/task/validate/src/main.rs b/task/validate/src/main.rs index 78009f4321..032bc4239d 100644 --- a/task/validate/src/main.rs +++ b/task/validate/src/main.rs @@ -10,7 +10,7 @@ use idol_runtime::{NotificationHandler, RequestError}; use ringbuf::*; use task_validate_api::{ValidateError, ValidateOk}; -use userlib::*; +use userlib::{task_slot, RecvMessage}; include!(concat!(env!("OUT_DIR"), "/i2c_config.rs")); diff --git a/task/vpd-api/src/lib.rs b/task/vpd-api/src/lib.rs index 6832ad337d..f8b05b1cb1 100644 --- a/task/vpd-api/src/lib.rs +++ b/task/vpd-api/src/lib.rs @@ -8,7 +8,7 @@ use derive_idol_err::IdolError; use drv_i2c_api::ResponseCode; -use userlib::*; +use userlib::{sys_send, FromPrimitive}; #[derive( Copy, Clone, Debug, FromPrimitive, Eq, PartialEq, IdolError, counters::Count, diff --git a/task/vpd/src/main.rs b/task/vpd/src/main.rs index a215f3e121..7be8866de5 100644 --- a/task/vpd/src/main.rs +++ b/task/vpd/src/main.rs @@ -10,7 +10,7 @@ use drv_i2c_devices::at24csw080::{At24Csw080, EEPROM_SIZE}; use idol_runtime::{NotificationHandler, RequestError}; use task_vpd_api::VpdError; -use userlib::*; +use userlib::{task_slot, RecvMessage}; include!(concat!(env!("OUT_DIR"), "/i2c_config.rs")); From 4397cf69ab6890608e3a1329d373eb123708a0e3 Mon Sep 17 00:00:00 2001 From: Aapo Alasuutari Date: Fri, 23 Aug 2024 23:20:34 +0300 Subject: [PATCH 2/5] fix unused task_slot in test build --- drv/stm32xx-sys/src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drv/stm32xx-sys/src/main.rs b/drv/stm32xx-sys/src/main.rs index 47cc621fd8..0fc5ae00c6 100644 --- a/drv/stm32xx-sys/src/main.rs +++ b/drv/stm32xx-sys/src/main.rs @@ -326,9 +326,11 @@ use idol_runtime::{ClientError, NotificationHandler, RequestError}; #[cfg(not(feature = "test"))] use task_jefe_api::{Jefe, ResetReason}; +#[cfg(not(feature = "test"))] +use userlib::task_slot; #[cfg(feature = "exti")] use userlib::{sys_irq_control, sys_post, sys_refresh_task_id, TaskId}; -use userlib::{task_slot, FromPrimitive, RecvMessage}; +use userlib::{FromPrimitive, RecvMessage}; #[cfg(not(feature = "test"))] task_slot!(JEFE, jefe); From c4536765446a1ba9d1e03c4a9ab745fd9e1858ed Mon Sep 17 00:00:00 2001 From: Aapo Alasuutari Date: Fri, 11 Oct 2024 05:07:02 +0300 Subject: [PATCH 3/5] fix missed userlib::* import in lpc55-syscon-api --- drv/lpc55-syscon-api/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drv/lpc55-syscon-api/src/lib.rs b/drv/lpc55-syscon-api/src/lib.rs index 3a44a34964..bd918d5618 100644 --- a/drv/lpc55-syscon-api/src/lib.rs +++ b/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. From d8dc57d54d65ac3c19c6830ab8de6daa64df5def Mon Sep 17 00:00:00 2001 From: Aapo Alasuutari Date: Fri, 11 Oct 2024 05:33:35 +0300 Subject: [PATCH 4/5] fix: Make lpc55xpresso/app-sprot.toml build pass, correctness be damned --- app/lpc55xpresso/app-sprot.toml | 8 +++++--- drv/lpc55-swd/src/main.rs | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/lpc55xpresso/app-sprot.toml b/app/lpc55xpresso/app-sprot.toml index 2fe6d99fbd..79f8ef5dfe 100644 --- a/app/lpc55xpresso/app-sprot.toml +++ b/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"] diff --git a/drv/lpc55-swd/src/main.rs b/drv/lpc55-swd/src/main.rs index 13e912f0ed..a59062fac2 100644 --- a/drv/lpc55-swd/src/main.rs +++ b/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 { From 1088b47992d2b1e9f10badd828ea46fba6d4f33c Mon Sep 17 00:00:00 2001 From: Aapo Alasuutari Date: Fri, 11 Oct 2024 08:25:44 +0300 Subject: [PATCH 5/5] ci?