Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/medusa/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ memory-size = 33_554_432 # 256 Mib / 32 MiB
slot-count = 16 # 2 MiB slots

[[auxflash.blobs]]
file = "drv/sidecar-front-io/sidecar_qsfp_x32_controller_rev_b_c.bit"
file = "drv/front-io-api/sidecar_qsfp_x32_controller_rev_b_c.bit"
compress = true
tag = "QSFP"

Expand Down
2 changes: 1 addition & 1 deletion app/sidecar/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ memory-size = 33_554_432 # 256 Mib / 32 MiB
slot-count = 16 # 2 MiB slots

[[auxflash.blobs]]
file = "drv/sidecar-front-io/sidecar_qsfp_x32_controller_rev_b_c.bit"
file = "drv/front-io-api/sidecar_qsfp_x32_controller_rev_b_c.bit"
compress = true
tag = "QSFP"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "drv-sidecar-front-io"
name = "drv-front-io-api"
version = "0.1.0"
edition = "2024"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion drv/medusa-seq-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ drv-i2c-api = { path = "../i2c-api" }
drv-i2c-devices = { path = "../i2c-devices" }
drv-medusa-seq-api = { path = "../medusa-seq-api" }
drv-packrat-vpd-loader = { path = "../packrat-vpd-loader" }
drv-sidecar-front-io = { path = "../sidecar-front-io", features = ["controller", "phy_smi"] }
drv-front-io-api = { path = "../front-io-api", features = ["controller", "phy_smi"] }
drv-sidecar-mainboard-controller = { path = "../sidecar-mainboard-controller" }
drv-stm32xx-sys-api = { path = "../../drv/stm32xx-sys-api", features = ["family-stm32h7"] }
ringbuf = { path = "../../lib/ringbuf" }
Expand Down
4 changes: 2 additions & 2 deletions drv/medusa-seq-server/src/front_io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

use crate::*;
use drv_fpga_api::{DeviceState, FpgaError};
use drv_front_io_api::controller::FrontIOController;
use drv_front_io_api::phy_smi::PhySmi;
use drv_i2c_devices::{Validate, at24csw080::At24Csw080};
use drv_sidecar_front_io::controller::FrontIOController;
use drv_sidecar_front_io::phy_smi::PhySmi;

