fixed clipping issues
diff --git a/target/ast10x0/board/src/lib.rs b/target/ast10x0/board/src/lib.rs index cf5b011..f9924ea 100644 --- a/target/ast10x0/board/src/lib.rs +++ b/target/ast10x0/board/src/lib.rs
@@ -19,9 +19,10 @@ pub use monitor::Ast1060Monitor; pub use spim_wiring::{ - BmcSpimPathDebug, SpimWiring, SpimWiringError, apply_spim_external_mux, apply_spim_pinctrl, - apply_spim_wiring, apply_spim_wiring_with_log, bmc_spim_csin_levels, bmc_spim_path_debug, - enable_flash_power, presets, release_spi_flash_resets, set_bmc_resets, spim_external_mux_state, + apply_spim_external_mux, apply_spim_pinctrl, apply_spim_wiring, apply_spim_wiring_with_log, + bmc_spim_csin_levels, bmc_spim_path_debug, enable_flash_power, presets, + release_spi_flash_resets, set_bmc_resets, spim_external_mux_state, BmcSpimPathDebug, + SpimWiring, SpimWiringError, }; pub use ast10x0_peripherals::i2c::{I2cConfig, I2cError};
diff --git a/target/ast10x0/board/src/spim_wiring.rs b/target/ast10x0/board/src/spim_wiring.rs index 26bc7fe..5ad4586 100644 --- a/target/ast10x0/board/src/spim_wiring.rs +++ b/target/ast10x0/board/src/spim_wiring.rs
@@ -10,20 +10,20 @@ //! (`peripherals/spimonitor/planning/overview-and-usage-model.md`) calls for //! "configure early, validate, lock, and operate under that locked policy." +use ast1060_pac as device; use ast10x0_peripherals::scu::{ - ScuError, ScuExtMuxSelect, ScuRegisters, SpiMonitorInstance, SpiMonitorPassthrough, - SpiMonitorSource, pinctrl::{ PINCTRL_GPIOL2, PINCTRL_GPIOL3, PINCTRL_SPIM1_DEFAULT, PINCTRL_SPIM2_DEFAULT, PINCTRL_SPIM3_DEFAULT, PINCTRL_SPIM4_DEFAULT, }, + ScuError, ScuExtMuxSelect, ScuRegisters, SpiMonitorInstance, SpiMonitorPassthrough, + SpiMonitorSource, }; use ast10x0_peripherals::smc::SmcController; use ast10x0_peripherals::spimonitor::{ LockedSpiMonitor, MonitorPolicy, PassthroughMode, SpiMonitor, SpiMonitorController, SpiMonitorError, Uninitialized, }; -use ast1060_pac as device; /// Static wiring for one external SPI monitor path. /// @@ -344,7 +344,11 @@ } const fn update_bit(value: u32, mask: u32, set: bool) -> u32 { - if set { value | mask } else { value & !mask } + if set { + value | mask + } else { + value & !mask + } } /// Apply static SPIM wiring at controller-init time. @@ -430,7 +434,7 @@ /// Built-in `MonitorPolicy` presets vetted against the BMC's flash opcode set. pub mod presets { use ast10x0_peripherals::spimonitor::{ - MonitorPolicy, PrivilegeDirection, PrivilegeOp, profile, + profile, MonitorPolicy, PrivilegeDirection, PrivilegeOp, }; /// Allow-list for the BMC's normal flash opcodes covering both 3-byte and
diff --git a/target/ast10x0/peripherals/spimonitor/controller.rs b/target/ast10x0/peripherals/spimonitor/controller.rs index 8c13a18..e38a4c7 100644 --- a/target/ast10x0/peripherals/spimonitor/controller.rs +++ b/target/ast10x0/peripherals/spimonitor/controller.rs
@@ -7,8 +7,8 @@ use crate::scu::registers::ScuRegisters; use crate::scu::types::{ScuExtMuxSelect, SpiMonitorInstance}; -use crate::spimonitor::commands::{LOCKED as COMMAND_LOCKED, fixed_slot, table_value}; -use crate::spimonitor::policy::{MAX_REGION_SLOTS, MonitorPolicy}; +use crate::spimonitor::commands::{fixed_slot, table_value, LOCKED as COMMAND_LOCKED}; +use crate::spimonitor::policy::{MonitorPolicy, MAX_REGION_SLOTS}; use crate::spimonitor::registers::{SpiMonitorController, SpiMonitorRegisters}; use crate::spimonitor::types::{ ExtMuxSel, LockState, MonitorState, PassthroughMode, PrivilegeDirection, PrivilegeOp, Result,
diff --git a/target/ast10x0/tests/spimonitor/setup_all_spim.rs b/target/ast10x0/tests/spimonitor/setup_all_spim.rs index c720626..b6ba08c 100644 --- a/target/ast10x0/tests/spimonitor/setup_all_spim.rs +++ b/target/ast10x0/tests/spimonitor/setup_all_spim.rs
@@ -16,7 +16,7 @@ enable_flash_power, release_spi_flash_resets, set_bmc_resets, spim_external_mux_state, }; use ast10x0_peripherals::scu::{ - ScuExtMuxSelect, ScuRegisters, SpiMonitorInstance, SpiMonitorSource, pinctrl::PINCTRL_SPI1_QUAD, + pinctrl::PINCTRL_SPI1_QUAD, ScuExtMuxSelect, ScuRegisters, SpiMonitorInstance, SpiMonitorSource, }; use ast10x0_peripherals::smc::{ ChipSelect, FlashConfig, SmcConfig, SmcController, SmcError, SmcTopology, SpiReady, SpiUninit, @@ -27,7 +27,7 @@ ConfiguredSpiMonitor, LockedSpiMonitor, MonitorPolicy, PrivilegeDirection, PrivilegeOp, SpiMonitorController, ViolationLogEntry, }; -use target_common::{TargetInterface, declare_target}; +use target_common::{declare_target, TargetInterface}; use test_common::TestConfig; use {console_backend as _, entry as _};