diff options
| author | Tyler <[email protected]> | 2023-09-29 20:02:24 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-09-29 20:02:24 -0600 |
| commit | 2f9b59c5cf21f1e2761a9ccefdfd86f0edea829c (patch) | |
| tree | 8964744b4fb753cf98f6f413464106c4d2a72976 /embassy-net/src/device.rs | |
| parent | ce91fb2bfc846570ef543a09396c428d70675245 (diff) | |
| parent | 95b3d9eb3b3657de3d7bc9c04f8fb83eae901640 (diff) | |
Merge branch 'main' into issue-1974-add-sai-driver
Diffstat (limited to 'embassy-net/src/device.rs')
| -rw-r--r-- | embassy-net/src/device.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/embassy-net/src/device.rs b/embassy-net/src/device.rs index d29ab8970..8c2b7d31a 100644 --- a/embassy-net/src/device.rs +++ b/embassy-net/src/device.rs | |||
| @@ -22,13 +22,13 @@ where | |||
| 22 | 22 | ||
| 23 | fn receive(&mut self, _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { | 23 | fn receive(&mut self, _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { |
| 24 | self.inner | 24 | self.inner |
| 25 | .receive(self.cx.as_deref_mut().unwrap()) | 25 | .receive(unwrap!(self.cx.as_deref_mut())) |
| 26 | .map(|(rx, tx)| (RxTokenAdapter(rx), TxTokenAdapter(tx))) | 26 | .map(|(rx, tx)| (RxTokenAdapter(rx), TxTokenAdapter(tx))) |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | /// Construct a transmit token. | 29 | /// Construct a transmit token. |
| 30 | fn transmit(&mut self, _timestamp: Instant) -> Option<Self::TxToken<'_>> { | 30 | fn transmit(&mut self, _timestamp: Instant) -> Option<Self::TxToken<'_>> { |
| 31 | self.inner.transmit(self.cx.as_deref_mut().unwrap()).map(TxTokenAdapter) | 31 | self.inner.transmit(unwrap!(self.cx.as_deref_mut())).map(TxTokenAdapter) |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | /// Get a description of device capabilities. | 34 | /// Get a description of device capabilities. |
