itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-10-02 22:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3620 from embassy-rs/nrf91-net-fd

Browse Source 
Keep track of raw fd used for net data
This commit is contained in:
Dario Nieuwenhuis 2024-12-06 22:34:46 +00:00 committed by GitHub
commit 48d00bd74c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
embassy-net-nrf91/src/lib.rs
View File

@ -198,6 +198,7 @@ async fn new_internal<'a>(
cb, cb,
requests: [const { None }; REQ_COUNT], requests: [const { None }; REQ_COUNT],
next_req_serial: 0x12345678, next_req_serial: 0x12345678,
net_fd: None,
rx_control_list: ptr::null_mut(), rx_control_list: ptr::null_mut(),
rx_data_list: ptr::null_mut(), rx_data_list: ptr::null_mut(),
@ -305,6 +306,8 @@ struct StateInner {
requests: [Option<PendingRequest>; REQ_COUNT], requests: [Option<PendingRequest>; REQ_COUNT],
next_req_serial: u32, next_req_serial: u32,
net_fd: Option<u32>,
rx_control_list: *mut List, rx_control_list: *mut List,
rx_data_list: *mut List, rx_data_list: *mut List,
rx_seq_no: u16, rx_seq_no: u16,
@ -885,6 +888,8 @@ impl<'a> Control<'a> {
assert_eq!(status, 0); assert_eq!(status, 0);
assert_eq!(msg.param_len, 16); assert_eq!(msg.param_len, 16);
let fd = u32::from_le_bytes(msg.param[12..16].try_into().unwrap()); let fd = u32::from_le_bytes(msg.param[12..16].try_into().unwrap());
self.state.borrow_mut().net_fd.replace(fd);
trace!("got FD: {}", fd); trace!("got FD: {}", fd);
fd fd
} }
@ -924,16 +929,17 @@ impl<'a> Runner<'a> {
state.poll(&mut self.trace_writer, &mut self.ch); state.poll(&mut self.trace_writer, &mut self.ch);
if let Poll::Ready(buf) = self.ch.poll_tx_buf(cx) { if let Poll::Ready(buf) = self.ch.poll_tx_buf(cx) {
let fd = 128u32; // TODO unhardcode if let Some(fd) = state.net_fd {
let mut msg: Message = unsafe { mem::zeroed() }; let mut msg: Message = unsafe { mem::zeroed() };
msg.channel = 2; // data msg.channel = 2; // data
msg.id = 0x7006_0004; // IP send msg.id = 0x7006_0004; // IP send
msg.param_len = 12; msg.param_len = 12;
msg.param[4..8].copy_from_slice(&fd.to_le_bytes()); msg.param[4..8].copy_from_slice(&fd.to_le_bytes());
if let Err(e) = state.send_message(&mut msg, buf) { if let Err(e) = state.send_message(&mut msg, buf) {
warn!("tx failed: {:?}", e); warn!("tx failed: {:?}", e);
}
self.ch.tx_done();
} }
self.ch.tx_done();
} }
Poll::Pending Poll::Pending