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

Port io_expander code from Kasli #214

Merged
sb10q merged 4 commits from esavkin/artiq-zynq:213-sfp-fiber-support into master 2023-02-16 10:29:06 +08:00
Conversation 1 Commits 4 Files Changed 2 +23 -17
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8230a01701 - Show all commits

39
src/runtime/src/io_expander.rs
View File

@ -11,9 +11,9 @@ struct Registers {
} }
pub struct IoExpander { pub struct IoExpander {
busno: u8, busno: i32,
port: u8, port: u8,
address: u8, address: i32,
virtual_led_mapping: &'static [(u8, u8, u8)], virtual_led_mapping: &'static [(u8, u8, u8)],
iodir: [u8; 2], iodir: [u8; 2],
out_current: [u8; 2], out_current: [u8; 2],
@ -22,7 +22,7 @@ pub struct IoExpander {
} }
impl IoExpander { impl IoExpander {
#[cfg(all(soc_platform = "kasli", hw_rev = "v2.0"))] #[cfg(feature = "target_kasli_soc")]
pub fn new(index: u8) -> Result<Self, &'static str> { pub fn new(index: u8) -> Result<Self, &'static str> {
const VIRTUAL_LED_MAPPING0: [(u8, u8, u8); 2] = [(0, 0, 6), (1, 1, 6)]; const VIRTUAL_LED_MAPPING0: [(u8, u8, u8); 2] = [(0, 0, 6), (1, 1, 6)];
const VIRTUAL_LED_MAPPING1: [(u8, u8, u8); 2] = [(2, 0, 6), (3, 1, 6)]; const VIRTUAL_LED_MAPPING1: [(u8, u8, u8); 2] = [(2, 0, 6), (3, 1, 6)];
@ -81,29 +81,34 @@ impl IoExpander {
Ok(io_expander) Ok(io_expander)
} }
#[cfg(soc_platform = "kasli")] #[cfg(feature = "target_kasli_soc")]
fn select(&self) -> Result<(), &'static str> { fn select(&self) -> Result<(), &'static str> {
let mask: u16 = 1 << self.port; let mask: i32 = 1 << self.port;
i2c::switch_select(self.busno, 0x70, mask as u8)?; i2c::switch_select(self.busno, 0x70, mask);
i2c::switch_select(self.busno, 0x71, (mask >> 8) as u8)?; i2c::switch_select(self.busno, 0x71, (mask >> 8));
Ok(()) Ok(())
} }
#[cfg(not(feature = "target_kasli_soc"))]
fn select(&self) -> Result<(), &'static str> {
Err("the target is not supported yet")
}
fn write(&self, addr: u8, value: u8) -> Result<(), &'static str> { fn write(&self, addr: u8, value: u8) -> Result<(), &'static str> {
i2c::start(self.busno)?; i2c::start(self.busno);
i2c::write(self.busno, self.address)?; i2c::write(self.busno, self.address as i32);
i2c::write(self.busno, addr)?; i2c::write(self.busno, addr as i32);
i2c::write(self.busno, value)?; i2c::write(self.busno, value as i32);
i2c::stop(self.busno)?; i2c::stop(self.busno);
Ok(()) Ok(())
} }
fn check_ack(&self) -> Result<bool, &'static str> { fn check_ack(&self) -> Result<bool, &'static str> {
// Check for ack from io expander // Check for ack from io expander
self.select()?; self.select()?;
i2c::start(self.busno)?; i2c::start(self.busno);
let ack = i2c::write(self.busno, self.address)?; let ack = i2c::write(self.busno, self.address);
i2c::stop(self.busno)?; i2c::stop(self.busno);
Ok(ack) Ok(ack)
} }
@ -144,8 +149,8 @@ impl IoExpander {
pub fn service(&mut self) -> Result<(), &'static str> { pub fn service(&mut self) -> Result<(), &'static str> {
for (led, port, bit) in self.virtual_led_mapping.iter() { for (led, port, bit) in self.virtual_led_mapping.iter() {
let level = unsafe { (csr::virtual_leds::status_read() >> led) & 1 }; //let level = unsafe { (csr::virtual_leds::status_read() >> led) & 1 };
self.set(*port, *bit, level != 0); self.set(*port, *bit, true);
} }
if self.out_target != self.out_current { if self.out_target != self.out_current {

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

@ -46,6 +46,7 @@ mod mgmt;
mod analyzer; mod analyzer;
mod irq; mod irq;
mod i2c; mod i2c;
#[cfg(feature = "target_kasli_soc")]
mod io_expander; mod io_expander;
static mut SEEN_ASYNC_ERRORS: u8 = 0; static mut SEEN_ASYNC_ERRORS: u8 = 0;