max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement minimal tx flow control

Browse Source 
The credit update code uses constants from
https://github.com/Infineon/wifi-host-driver/blob/master/WiFi_Host_Driver/src/whd_sdpcm.c#L307-L317
This commit is contained in:
Jan Niehusmann 2022-09-06 11:38:33 +00:00
parent 2bd7205c79
commit 95f3484b87
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib.rs
View File

@ -525,6 +525,8 @@ pub struct Runner<'a, PWR, SPI> {
ioctl_id: u16, ioctl_id: u16,
sdpcm_seq: u8, sdpcm_seq: u8,
backplane_window: u32, backplane_window: u32,
tx_seq_max: u8,
} }
pub async fn new<'a, PWR, SPI>( pub async fn new<'a, PWR, SPI>(
@ -546,6 +548,8 @@ where
ioctl_id: 0, ioctl_id: 0,
sdpcm_seq: 0, sdpcm_seq: 0,
backplane_window: 0xAAAA_AAAA, backplane_window: 0xAAAA_AAAA,
tx_seq_max: 1,
}; };
runner.init(firmware).await; runner.init(firmware).await;
@ -670,13 +674,17 @@ where
loop { loop {
// Send stuff // Send stuff
// TODO flow control // TODO flow control
if let IoctlState::Pending { kind, cmd, iface, buf } = self.state.ioctl_state.get() { if self.sdpcm_seq == self.tx_seq_max || self.tx_seq_max.wrapping_sub(self.sdpcm_seq) & 0x80 != 0 {
self.send_ioctl(kind, cmd, iface, unsafe { &*buf }).await; warn!("TX stalled");
self.state.ioctl_state.set(IoctlState::Sent { buf }); } else {
} if let IoctlState::Pending { kind, cmd, iface, buf } = self.state.ioctl_state.get() {
self.send_ioctl(kind, cmd, iface, unsafe { &*buf }).await;
self.state.ioctl_state.set(IoctlState::Sent { buf });
}
if let Ok(p) = self.state.tx_channel.try_recv() { if let Ok(p) = self.state.tx_channel.try_recv() {
self.send_packet(&p).await; self.send_packet(&p).await;
}
} }
// Receive stuff // Receive stuff
@ -788,6 +796,8 @@ where
return; return;
} }
self.update_credit(&sdpcm_header);
let channel = sdpcm_header.channel_and_flags & 0x0f; let channel = sdpcm_header.channel_and_flags & 0x0f;
let payload = &packet[sdpcm_header.header_length as _..]; let payload = &packet[sdpcm_header.header_length as _..];
@ -894,6 +904,16 @@ where
} }
} }
fn update_credit(&mut self, sdpcm_header: &SdpcmHeader) {
if sdpcm_header.channel_and_flags & 0xf < 3 {
let mut tx_seq_max = sdpcm_header.bus_data_credit;
if tx_seq_max - self.sdpcm_seq > 0x40 {
tx_seq_max = self.sdpcm_seq + 2;
}
self.tx_seq_max = tx_seq_max;
}
}
async fn send_ioctl(&mut self, kind: u32, cmd: u32, iface: u32, data: &[u8]) { async fn send_ioctl(&mut self, kind: u32, cmd: u32, iface: u32, data: &[u8]) {
let mut buf = [0; 512]; let mut buf = [0; 512];
let buf8 = slice8_mut(&mut buf); let buf8 = slice8_mut(&mut buf);