Skip to content

fix(ast10x0-i2c): handle buffer-mode rx and smbus probe #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pojuiatwork3881154 wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −6
Draft

fix(ast10x0-i2c): handle buffer-mode rx and smbus probe #335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions target/ast10x0/peripherals/i2c/slave.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,12 +498,7 @@ impl<Y: FnMut(u32)> Ast1060I2c<'_, Y> {
.write(|w| w.bits(constants::AST_I2CS_PKT_DONE));
}
let sts = status & (!(constants::AST_I2CS_PKT_DONE | constants::AST_I2CS_PKT_ERROR));
if sts == constants::AST_I2CS_SLAVE_MATCH
|| sts == constants::AST_I2CS_SLAVE_MATCH | constants::AST_I2CS_RX_DONE
{
// S: Sw
return Some(SlaveEvent::WriteRequest);
} else if sts == constants::AST_I2CS_SLAVE_MATCH | constants::AST_I2CS_WAIT_RX_DMA
if sts == constants::AST_I2CS_SLAVE_MATCH | constants::AST_I2CS_WAIT_RX_DMA
|| sts
== constants::AST_I2CS_SLAVE_MATCH
| constants::AST_I2CS_RX_DONE
Expand All @@ -517,6 +512,24 @@ impl<Y: FnMut(u32)> Ast1060I2c<'_, Y> {
return Some(SlaveEvent::DataReceived {
len: self.slave_rx_len(),
});
} else if sts == constants::AST_I2CS_SLAVE_MATCH | constants::AST_I2CS_RX_DONE {
// S: Sw|D (buffer mode — no WAIT_RX_DMA bit)
self.arm_slave_receive(&mut cmd);
unsafe {
self.regs().i2cs28().write(|w| w.bits(cmd));
}
return Some(SlaveEvent::DataReceived {
len: self.slave_rx_len(),
});
} else if sts == constants::AST_I2CS_SLAVE_MATCH {
// S: Sw — address match only (e.g. SMBus quick probe); re-arm and
// clear status so the bus does not clock-stretch until timeout.
self.arm_slave_receive(&mut cmd);
unsafe {
self.regs().i2cs28().write(|w| w.bits(cmd));
self.regs().i2cs24().write(|w| w.bits(sts));
}
return Some(SlaveEvent::WriteRequest);
} else if sts == constants::AST_I2CS_SLAVE_MATCH | constants::AST_I2CS_STOP {
// S: Sw|P
self.arm_slave_receive(&mut cmd);
Expand Down