Fix format issue. Signed-off-by: Steven Lee <steven_lee@aspeedtech.com>
diff --git a/target/ast10x0/peripherals/i3c/ccc.rs b/target/ast10x0/peripherals/i3c/ccc.rs index 8b6043b..33190ba 100644 --- a/target/ast10x0/peripherals/i3c/ccc.rs +++ b/target/ast10x0/peripherals/i3c/ccc.rs
@@ -124,15 +124,27 @@ // ============================================================================= const fn ccc_enec(broadcast: bool) -> u8 { - if broadcast { 0x00 } else { 0x80 } + if broadcast { + 0x00 + } else { + 0x80 + } } const fn ccc_disec(broadcast: bool) -> u8 { - if broadcast { 0x01 } else { 0x81 } + if broadcast { + 0x01 + } else { + 0x81 + } } const fn ccc_rstact(broadcast: bool) -> u8 { - if broadcast { 0x2a } else { 0x9a } + if broadcast { + 0x2a + } else { + 0x9a + } } // =============================================================================
diff --git a/target/ast10x0/peripherals/i3c/controller.rs b/target/ast10x0/peripherals/i3c/controller.rs index 9593e41..c5489af 100644 --- a/target/ast10x0/peripherals/i3c/controller.rs +++ b/target/ast10x0/peripherals/i3c/controller.rs
@@ -217,11 +217,7 @@ config.addrbook.mark_use(dyn_addr, false); } - let dev_pos = config - .attached - .devices - .get(dev_idx) - .and_then(|dev| dev.pos); + let dev_pos = config.attached.devices.get(dev_idx).and_then(|dev| dev.pos); if let Some(pos) = dev_pos { hw.detach_i3c_dev(pos.into()); } @@ -387,8 +383,7 @@ hw.do_entdaa(config, slot.into()) .map_err(|_| I3cError::AddrInUse)?; - let pid = - ccc::ccc_getpid(hw, config, static_address).map_err(|_| I3cError::Invalid)?; + let pid = ccc::ccc_getpid(hw, config, static_address).map_err(|_| I3cError::Invalid)?; let dev_idx = config .attached @@ -408,8 +403,7 @@ return Err(I3cError::Other); } - let bcr = - ccc::ccc_getbcr(hw, config, static_address).map_err(|_| I3cError::Invalid)?; + let bcr = ccc::ccc_getbcr(hw, config, static_address).map_err(|_| I3cError::Invalid)?; { let dev = config
diff --git a/target/ast10x0/peripherals/i3c/hardware.rs b/target/ast10x0/peripherals/i3c/hardware.rs index 6d98d34..e9f7b98 100644 --- a/target/ast10x0/peripherals/i3c/hardware.rs +++ b/target/ast10x0/peripherals/i3c/hardware.rs
@@ -28,33 +28,33 @@ use core::cell::UnsafeCell; use critical_section::Mutex; -use super::ccc::{CccPayload, ccc_events_set}; -use super::config::{I3C_MIN_CORE_CLK_SDR, I3cConfig}; +use super::ccc::{ccc_events_set, CccPayload}; +use super::config::{I3cConfig, I3C_MIN_CORE_CLK_SDR}; use super::constants::{ - CM_TFR_STS_MASTER_HALT, CM_TFR_STS_TARGET_HALT, COMMAND_ATTR_ADDR_ASSGN_CMD, - COMMAND_ATTR_SLAVE_DATA_CMD, COMMAND_ATTR_XFER_ARG, COMMAND_ATTR_XFER_CMD, - COMMAND_PORT_ARG_DATA_LEN, COMMAND_PORT_ARG_DB, COMMAND_PORT_ATTR, COMMAND_PORT_CMD, - COMMAND_PORT_CP, COMMAND_PORT_DBP, COMMAND_PORT_DEV_COUNT, COMMAND_PORT_DEV_INDEX, - COMMAND_PORT_READ_TRANSFER, COMMAND_PORT_ROC, COMMAND_PORT_SPEED, COMMAND_PORT_TID, - COMMAND_PORT_TOC, DEV_ADDR_TABLE_IBI_MDB, DEV_ADDR_TABLE_IBI_PEC, DEV_ADDR_TABLE_SIR_REJECT, - I3C_AST10X0_MIPI_MANUF_ID, I3C_BCR_IBI_PAYLOAD_HAS_DATA_BYTE, I3C_BUS_FREE_TIMING_RESET, + bit, field_get, field_prep, CM_TFR_STS_MASTER_HALT, CM_TFR_STS_TARGET_HALT, + COMMAND_ATTR_ADDR_ASSGN_CMD, COMMAND_ATTR_SLAVE_DATA_CMD, COMMAND_ATTR_XFER_ARG, + COMMAND_ATTR_XFER_CMD, COMMAND_PORT_ARG_DATA_LEN, COMMAND_PORT_ARG_DB, COMMAND_PORT_ATTR, + COMMAND_PORT_CMD, COMMAND_PORT_CP, COMMAND_PORT_DBP, COMMAND_PORT_DEV_COUNT, + COMMAND_PORT_DEV_INDEX, COMMAND_PORT_READ_TRANSFER, COMMAND_PORT_ROC, COMMAND_PORT_SPEED, + COMMAND_PORT_TID, COMMAND_PORT_TOC, DEV_ADDR_TABLE_IBI_MDB, DEV_ADDR_TABLE_IBI_PEC, + DEV_ADDR_TABLE_SIR_REJECT, I3CG_REG1_SCL_IN_SW_MODE_EN, I3CG_REG1_SCL_IN_SW_MODE_VAL, + I3CG_REG1_SDA_IN_SW_MODE_EN, I3CG_REG1_SDA_IN_SW_MODE_VAL, I3C_AST10X0_MIPI_MANUF_ID, + I3C_BCR_IBI_PAYLOAD_HAS_DATA_BYTE, I3C_BUS_FREE_TIMING_RESET, I3C_BUS_I2C_FMP_TF_MAX_NS, + I3C_BUS_I2C_FMP_THIGH_MIN_NS, I3C_BUS_I2C_FMP_TLOW_MIN_NS, I3C_BUS_I2C_FMP_TR_MAX_NS, I3C_BUS_I2C_FM_TF_MAX_NS, I3C_BUS_I2C_FM_THIGH_MIN_NS, I3C_BUS_I2C_FM_TLOW_MIN_NS, - I3C_BUS_I2C_FM_TR_MAX_NS, I3C_BUS_I2C_FMP_TF_MAX_NS, I3C_BUS_I2C_FMP_THIGH_MIN_NS, - I3C_BUS_I2C_FMP_TLOW_MIN_NS, I3C_BUS_I2C_FMP_TR_MAX_NS, I3C_BUS_I2C_STD_TF_MAX_NS, - I3C_BUS_I2C_STD_THIGH_MIN_NS, I3C_BUS_I2C_STD_TLOW_MIN_NS, I3C_BUS_I2C_STD_TR_MAX_NS, - I3C_BUS_THIGH_MAX_NS, I3C_CCC_DEVCTRL, I3C_CCC_ENTDAA, I3C_CCC_EVT_INTR, I3C_CCC_SETHID, - I3C_CTRL_POLL_DELAY_NS, I3C_DEFAULT_STATIC_ADDR, I3C_GLOBAL_RESET_DEASSERT_MASK, - I3C_IBI_DATA_THRESHOLD_MAX, I3C_INIT_POLL_DELAY_NS, I3C_INTR_STATUS_ALL_BITS, I3C_MSG_READ, - I3C_OP_TIMEOUT_US, I3C_POLL_MAX_ITERS, I3CG_REG1_SCL_IN_SW_MODE_EN, - I3CG_REG1_SCL_IN_SW_MODE_VAL, I3CG_REG1_SDA_IN_SW_MODE_EN, I3CG_REG1_SDA_IN_SW_MODE_VAL, - IBIQ_STATUS_IBI_DATA_LEN, IBIQ_STATUS_IBI_DATA_LEN_SHIFT, IBIQ_STATUS_IBI_ID, - IBIQ_STATUS_IBI_ID_SHIFT, INTR_CCC_UPDATED_STAT, INTR_DYN_ADDR_ASSGN_STAT, INTR_IBI_THLD_STAT, - INTR_RESP_READY_STAT, INTR_TRANSFER_ABORT_STAT, INTR_TRANSFER_ERR_STAT, MAX_CMDS, NSEC_PER_SEC, - RESET_CTRL_ALL, RESET_CTRL_QUEUES, RESET_CTRL_XFER_QUEUES, RESPONSE_ERROR_IBA_NACK, - RESPONSE_PORT_DATA_LEN_MASK, RESPONSE_PORT_DATA_LEN_SHIFT, RESPONSE_PORT_ERR_STATUS_MASK, - RESPONSE_PORT_ERR_STATUS_SHIFT, RESPONSE_PORT_TID_MASK, RESPONSE_PORT_TID_SHIFT, - SDA_TX_HOLD_MASK, SDA_TX_HOLD_MAX, SDA_TX_HOLD_MIN, SLV_DCR_MASK, SLV_EVENT_CTRL_SIR_EN, bit, - field_get, field_prep, + I3C_BUS_I2C_FM_TR_MAX_NS, I3C_BUS_I2C_STD_TF_MAX_NS, I3C_BUS_I2C_STD_THIGH_MIN_NS, + I3C_BUS_I2C_STD_TLOW_MIN_NS, I3C_BUS_I2C_STD_TR_MAX_NS, I3C_BUS_THIGH_MAX_NS, I3C_CCC_DEVCTRL, + I3C_CCC_ENTDAA, I3C_CCC_EVT_INTR, I3C_CCC_SETHID, I3C_CTRL_POLL_DELAY_NS, + I3C_DEFAULT_STATIC_ADDR, I3C_GLOBAL_RESET_DEASSERT_MASK, I3C_IBI_DATA_THRESHOLD_MAX, + I3C_INIT_POLL_DELAY_NS, I3C_INTR_STATUS_ALL_BITS, I3C_MSG_READ, I3C_OP_TIMEOUT_US, + I3C_POLL_MAX_ITERS, IBIQ_STATUS_IBI_DATA_LEN, IBIQ_STATUS_IBI_DATA_LEN_SHIFT, + IBIQ_STATUS_IBI_ID, IBIQ_STATUS_IBI_ID_SHIFT, INTR_CCC_UPDATED_STAT, INTR_DYN_ADDR_ASSGN_STAT, + INTR_IBI_THLD_STAT, INTR_RESP_READY_STAT, INTR_TRANSFER_ABORT_STAT, INTR_TRANSFER_ERR_STAT, + MAX_CMDS, NSEC_PER_SEC, RESET_CTRL_ALL, RESET_CTRL_QUEUES, RESET_CTRL_XFER_QUEUES, + RESPONSE_ERROR_IBA_NACK, RESPONSE_PORT_DATA_LEN_MASK, RESPONSE_PORT_DATA_LEN_SHIFT, + RESPONSE_PORT_ERR_STATUS_MASK, RESPONSE_PORT_ERR_STATUS_SHIFT, RESPONSE_PORT_TID_MASK, + RESPONSE_PORT_TID_SHIFT, SDA_TX_HOLD_MASK, SDA_TX_HOLD_MAX, SDA_TX_HOLD_MIN, SLV_DCR_MASK, + SLV_EVENT_CTRL_SIR_EN, }; use super::error::I3cError as I3cDrvError; use super::error::I3cError; @@ -277,10 +277,7 @@ // the response queue itself and re-enables the sources. regs.mask_master_xfer_irqs(); events.pending.fetch_or( - status - & (INTR_RESP_READY_STAT - | INTR_TRANSFER_ERR_STAT - | INTR_TRANSFER_ABORT_STAT), + status & (INTR_RESP_READY_STAT | INTR_TRANSFER_ERR_STAT | INTR_TRANSFER_ABORT_STAT), Ordering::AcqRel, ); } @@ -328,8 +325,10 @@ if let Some(dst) = buf.get_mut(..n) { regs.rx_fifo_read(dst); } - let _ = - ibi_workq::i3c_ibi_work_enqueue_target_master_write(bus, buf.get(..n).unwrap_or(&[])); + let _ = ibi_workq::i3c_ibi_work_enqueue_target_master_write( + bus, + buf.get(..n).unwrap_or(&[]), + ); } if tid == Tid::TargetIbi as usize { @@ -875,8 +874,7 @@ config.sir_allowed_by_sw = false; - self.regs - .set_ibi_data_threshold(I3C_IBI_DATA_THRESHOLD_MAX); + self.regs.set_ibi_data_threshold(I3C_IBI_DATA_THRESHOLD_MAX); self.regs.set_rx_buf_threshold(0); self.init_pid(config); @@ -1328,8 +1326,7 @@ let mut left = timeout_us; loop { let pending = events.take_pending(); - if pending - & (INTR_RESP_READY_STAT | INTR_TRANSFER_ERR_STAT | INTR_TRANSFER_ABORT_STAT) + if pending & (INTR_RESP_READY_STAT | INTR_TRANSFER_ERR_STAT | INTR_TRANSFER_ABORT_STAT) != 0 { self.process_responses(config, xfer); @@ -1721,7 +1718,6 @@ _ => Err(I3cDrvError::Timeout), } } - } impl<Y: FnMut(u32)> HardwareTarget for Ast1060I3c<Y> {
diff --git a/target/ast10x0/peripherals/i3c/mod.rs b/target/ast10x0/peripherals/i3c/mod.rs index 635b984..e999a3e 100644 --- a/target/ast10x0/peripherals/i3c/mod.rs +++ b/target/ast10x0/peripherals/i3c/mod.rs
@@ -56,8 +56,8 @@ // Configuration pub use config::{ - AddrBook, Attached, CommonCfg, CommonState, DeviceEntry, I3C_MAX_CORE_CLK, - I3C_MIN_CORE_CLK_HDR, I3C_MIN_CORE_CLK_SDR, I3cConfig, I3cTargetConfig, ResetSpec, + AddrBook, Attached, CommonCfg, CommonState, DeviceEntry, I3cConfig, I3cTargetConfig, ResetSpec, + I3C_MAX_CORE_CLK, I3C_MIN_CORE_CLK_HDR, I3C_MIN_CORE_CLK_SDR, }; // Core types @@ -68,8 +68,8 @@ // Hardware interface pub use hardware::{ - Ast1060I3c, HardwareClock, HardwareCore, HardwareFifo, HardwareInterface, HardwareRecovery, - HardwareTarget, HardwareTransfer, IsrCtx, dispatch_i3c_irq, register_i3c_irq_handler, + dispatch_i3c_irq, register_i3c_irq_handler, Ast1060I3c, HardwareClock, HardwareCore, + HardwareFifo, HardwareInterface, HardwareRecovery, HardwareTarget, HardwareTransfer, IsrCtx, }; // Confined-unsafe MMIO façade (runtime bus selection) @@ -77,16 +77,16 @@ // CCC operations pub use ccc::{ - Ccc, CccPayload, CccRstActDefByte, CccTargetPayload, GetStatusDefByte, GetStatusFormat, - GetStatusResp, ccc_events_all_set, ccc_events_set, ccc_getbcr, ccc_getpid, ccc_getstatus, - ccc_getstatus_fmt1, ccc_rstact_all, ccc_rstdaa_all, ccc_setnewda, + ccc_events_all_set, ccc_events_set, ccc_getbcr, ccc_getpid, ccc_getstatus, ccc_getstatus_fmt1, + ccc_rstact_all, ccc_rstdaa_all, ccc_setnewda, Ccc, CccPayload, CccRstActDefByte, + CccTargetPayload, GetStatusDefByte, GetStatusFormat, GetStatusResp, }; // IBI work queue pub use ibi::{ - IbiConsumer, IbiWork, i3c_ibi_work_enqueue_hotjoin, i3c_ibi_work_enqueue_target_da_assignment, + i3c_ibi_work_enqueue_hotjoin, i3c_ibi_work_enqueue_target_da_assignment, i3c_ibi_work_enqueue_target_irq, i3c_ibi_work_enqueue_target_master_write, - i3c_ibi_workq_consumer, + i3c_ibi_workq_consumer, IbiConsumer, IbiWork, }; // Constants (wildcard export for convenience)
diff --git a/target/ast10x0/peripherals/i3c/registers.rs b/target/ast10x0/peripherals/i3c/registers.rs index 2e7c447..4cfdf07 100644 --- a/target/ast10x0/peripherals/i3c/registers.rs +++ b/target/ast10x0/peripherals/i3c/registers.rs
@@ -377,9 +377,9 @@ /// I3CD004: program the secondary-role static address (and mark valid). pub(crate) fn program_secondary_static_addr(&self, addr: u8) { - self.i3c().i3cd004().write(|w| unsafe { - w.dev_static_addr().bits(addr).static_addr_valid().set_bit() - }); + self.i3c() + .i3cd004() + .write(|w| unsafe { w.dev_static_addr().bits(addr).static_addr_valid().set_bit() }); } /// I3CD004: program the primary-role dynamic address (and mark valid).
diff --git a/target/ast10x0/tests/peripherals/i3c/i3c_init/target.rs b/target/ast10x0/tests/peripherals/i3c/i3c_init/target.rs index 0e9f6f7..fb8778f 100644 --- a/target/ast10x0/tests/peripherals/i3c/i3c_init/target.rs +++ b/target/ast10x0/tests/peripherals/i3c/i3c_init/target.rs
@@ -21,7 +21,7 @@ use codegen as _; use console_backend::console_backend_write_all; use entry as _; -use target_common::{TargetInterface, declare_target}; +use target_common::{declare_target, TargetInterface}; pub struct Target {}
diff --git a/target/ast10x0/tests/peripherals/i3c/i3c_irq/slave_target.rs b/target/ast10x0/tests/peripherals/i3c/i3c_irq/slave_target.rs index a8838bd..2ccb582 100644 --- a/target/ast10x0/tests/peripherals/i3c/i3c_irq/slave_target.rs +++ b/target/ast10x0/tests/peripherals/i3c/i3c_irq/slave_target.rs
@@ -24,8 +24,8 @@ use ast10x0_board::{Ast10x0Board, Ast10x0BoardDescriptor}; use ast10x0_peripherals::i3c::{ - Ast1060I3c, I3cConfig, I3cController, I3cTargetConfig, IbiConsumer, IbiWork, - i3c_ibi_workq_consumer, + i3c_ibi_workq_consumer, Ast1060I3c, I3cConfig, I3cController, I3cTargetConfig, IbiConsumer, + IbiWork, }; use ast10x0_peripherals::scu::pinctrl; use codegen as _; @@ -33,7 +33,7 @@ use cortex_m::peripheral::NVIC; use entry as _; use kernel::Kernel; -use target_common::{TargetInterface, declare_target}; +use target_common::{declare_target, TargetInterface}; pub struct Target {}
diff --git a/target/ast10x0/tests/peripherals/i3c/i3c_irq/target.rs b/target/ast10x0/tests/peripherals/i3c/i3c_irq/target.rs index 0305180..1d22567 100644 --- a/target/ast10x0/tests/peripherals/i3c/i3c_irq/target.rs +++ b/target/ast10x0/tests/peripherals/i3c/i3c_irq/target.rs
@@ -28,7 +28,7 @@ use ast10x0_board::{Ast10x0Board, Ast10x0BoardDescriptor}; use ast10x0_peripherals::i3c::{ - Ast1060I3c, I3cConfig, I3cController, IbiWork, Ready, i3c_ibi_workq_consumer, + i3c_ibi_workq_consumer, Ast1060I3c, I3cConfig, I3cController, IbiWork, Ready, }; use ast10x0_peripherals::scu::pinctrl; use codegen as _; @@ -36,7 +36,7 @@ use cortex_m::peripheral::NVIC; use entry as _; use kernel::Kernel; -use target_common::{TargetInterface, declare_target}; +use target_common::{declare_target, TargetInterface}; pub struct Target {} @@ -133,7 +133,10 @@ } #[inline(never)] -fn master_write_to_target(ctrl: &mut I3c2Controller<'_>, exchange: u32) -> Result<(), &'static str> { +fn master_write_to_target( + ctrl: &mut I3c2Controller<'_>, + exchange: u32, +) -> Result<(), &'static str> { let mut tx_buf: [u8; XFER_DATA_LEN] = [ 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,