#[allow(dead_code)]
pub(crate) struct FrontIOBoard {
Expand Down
2 changes: 1 addition & 1 deletion drv/medusa-seq-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
use crate::front_io::FrontIOBoard;
use crate::power_control::PowerControl;
use core::convert::Infallible;
use drv_front_io_api::phy_smi::PhyOscState;
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::*;
Expand Down
2 changes: 1 addition & 1 deletion drv/sidecar-seq-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ drv-fpga-user-api = { path = "../fpga-user-api" }
drv-i2c-api = { path = "../i2c-api", features = ["component-id"] }
drv-i2c-devices = { path = "../i2c-devices" }
drv-packrat-vpd-loader = { path = "../packrat-vpd-loader" }
drv-sidecar-front-io = { path = "../sidecar-front-io", features = ["controller", "phy_smi"] }
drv-front-io-api = { path = "../front-io-api", features = ["controller", "phy_smi"] }
drv-sidecar-mainboard-controller = { path = "../sidecar-mainboard-controller", features = ["bitstream"] }
drv-sidecar-seq-api = { path = "../sidecar-seq-api" }
drv-stm32xx-sys-api = { path = "../stm32xx-sys-api", features = ["family-stm32h7"] }
Expand Down
4 changes: 2 additions & 2 deletions drv/sidecar-seq-server/src/front_io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use crate::*;
use drv_front_io_api::controller::FrontIOController;
use drv_front_io_api::phy_smi::PhySmi;
use drv_i2c_devices::{Validate, at24csw080::At24Csw080};
use drv_sidecar_front_io::controller::FrontIOController;
use drv_sidecar_front_io::phy_smi::PhySmi;

#[allow(dead_code)]
pub(crate) struct FrontIOBoard {
Expand Down
2 changes: 1 addition & 1 deletion drv/sidecar-seq-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ use crate::i2c_config::MAX_COMPONENT_ID_LEN as REFDES_LEN;
use crate::tofino::Tofino;
use core::convert::Infallible;
use drv_fpga_api::{DeviceState, FpgaError, WriteOp};
use drv_front_io_api::phy_smi::PhyOscState;
use drv_i2c_api::{I2cDevice, ResponseCode};
use drv_packrat_vpd_loader::{Packrat, read_vpd_and_load_packrat};
use drv_sidecar_front_io::phy_smi::PhyOscState;
use drv_sidecar_mainboard_controller::MainboardController;
use drv_sidecar_mainboard_controller::fan_modules::*;
use drv_sidecar_mainboard_controller::front_io::*;
Expand Down
2 changes: 1 addition & 1 deletion drv/transceivers-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ counters = { path = "../../lib/counters" }
drv-fpga-api = { path = "../fpga-api" }
drv-i2c-api = { path = "../i2c-api" }
drv-i2c-devices = { path = "../i2c-devices" }
drv-sidecar-front-io = { path = "../sidecar-front-io", features = ["transceivers", "leds"] }
drv-front-io-api = { path = "../front-io-api", features = ["transceivers", "leds"] }
drv-sidecar-seq-api = { path = "../sidecar-seq-api" }
drv-transceivers-api = { path = "../transceivers-api" }
multitimer = { path = "../../lib/multitimer" }
Expand Down
4 changes: 2 additions & 2 deletions drv/transceivers-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ use static_cell::ClaimOnceCell;
use userlib::{sys_get_timer, task_slot, units::Celsius};

use drv_fpga_api::FpgaError;
use drv_i2c_devices::pca9956b::Error;
use drv_sidecar_front_io::{
use drv_front_io_api::{
Reg,
leds::{FullErrorSummary, Leds},
transceivers::{
FpgaI2CFailure, LogicalPort, LogicalPortMask, Transceivers,
},
};
use drv_i2c_devices::pca9956b::Error;
use drv_sidecar_seq_api::{SeqError, Sequencer, TofinoSeqState};
use drv_transceivers_api::{
ModuleStatus, NUM_PORTS, TRANSCEIVER_TEMPERATURE_SENSORS, TransceiversError,
Expand Down
2 changes: 1 addition & 1 deletion drv/transceivers-server/src/udp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use ringbuf::*;
use userlib::UnwrapLite;

use crate::{FrontIOStatus, ServerImpl};
use drv_sidecar_front_io::transceivers::{
use drv_front_io_api::transceivers::{
FpgaI2CFailure, LogicalPort, LogicalPortFailureTypes, LogicalPortMask,
ModuleResult, ModuleResultNoFailure, ModuleResultSlim,
};
Expand Down
6 changes: 3 additions & 3 deletions task/monorail-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2024"
drv-medusa-seq-api = { path = "../../drv/medusa-seq-api", optional = true }
drv-monorail-api = { path = "../../drv/monorail-api" }
drv-sidecar-mainboard-controller = { path = "../../drv/sidecar-mainboard-controller" }
drv-sidecar-front-io = { path = "../../drv/sidecar-front-io", features = ["phy_smi"], optional = true }
drv-front-io-api = { path = "../../drv/front-io-api", features = ["phy_smi"], optional = true }
drv-sidecar-seq-api = { path = "../../drv/sidecar-seq-api", optional = true }
drv-spi-api = { path = "../../drv/spi-api" }
drv-stm32h7-spi-server-core = { path = "../../drv/stm32h7-spi-server-core", optional = true }
Expand All @@ -31,9 +31,9 @@ zerocopy-derive.workspace = true

[features]
leds = ["drv-user-leds-api"]
medusa = ["drv-medusa-seq-api", "drv-sidecar-front-io"]
medusa = ["drv-medusa-seq-api", "drv-front-io-api"]
mgmt = ["task-net-api"]
sidecar = ["drv-sidecar-seq-api", "drv-sidecar-front-io"]
sidecar = ["drv-sidecar-seq-api", "drv-front-io-api"]
reverso = []
minibar = []
vlan = ["task-net-api?/vlan"]
Expand Down
2 changes: 1 addition & 1 deletion task/monorail-server/src/bsp/medusa_a.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use drv_front_io_api::phy_smi::PhySmi;
use drv_medusa_seq_api::Sequencer;
use drv_monorail_api::MonorailError;
use drv_sidecar_front_io::phy_smi::PhySmi;
use idol_runtime::{ClientError, RequestError};
use ringbuf::*;
use userlib::{UnwrapLite, task_slot};
Expand Down
2 changes: 1 addition & 1 deletion task/monorail-server/src/bsp/sidecar_bcd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

use drv_front_io_api::phy_smi::PhySmi;
use drv_monorail_api::MonorailError;
use drv_sidecar_front_io::phy_smi::PhySmi;
use drv_sidecar_seq_api::Sequencer;
use idol_runtime::RequestError;
use ringbuf::*;
Expand Down
Loading