From 262304a0731b1f1b13c7027bd4af923368265937 Mon Sep 17 00:00:00 2001 From: MorganTL Date: Tue, 29 Aug 2023 10:49:30 +0800 Subject: [PATCH 1/2] add has_virtual_leds cfg flag gate --- src/gateware/kasli_soc.py | 2 ++ src/libboard_artiq/src/io_expander.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/gateware/kasli_soc.py b/src/gateware/kasli_soc.py index 106e6cb..b7341ff 100755 --- a/src/gateware/kasli_soc.py +++ b/src/gateware/kasli_soc.py @@ -310,6 +310,7 @@ class GenericMaster(SoCCore): self.add_csr_group("grabber", self.grabber_csr_group) + self.rustc_cfg["has_virtual_leds"] = None self.submodules.virtual_leds = virtual_leds.VirtualLeds() self.csr_devices.append("virtual_leds") @@ -482,6 +483,7 @@ class GenericSatellite(SoCCore): self.add_csr_group("grabber", self.grabber_csr_group) # no RTIO CRG here + self.rustc_cfg["has_virtual_leds"] = None self.submodules.virtual_leds = virtual_leds.VirtualLeds() self.csr_devices.append("virtual_leds") diff --git a/src/libboard_artiq/src/io_expander.rs b/src/libboard_artiq/src/io_expander.rs index f9d79ac..e7f659d 100644 --- a/src/libboard_artiq/src/io_expander.rs +++ b/src/libboard_artiq/src/io_expander.rs @@ -152,6 +152,7 @@ impl IoExpander { } pub fn service(&mut self, i2c: &mut i2c::I2c) -> Result<(), &'static str> { + #[cfg(has_virtual_leds)] for (led, port, bit) in self.virtual_led_mapping.iter() { let level = unsafe { csr::virtual_leds::status_read() >> led & 1 }; self.set(*port, *bit, level != 0); -- 2.42.0 From b5f58401c568d813e237c81e59ad84d5a48a2a39 Mon Sep 17 00:00:00 2001 From: MorganTL Date: Wed, 30 Aug 2023 15:04:38 +0800 Subject: [PATCH 2/2] remove rustc_cfg["has_virtual_leds"] --- src/gateware/kasli_soc.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gateware/kasli_soc.py b/src/gateware/kasli_soc.py index b7341ff..106e6cb 100755 --- a/src/gateware/kasli_soc.py +++ b/src/gateware/kasli_soc.py @@ -310,7 +310,6 @@ class GenericMaster(SoCCore): self.add_csr_group("grabber", self.grabber_csr_group) - self.rustc_cfg["has_virtual_leds"] = None self.submodules.virtual_leds = virtual_leds.VirtualLeds() self.csr_devices.append("virtual_leds") @@ -483,7 +482,6 @@ class GenericSatellite(SoCCore): self.add_csr_group("grabber", self.grabber_csr_group) # no RTIO CRG here - self.rustc_cfg["has_virtual_leds"] = None self.submodules.virtual_leds = virtual_leds.VirtualLeds() self.csr_devices.append("virtual_leds") -- 2.42.0