M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 13 Pull Requests Releases Wiki Activity

- inline i2c0..1 into io_expander

Browse Source 
- remove redundant i2c.init
This commit is contained in:
MorganTL 2023-08-02 17:41:58 +08:00
parent 097cfd9996
commit 3a9699589c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/src/main.rs
View File

@ -119,10 +119,8 @@ fn wait_for_virtual_leds_change() -> nb::Result<(), Void> {
} }
#[cfg(all(feature = "target_kasli_soc", has_drtio))] #[cfg(all(feature = "target_kasli_soc", has_drtio))]
async fn async_rtio_led() { async fn async_rtio_led() {
let i2c0 = unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() }; let mut io_expander0 = io_expander::IoExpander::new(unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() }, 0).unwrap();
let i2c1 = unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() }; let mut io_expander1 = io_expander::IoExpander::new(unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() }, 1).unwrap();
let mut io_expander0 = io_expander::IoExpander::new(i2c0, 0).unwrap();
let mut io_expander1 = io_expander::IoExpander::new(i2c1, 1).unwrap();
loop { loop {
let _ = block_async!(wait_for_virtual_leds_change()).await; let _ = block_async!(wait_for_virtual_leds_change()).await;
io_expander0.service().expect("I2C I/O expander #0 service failed"); io_expander0.service().expect("I2C I/O expander #0 service failed");

1
src/satman/src/main.rs
View File

@ -660,7 +660,6 @@ pub extern "C" fn main_core0() -> i32 {
let mut i2c0 = I2c::i2c0(); let mut i2c0 = I2c::i2c0();
let mut i2c1 = I2c::i2c0(); let mut i2c1 = I2c::i2c0();
i2c0.init().expect("I2C0 initialization failed"); i2c0.init().expect("I2C0 initialization failed");
i2c1.init().expect("I2C1 initialization failed");
let mut io_expander0 = io_expander::IoExpander::new(&mut i2c0, 0).unwrap(); let mut io_expander0 = io_expander::IoExpander::new(&mut i2c0, 0).unwrap();
let mut io_expander1 = io_expander::IoExpander::new(&mut i2c1, 1).unwrap(); let mut io_expander1 = io_expander::IoExpander::new(&mut i2c1, 1).unwrap();