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

Merge pull request #1965 from oro-os/return-len-receive-enc28j60

Browse Source 
enc28j60: return packet length from receive() instead of mut slice
This commit is contained in:
Dario Nieuwenhuis 2023-09-28 16:32:22 +00:00 committed by GitHub
commit ce0d787781
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
embassy-net-enc28j60/src/lib.rs
View File

@ -197,7 +197,7 @@ where
/// Flushes the transmit buffer, ensuring all pending transmissions have completed /// Flushes the transmit buffer, ensuring all pending transmissions have completed
/// NOTE: The returned packet *must* be `read` or `ignore`-d, otherwise this method will always /// NOTE: The returned packet *must* be `read` or `ignore`-d, otherwise this method will always
/// return `None` on subsequent invocations /// return `None` on subsequent invocations
pub fn receive<'a>(&mut self, buf: &'a mut [u8]) -> Option<&'a mut [u8]> { pub fn receive(&mut self, buf: &mut [u8]) -> Option<usize> {
if self.pending_packets() == 0 { if self.pending_packets() == 0 {
// Errata #6: we can't rely on PKTIF so we check PKTCNT // Errata #6: we can't rely on PKTIF so we check PKTCNT
return None; return None;
@ -241,7 +241,7 @@ where
self.next_packet = next_packet; self.next_packet = next_packet;
Some(&mut buf[..len as usize]) Some(len as usize)
} }
fn wait_tx_ready(&mut self) { fn wait_tx_ready(&mut self) {
@ -642,9 +642,8 @@ where
fn receive(&mut self, cx: &mut core::task::Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { fn receive(&mut self, cx: &mut core::task::Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> {
let rx_buf = unsafe { &mut RX_BUF }; let rx_buf = unsafe { &mut RX_BUF };
let tx_buf = unsafe { &mut TX_BUF }; let tx_buf = unsafe { &mut TX_BUF };
if let Some(pkt) = self.receive(rx_buf) { if let Some(n) = self.receive(rx_buf) {
let n = pkt.len(); Some((RxToken { buf: &mut rx_buf[..n] }, TxToken { buf: tx_buf, eth: self }))
Some((RxToken { buf: &mut pkt[..n] }, TxToken { buf: tx_buf, eth: self }))
} else { } else {
cx.waker().wake_by_ref(); cx.waker().wake_by_ref();
None None