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

use csr::virtual_leds for SFP0..3 LED indication #244

Merged
sb10q merged 10 commits from morgan/artiq-zynq:feature into master 2023-08-28 16:08:11 +08:00
Conversation 0 Commits 10 Files Changed 4 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 097cfd9996 - Show all commits

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

@ -108,8 +108,9 @@ static mut LAST_VIRTUAL_LED_STATUS: u8 = 0;
#[cfg(all(feature = "target_kasli_soc", has_drtio))] #[cfg(all(feature = "target_kasli_soc", has_drtio))]
fn wait_for_virtual_leds_change() -> nb::Result<(), Void> { fn wait_for_virtual_leds_change() -> nb::Result<(), Void> {
unsafe { unsafe {
morgan marked this conversation as resolved Outdated
sb10q commented 2023-08-04 15:41:03 +08:00
Outdated
Review
Copy Link

The only unsafe line is the next one, no?

The only unsafe line is the next one, no?
morgan commented 2023-08-04 15:48:54 +08:00
Outdated
Review
Copy Link

LAST_VIRTUAL_LED_STATUS is a static mut. So it need an unsafe too

```LAST_VIRTUAL_LED_STATUS``` is a static mut. So it need an unsafe too
sb10q commented 2023-08-13 14:48:09 +08:00
Outdated
Review
Copy Link

I don't think this should be gated on has_drtio.

I don't think this should be gated on has_drtio.
if pl::csr::virtual_leds::status_read() != LAST_VIRTUAL_LED_STATUS { let current = pl::csr::virtual_leds::status_read();
LAST_VIRTUAL_LED_STATUS = pl::csr::virtual_leds::status_read(); if current != LAST_VIRTUAL_LED_STATUS {
morgan marked this conversation as resolved Outdated
mwojcik commented 2023-08-01 16:35:29 +08:00
Outdated
Review
Copy Link

Could save a CSR call by getting the value before the if

Could save a CSR call by getting the value before the ``if``
LAST_VIRTUAL_LED_STATUS = current;
Ok(()) Ok(())
} else { } else {
Err(nb::Error::WouldBlock) Err(nb::Error::WouldBlock)
@ -124,7 +125,6 @@ async fn async_rtio_led() {
let mut io_expander1 = io_expander::IoExpander::new(i2c1, 1).unwrap(); let mut io_expander1 = io_expander::IoExpander::new(i2c1, 1).unwrap();
morgan marked this conversation as resolved Outdated
sb10q commented 2023-08-04 15:42:28 +08:00
Outdated
Review
Copy Link

Just inline it.

 block_async!(|| {
   let current = unsafe { pl::csr::virtual_leds::status_read() };
   ...
Just inline it. ``` block_async!(|| { let current = unsafe { pl::csr::virtual_leds::status_read() }; ... ```
loop { loop {
let _ = block_async!(wait_for_virtual_leds_change()).await; let _ = block_async!(wait_for_virtual_leds_change()).await;
morgan marked this conversation as resolved Outdated
mwojcik commented 2023-08-01 16:32:15 +08:00
Outdated
Review
Copy Link

Debug leftover? Remove pls

Debug leftover? Remove pls
info!("switching");
io_expander0.service().expect("I2C I/O expander #0 service failed"); io_expander0.service().expect("I2C I/O expander #0 service failed");
io_expander1.service().expect("I2C I/O expander #1 service failed"); io_expander1.service().expect("I2C I/O expander #1 service failed");
} }