-runtime main: rename function

- satman: change i2c0..1 to use raw pointer
- add reverted SFP LED commit

src/libboard_artiq/src/io_expander.rs

@@ -39,16 +39,27 @@ pub struct IoExpander<'a> {
     out_current: [u8; 2],
     out_target: [u8; 2],
     registers: Registers,
+    virtual_led_mapping: &'static [(u8, u8, u8)],
+    channel: usize,
 }
 
 impl<'a> IoExpander<'a> {
     pub fn new(i2c: &'a mut i2c::I2c, index: u8) -> Result<Self, &'static str> {
+        #[cfg(hw_rev = "v1.0")]
+        const VIRTUAL_LED_MAPPING0: [(u8, u8, u8); 2] = [(0, 0, 6), (1, 1, 6)];
+        #[cfg(hw_rev = "v1.1")]
+        const VIRTUAL_LED_MAPPING0: [(u8, u8, u8); 2] = [(0, 0, 7), (1, 1, 6)];
+
+        const VIRTUAL_LED_MAPPING1: [(u8, u8, u8); 2] = [(2, 0, 6), (3, 1, 6)];
+
         // Both expanders on SHARED I2C bus
         let mut io_expander = match index {
             0 => IoExpander {
                 i2c,
+                channel: 0,
                 address: 0x40,
-                iodir: [0xff; 2],
+                virtual_led_mapping: &VIRTUAL_LED_MAPPING0,
+                iodir: IO_DIR_MAPPING0,
                 out_current: [0; 2],
                 out_target: [0; 2],
                 registers: Registers {
@@ -60,8 +71,10 @@ impl<'a> IoExpander<'a> {
             },
             1 => IoExpander {
                 i2c,
+                channel: 1,
                 address: 0x42,
-                iodir: [0xff; 2],
+                virtual_led_mapping: &VIRTUAL_LED_MAPPING1,
+                iodir: IO_DIR_MAPPING1,
                 out_current: [0; 2],
                 out_target: [0; 2],
                 registers: Registers {
@@ -121,6 +134,13 @@ impl<'a> IoExpander<'a> {
 
     pub fn init(&mut self) -> Result<(), &'static str> {
         self.select()?;
+
+        self.iodir = match self.channel {
+            0 => IO_DIR_MAPPING0,
+            1 => IO_DIR_MAPPING1,
+            _ => [IO_DIR_INPUT_ALL; 2],
+        };
+
         self.update_iodir()?;
 
         self.out_current[0] = 0x00;

src/runtime/src/main.rs

@@ -118,7 +118,7 @@ fn wait_for_virtual_leds_change() -> nb::Result<(), Void> {
     }
 }
 #[cfg(all(feature = "target_kasli_soc", has_drtio))]
-async fn async_rtio_led() {
+async fn async_io_expanders_service() {
     let mut io_expander0 = io_expander::IoExpander::new(unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() }, 0).unwrap();
     let mut io_expander1 = io_expander::IoExpander::new(unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() }, 1).unwrap();
     loop {
@@ -156,8 +156,6 @@ pub fn main_core0() {
             let mut io_expander = io_expander::IoExpander::new(i2c, expander_i).unwrap();
             io_expander.init().expect("I2C I/O expander #0 initialization failed");
             // Actively drive TX_DISABLE to false on SFP0..3
-            io_expander.set_oe(0, 1 << 1).unwrap();
-            io_expander.set_oe(1, 1 << 1).unwrap();
             io_expander.set(0, 1, false);
             io_expander.set(1, 1, false);
             io_expander.service().unwrap();
@@ -176,5 +174,8 @@ pub fn main_core0() {
 
     task::spawn(report_async_rtio_errors());
 
+    #[cfg(all(feature = "target_kasli_soc", has_drtio))]
+    task::spawn(async_io_expanders_service());
+
     comms::main(timer, cfg);
 }

src/satman/src/main.rs

@@ -610,6 +610,7 @@ pub extern "C" fn main_core0() -> i32 {
     ram::init_alloc_core0();
 
     let mut i2c = I2c::i2c0();
+    let i2c_ptr = &mut i2c as *mut I2c;
     i2c.init().expect("I2C initialization failed");
     #[cfg(feature = "target_kasli_soc")]
     {
@@ -617,8 +618,6 @@ pub extern "C" fn main_core0() -> i32 {
             let mut io_expander = io_expander::IoExpander::new(&mut i2c, expander_i).unwrap();
             io_expander.init().expect("I2C I/O expander #0 initialization failed");
             // Actively drive TX_DISABLE to false on SFP0..3
-            io_expander.set_oe(0, 1 << 1).unwrap();
-            io_expander.set_oe(1, 1 << 1).unwrap();
             io_expander.set(0, 1, false);
             io_expander.set(1, 1, false);
             io_expander.service().unwrap();
@@ -657,11 +656,8 @@ pub extern "C" fn main_core0() -> i32 {
 
     let mut hardware_tick_ts = 0;
 
-    let mut i2c0 = I2c::i2c0();
+    let mut io_expander0 = io_expander::IoExpander::new(unsafe { &mut *i2c_ptr }, 0).unwrap();
-    let mut i2c1 = I2c::i2c0();
+    let mut io_expander1 = io_expander::IoExpander::new(unsafe { &mut *i2c_ptr }, 1).unwrap();
-    i2c0.init().expect("I2C0 initialization failed");
-    let mut io_expander0 = io_expander::IoExpander::new(&mut i2c0, 0).unwrap();
-    let mut io_expander1 = io_expander::IoExpander::new(&mut i2c1, 1).unwrap();
 
     loop {
         while !drtiosat_link_rx_up() {