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
6 changes: 1 addition & 5 deletions Cargo.lock

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

5 changes: 3 additions & 2 deletions drv/gimlet-seq-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use drv_spi_api::{SpiDevice, SpiServer};
use drv_stm32xx_sys_api as sys_api;
use idol_runtime::{NotificationHandler, RequestError};
use seq_spi::{Addr, Reg};
use spd::ee1004 as spd; // DDR4 SPD types
use static_assertions::const_assert;
use task_jefe_api::Jefe;

Expand Down Expand Up @@ -1342,7 +1343,7 @@ fn read_spd_data_and_load_packrat(
for nbank in 0..BANKS.len() as u8 {
let (controller, port, mux) = BANKS[nbank as usize];

let addr = spd::Function::PageAddress(spd::Page(0))
let addr = spd::Function::PageAddress(spd::Page::Page0)
.to_device_code()
.unwrap_lite();
let page =
Expand Down Expand Up @@ -1397,7 +1398,7 @@ fn read_spd_data_and_load_packrat(
}

// Now flip over to the top page.
let addr = spd::Function::PageAddress(spd::Page(1))
let addr = spd::Function::PageAddress(spd::Page::Page1)
.to_device_code()
.unwrap_lite();
let page =
Expand Down
3 changes: 2 additions & 1 deletion task/gimlet-spd/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use drv_cpu_seq_api::{NUM_SPD_BANKS, PowerState};
use drv_stm32xx_i2c::{I2cPins, I2cTargetControl};
use drv_stm32xx_sys_api::{OutputType, Pull, Speed, Sys};
use ringbuf::{ringbuf, ringbuf_entry};
use spd::ee1004 as spd; // DDR4 SPD types
use task_jefe_api::Jefe;
use task_packrat_api::Packrat;
use userlib::{
Expand Down Expand Up @@ -124,7 +125,7 @@ fn main() -> ! {
//
let ltc4306 = Cell::new(ltc4306::State::init());
let vbank = Cell::new(Some(0u8));
let page = Cell::new(spd::Page(0));
let page = Cell::new(spd::Page::Page0);
let voffs = RefCell::new(&mut voffs);

//
Expand Down
Loading