diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-12-26 05:06:15 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-12-26 05:06:15 +0100 |
| commit | 147609d3bde445b663d0e75c8bccdb152b9c7e1e (patch) | |
| tree | 451d75b390e751e2ef6401b0b60c137bcaf92b29 /examples/std/src/tuntap.rs | |
| parent | c29657f95a835dd0893333be409ded1efde9a9b9 (diff) | |
| parent | 007246b16036c3aa874e78d0665567a27ab35fa9 (diff) | |
Merge pull request #1129 from embassy-rs/net-driver
net: driver crate split
Diffstat (limited to 'examples/std/src/tuntap.rs')
| -rw-r--r-- | examples/std/src/tuntap.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/std/src/tuntap.rs b/examples/std/src/tuntap.rs index bb3e194cc..d918a2e62 100644 --- a/examples/std/src/tuntap.rs +++ b/examples/std/src/tuntap.rs | |||
| @@ -4,7 +4,7 @@ use std::os::unix::io::{AsRawFd, RawFd}; | |||
| 4 | use std::task::Context; | 4 | use std::task::Context; |
| 5 | 5 | ||
| 6 | use async_io::Async; | 6 | use async_io::Async; |
| 7 | use embassy_net::device::{self, Device, DeviceCapabilities, LinkState}; | 7 | use embassy_net_driver::{self, Capabilities, Driver, LinkState}; |
| 8 | use log::*; | 8 | use log::*; |
| 9 | 9 | ||
| 10 | pub const SIOCGIFMTU: libc::c_ulong = 0x8921; | 10 | pub const SIOCGIFMTU: libc::c_ulong = 0x8921; |
| @@ -137,7 +137,7 @@ impl TunTapDevice { | |||
| 137 | } | 137 | } |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | impl Device for TunTapDevice { | 140 | impl Driver for TunTapDevice { |
| 141 | type RxToken<'a> = RxToken where Self: 'a; | 141 | type RxToken<'a> = RxToken where Self: 'a; |
| 142 | type TxToken<'a> = TxToken<'a> where Self: 'a; | 142 | type TxToken<'a> = TxToken<'a> where Self: 'a; |
| 143 | 143 | ||
| @@ -170,8 +170,8 @@ impl Device for TunTapDevice { | |||
| 170 | }) | 170 | }) |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | fn capabilities(&self) -> DeviceCapabilities { | 173 | fn capabilities(&self) -> Capabilities { |
| 174 | let mut caps = DeviceCapabilities::default(); | 174 | let mut caps = Capabilities::default(); |
| 175 | caps.max_transmission_unit = self.device.get_ref().mtu; | 175 | caps.max_transmission_unit = self.device.get_ref().mtu; |
| 176 | caps | 176 | caps |
| 177 | } | 177 | } |
| @@ -190,7 +190,7 @@ pub struct RxToken { | |||
| 190 | buffer: Vec<u8>, | 190 | buffer: Vec<u8>, |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | impl device::RxToken for RxToken { | 193 | impl embassy_net_driver::RxToken for RxToken { |
| 194 | fn consume<R, F>(mut self, f: F) -> R | 194 | fn consume<R, F>(mut self, f: F) -> R |
| 195 | where | 195 | where |
| 196 | F: FnOnce(&mut [u8]) -> R, | 196 | F: FnOnce(&mut [u8]) -> R, |
| @@ -204,7 +204,7 @@ pub struct TxToken<'a> { | |||
| 204 | device: &'a mut Async<TunTap>, | 204 | device: &'a mut Async<TunTap>, |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | impl<'a> device::TxToken for TxToken<'a> { | 207 | impl<'a> embassy_net_driver::TxToken for TxToken<'a> { |
| 208 | fn consume<R, F>(self, len: usize, f: F) -> R | 208 | fn consume<R, F>(self, len: usize, f: F) -> R |
| 209 | where | 209 | where |
| 210 | F: FnOnce(&mut [u8]) -> R, | 210 | F: FnOnce(&mut [u8]) -> R, |
