Skip to content
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

Wait for tx buffers to be available for request fn #3609

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Wait for tx buffers to be available for request fn #3609

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
18 changes: 17 additions & 1 deletion embassy-net-nrf91/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ async fn new_internal<'a>(

tx_seq_no: 0,
tx_buf_used: [false; TX_BUF_COUNT],
tx_waker: WakerRegistration::new(),

trace_chans: Vec::new(),
trace_check: PointerChecker {
Expand Down Expand Up @@ -311,6 +312,7 @@ struct StateInner {

tx_seq_no: u16,
tx_buf_used: [bool; TX_BUF_COUNT],
tx_waker: WakerRegistration,

trace_chans: Vec<TraceChannelInfo, TRACE_CHANNEL_COUNT>,
trace_check: PointerChecker,
Expand Down Expand Up @@ -522,6 +524,7 @@ impl StateInner {
msg.data = ptr::null_mut();
msg.data_len = 0;
self.tx_buf_used[buf_idx] = false;
self.tx_waker.wake();
Err(e)
} else {
Ok(())
Expand Down Expand Up @@ -586,6 +589,7 @@ impl StateInner {
);
}
self.tx_buf_used[idx] = false;
self.tx_waker.wake();
}

fn handle_data(&mut self, msg: &Message, ch: &mut ch::Runner<MTU>) {
Expand Down Expand Up @@ -761,10 +765,22 @@ impl<'a> Control<'a> {
state.next_req_serial = state.next_req_serial.wrapping_add(1);
}

drop(state); // don't borrow state across awaits.

msg.param[0..4].copy_from_slice(&req_serial.to_le_bytes());
unwrap!(state.send_message(msg, req_data));

poll_fn(|cx| {
let mut state = self.state.borrow_mut();
state.tx_waker.register(cx.waker());
match state.send_message(msg, req_data) {
Ok(_) => Poll::Ready(()),
Err(NoFreeBufs) => Poll::Pending,
}
})
.await;

// Setup the pending request state.
let mut state = self.state.borrow_mut();
let (req_slot_idx, req_slot) = state
.requests
.iter_mut()
Expand Down
Loading