From 4efeca661e5570835049080b917961ddf3f31194 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Sat, 1 Feb 2025 14:44:03 -0800 Subject: [PATCH] Move command.rs to ahci_command.rs --- rust/sys/denali/src/ahci/{command.rs => ahci_command.rs} | 0 rust/sys/denali/src/ahci/mod.rs | 2 +- rust/sys/denali/src/ahci/port_controller.rs | 9 +++++---- 3 files changed, 6 insertions(+), 5 deletions(-) rename rust/sys/denali/src/ahci/{command.rs => ahci_command.rs} (100%) diff --git a/rust/sys/denali/src/ahci/command.rs b/rust/sys/denali/src/ahci/ahci_command.rs similarity index 100% rename from rust/sys/denali/src/ahci/command.rs rename to rust/sys/denali/src/ahci/ahci_command.rs diff --git a/rust/sys/denali/src/ahci/mod.rs b/rust/sys/denali/src/ahci/mod.rs index f154971..8200d8e 100644 --- a/rust/sys/denali/src/ahci/mod.rs +++ b/rust/sys/denali/src/ahci/mod.rs @@ -1,4 +1,4 @@ -mod command; +mod ahci_command; mod controller; mod hba; mod port; diff --git a/rust/sys/denali/src/ahci/port_controller.rs b/rust/sys/denali/src/ahci/port_controller.rs index 47ce356..5b42543 100644 --- a/rust/sys/denali/src/ahci/port_controller.rs +++ b/rust/sys/denali/src/ahci/port_controller.rs @@ -11,13 +11,14 @@ use alloc::boxed::Box; use alloc::sync::Arc; use mammoth::{cap::Capability, mem, sync::Mutex, syscall, zion::ZError}; -use crate::ahci::command::FisType; use crate::ahci::port::AhciPortInterruptStatus; -use super::command::{ - CommandList, CommandTable, HostToDeviceRegisterFis, ReceivedFis, SataCommand, +use super::{ + ahci_command::{ + CommandList, CommandTable, FisType, HostToDeviceRegisterFis, ReceivedFis, SataCommand, + }, + port::AhciPortHba, }; -use super::port::AhciPortHba; enum CommandStatus { Empty,