Compare commits
60 Commits
embassy-ne
...
salty-upda
Author | SHA1 | Date | |
---|---|---|---|
da5d577215 | |||
7591a6abc5 | |||
a5ce77cfb2 | |||
1211db46d5 | |||
6caf261a62 | |||
351eb33148 | |||
322606b5b9 | |||
b1c7c3f728 | |||
7c8eebe287 | |||
5d696f6d0d | |||
f058698c25 | |||
2c2783d795 | |||
81f7569a52 | |||
1df1f8e742 | |||
e65d6fa698 | |||
a7429a7f46 | |||
5151bac60c | |||
f993344b19 | |||
565ed78f91 | |||
d3f3c425a2 | |||
f4fb0a2467 | |||
3ee90e8d30 | |||
8da11edca5 | |||
49ba2036d6 | |||
fd48b8fa84 | |||
7f5526a9b1 | |||
b06e4a6ab4 | |||
d709aa231b | |||
91e107ea07 | |||
42f5c8109b | |||
0c2274a0e3 | |||
44cc1954a9 | |||
c4d9feb36e | |||
6181646314 | |||
fa6039c92b | |||
0f98fcdb19 | |||
992a9565a8 | |||
287f57b704 | |||
bee0edb3f8 | |||
d928228237 | |||
abbc2d73c3 | |||
ac28d39b95 | |||
51a70307f0 | |||
2cc9fea6d3 | |||
958b3c6de1 | |||
11157ddd15 | |||
1c56523341 | |||
39ac7e574f | |||
7a5d090810 | |||
ccf4d854f8 | |||
beb587ca22 | |||
b3e74ebc34 | |||
29114c849d | |||
4757257ac0 | |||
686ee2cb14 | |||
ea21052fde | |||
6513d03fdf | |||
0b26b2d360 | |||
08203d4c04 | |||
9d8dbd67fe |
@ -1,6 +1,5 @@
|
||||
#![no_std]
|
||||
#![doc = include_str!("../README.md")]
|
||||
#![warn(missing_docs)]
|
||||
|
||||
// must go first!
|
||||
mod fmt;
|
||||
@ -16,9 +15,6 @@ use embassy_sync::blocking_mutex::Mutex;
|
||||
use embassy_sync::waitqueue::WakerRegistration;
|
||||
use embassy_sync::zerocopy_channel;
|
||||
|
||||
/// Channel state.
|
||||
///
|
||||
/// Holds a buffer of packets with size MTU, for both TX and RX.
|
||||
pub struct State<const MTU: usize, const N_RX: usize, const N_TX: usize> {
|
||||
rx: [PacketBuf<MTU>; N_RX],
|
||||
tx: [PacketBuf<MTU>; N_TX],
|
||||
@ -28,7 +24,6 @@ pub struct State<const MTU: usize, const N_RX: usize, const N_TX: usize> {
|
||||
impl<const MTU: usize, const N_RX: usize, const N_TX: usize> State<MTU, N_RX, N_TX> {
|
||||
const NEW_PACKET: PacketBuf<MTU> = PacketBuf::new();
|
||||
|
||||
/// Create a new channel state.
|
||||
pub const fn new() -> Self {
|
||||
Self {
|
||||
rx: [Self::NEW_PACKET; N_RX],
|
||||
@ -44,45 +39,33 @@ struct StateInner<'d, const MTU: usize> {
|
||||
shared: Mutex<NoopRawMutex, RefCell<Shared>>,
|
||||
}
|
||||
|
||||
/// State of the LinkState
|
||||
struct Shared {
|
||||
link_state: LinkState,
|
||||
waker: WakerRegistration,
|
||||
hardware_address: driver::HardwareAddress,
|
||||
}
|
||||
|
||||
/// Channel runner.
|
||||
///
|
||||
/// Holds the shared state and the lower end of channels for inbound and outbound packets.
|
||||
pub struct Runner<'d, const MTU: usize> {
|
||||
tx_chan: zerocopy_channel::Receiver<'d, NoopRawMutex, PacketBuf<MTU>>,
|
||||
rx_chan: zerocopy_channel::Sender<'d, NoopRawMutex, PacketBuf<MTU>>,
|
||||
shared: &'d Mutex<NoopRawMutex, RefCell<Shared>>,
|
||||
}
|
||||
|
||||
/// State runner.
|
||||
///
|
||||
/// Holds the shared state of the channel such as link state.
|
||||
#[derive(Clone, Copy)]
|
||||
pub struct StateRunner<'d> {
|
||||
shared: &'d Mutex<NoopRawMutex, RefCell<Shared>>,
|
||||
}
|
||||
|
||||
/// RX runner.
|
||||
///
|
||||
/// Holds the lower end of the channel for passing inbound packets up the stack.
|
||||
pub struct RxRunner<'d, const MTU: usize> {
|
||||
rx_chan: zerocopy_channel::Sender<'d, NoopRawMutex, PacketBuf<MTU>>,
|
||||
}
|
||||
|
||||
/// TX runner.
|
||||
///
|
||||
/// Holds the lower end of the channel for passing outbound packets down the stack.
|
||||
pub struct TxRunner<'d, const MTU: usize> {
|
||||
tx_chan: zerocopy_channel::Receiver<'d, NoopRawMutex, PacketBuf<MTU>>,
|
||||
}
|
||||
|
||||
impl<'d, const MTU: usize> Runner<'d, MTU> {
|
||||
/// Split the runner into separate runners for controlling state, rx and tx.
|
||||
pub fn split(self) -> (StateRunner<'d>, RxRunner<'d, MTU>, TxRunner<'d, MTU>) {
|
||||
(
|
||||
StateRunner { shared: self.shared },
|
||||
@ -91,7 +74,6 @@ impl<'d, const MTU: usize> Runner<'d, MTU> {
|
||||
)
|
||||
}
|
||||
|
||||
/// Split the runner into separate runners for controlling state, rx and tx borrowing the underlying state.
|
||||
pub fn borrow_split(&mut self) -> (StateRunner<'_>, RxRunner<'_, MTU>, TxRunner<'_, MTU>) {
|
||||
(
|
||||
StateRunner { shared: self.shared },
|
||||
@ -104,12 +86,10 @@ impl<'d, const MTU: usize> Runner<'d, MTU> {
|
||||
)
|
||||
}
|
||||
|
||||
/// Create a state runner sharing the state channel.
|
||||
pub fn state_runner(&self) -> StateRunner<'d> {
|
||||
StateRunner { shared: self.shared }
|
||||
}
|
||||
|
||||
/// Set the link state.
|
||||
pub fn set_link_state(&mut self, state: LinkState) {
|
||||
self.shared.lock(|s| {
|
||||
let s = &mut *s.borrow_mut();
|
||||
@ -118,7 +98,6 @@ impl<'d, const MTU: usize> Runner<'d, MTU> {
|
||||
});
|
||||
}
|
||||
|
||||
/// Set the hardware address.
|
||||
pub fn set_hardware_address(&mut self, address: driver::HardwareAddress) {
|
||||
self.shared.lock(|s| {
|
||||
let s = &mut *s.borrow_mut();
|
||||
@ -127,19 +106,16 @@ impl<'d, const MTU: usize> Runner<'d, MTU> {
|
||||
});
|
||||
}
|
||||
|
||||
/// Wait until there is space for more inbound packets and return a slice they can be copied into.
|
||||
pub async fn rx_buf(&mut self) -> &mut [u8] {
|
||||
let p = self.rx_chan.send().await;
|
||||
&mut p.buf
|
||||
}
|
||||
|
||||
/// Check if there is space for more inbound packets right now.
|
||||
pub fn try_rx_buf(&mut self) -> Option<&mut [u8]> {
|
||||
let p = self.rx_chan.try_send()?;
|
||||
Some(&mut p.buf)
|
||||
}
|
||||
|
||||
/// Polling the inbound channel if there is space for packets.
|
||||
pub fn poll_rx_buf(&mut self, cx: &mut Context) -> Poll<&mut [u8]> {
|
||||
match self.rx_chan.poll_send(cx) {
|
||||
Poll::Ready(p) => Poll::Ready(&mut p.buf),
|
||||
@ -147,26 +123,22 @@ impl<'d, const MTU: usize> Runner<'d, MTU> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Mark packet of len bytes as pushed to the inbound channel.
|
||||
pub fn rx_done(&mut self, len: usize) {
|
||||
let p = self.rx_chan.try_send().unwrap();
|
||||
p.len = len;
|
||||
self.rx_chan.send_done();
|
||||
}
|
||||
|
||||
/// Wait until there is space for more outbound packets and return a slice they can be copied into.
|
||||
pub async fn tx_buf(&mut self) -> &mut [u8] {
|
||||
let p = self.tx_chan.receive().await;
|
||||
&mut p.buf[..p.len]
|
||||
}
|
||||
|
||||
/// Check if there is space for more outbound packets right now.
|
||||
pub fn try_tx_buf(&mut self) -> Option<&mut [u8]> {
|
||||
let p = self.tx_chan.try_receive()?;
|
||||
Some(&mut p.buf[..p.len])
|
||||
}
|
||||
|
||||
/// Polling the outbound channel if there is space for packets.
|
||||
pub fn poll_tx_buf(&mut self, cx: &mut Context) -> Poll<&mut [u8]> {
|
||||
match self.tx_chan.poll_receive(cx) {
|
||||
Poll::Ready(p) => Poll::Ready(&mut p.buf[..p.len]),
|
||||
@ -174,14 +146,12 @@ impl<'d, const MTU: usize> Runner<'d, MTU> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Mark outbound packet as copied.
|
||||
pub fn tx_done(&mut self) {
|
||||
self.tx_chan.receive_done();
|
||||
}
|
||||
}
|
||||
|
||||
impl<'d> StateRunner<'d> {
|
||||
/// Set link state.
|
||||
pub fn set_link_state(&self, state: LinkState) {
|
||||
self.shared.lock(|s| {
|
||||
let s = &mut *s.borrow_mut();
|
||||
@ -190,7 +160,6 @@ impl<'d> StateRunner<'d> {
|
||||
});
|
||||
}
|
||||
|
||||
/// Set the hardware address.
|
||||
pub fn set_hardware_address(&self, address: driver::HardwareAddress) {
|
||||
self.shared.lock(|s| {
|
||||
let s = &mut *s.borrow_mut();
|
||||
@ -201,19 +170,16 @@ impl<'d> StateRunner<'d> {
|
||||
}
|
||||
|
||||
impl<'d, const MTU: usize> RxRunner<'d, MTU> {
|
||||
/// Wait until there is space for more inbound packets and return a slice they can be copied into.
|
||||
pub async fn rx_buf(&mut self) -> &mut [u8] {
|
||||
let p = self.rx_chan.send().await;
|
||||
&mut p.buf
|
||||
}
|
||||
|
||||
/// Check if there is space for more inbound packets right now.
|
||||
pub fn try_rx_buf(&mut self) -> Option<&mut [u8]> {
|
||||
let p = self.rx_chan.try_send()?;
|
||||
Some(&mut p.buf)
|
||||
}
|
||||
|
||||
/// Polling the inbound channel if there is space for packets.
|
||||
pub fn poll_rx_buf(&mut self, cx: &mut Context) -> Poll<&mut [u8]> {
|
||||
match self.rx_chan.poll_send(cx) {
|
||||
Poll::Ready(p) => Poll::Ready(&mut p.buf),
|
||||
@ -221,7 +187,6 @@ impl<'d, const MTU: usize> RxRunner<'d, MTU> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Mark packet of len bytes as pushed to the inbound channel.
|
||||
pub fn rx_done(&mut self, len: usize) {
|
||||
let p = self.rx_chan.try_send().unwrap();
|
||||
p.len = len;
|
||||
@ -230,19 +195,16 @@ impl<'d, const MTU: usize> RxRunner<'d, MTU> {
|
||||
}
|
||||
|
||||
impl<'d, const MTU: usize> TxRunner<'d, MTU> {
|
||||
/// Wait until there is space for more outbound packets and return a slice they can be copied into.
|
||||
pub async fn tx_buf(&mut self) -> &mut [u8] {
|
||||
let p = self.tx_chan.receive().await;
|
||||
&mut p.buf[..p.len]
|
||||
}
|
||||
|
||||
/// Check if there is space for more outbound packets right now.
|
||||
pub fn try_tx_buf(&mut self) -> Option<&mut [u8]> {
|
||||
let p = self.tx_chan.try_receive()?;
|
||||
Some(&mut p.buf[..p.len])
|
||||
}
|
||||
|
||||
/// Polling the outbound channel if there is space for packets.
|
||||
pub fn poll_tx_buf(&mut self, cx: &mut Context) -> Poll<&mut [u8]> {
|
||||
match self.tx_chan.poll_receive(cx) {
|
||||
Poll::Ready(p) => Poll::Ready(&mut p.buf[..p.len]),
|
||||
@ -250,18 +212,11 @@ impl<'d, const MTU: usize> TxRunner<'d, MTU> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Mark outbound packet as copied.
|
||||
pub fn tx_done(&mut self) {
|
||||
self.tx_chan.receive_done();
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a channel.
|
||||
///
|
||||
/// Returns a pair of handles for interfacing with the peripheral and the networking stack.
|
||||
///
|
||||
/// The runner is interfacing with the peripheral at the lower part of the stack.
|
||||
/// The device is interfacing with the networking stack on the layer above.
|
||||
pub fn new<'d, const MTU: usize, const N_RX: usize, const N_TX: usize>(
|
||||
state: &'d mut State<MTU, N_RX, N_TX>,
|
||||
hardware_address: driver::HardwareAddress,
|
||||
@ -302,22 +257,17 @@ pub fn new<'d, const MTU: usize, const N_RX: usize, const N_TX: usize>(
|
||||
)
|
||||
}
|
||||
|
||||
/// Represents a packet of size MTU.
|
||||
pub struct PacketBuf<const MTU: usize> {
|
||||
len: usize,
|
||||
buf: [u8; MTU],
|
||||
}
|
||||
|
||||
impl<const MTU: usize> PacketBuf<MTU> {
|
||||
/// Create a new packet buffer.
|
||||
pub const fn new() -> Self {
|
||||
Self { len: 0, buf: [0; MTU] }
|
||||
}
|
||||
}
|
||||
|
||||
/// Channel device.
|
||||
///
|
||||
/// Holds the shared state and upper end of channels for inbound and outbound packets.
|
||||
pub struct Device<'d, const MTU: usize> {
|
||||
rx: zerocopy_channel::Receiver<'d, NoopRawMutex, PacketBuf<MTU>>,
|
||||
tx: zerocopy_channel::Sender<'d, NoopRawMutex, PacketBuf<MTU>>,
|
||||
@ -364,9 +314,6 @@ impl<'d, const MTU: usize> embassy_net_driver::Driver for Device<'d, MTU> {
|
||||
}
|
||||
}
|
||||
|
||||
/// A rx token.
|
||||
///
|
||||
/// Holds inbound receive channel and interfaces with embassy-net-driver.
|
||||
pub struct RxToken<'a, const MTU: usize> {
|
||||
rx: zerocopy_channel::Receiver<'a, NoopRawMutex, PacketBuf<MTU>>,
|
||||
}
|
||||
@ -384,9 +331,6 @@ impl<'a, const MTU: usize> embassy_net_driver::RxToken for RxToken<'a, MTU> {
|
||||
}
|
||||
}
|
||||
|
||||
/// A tx token.
|
||||
///
|
||||
/// Holds outbound transmit channel and interfaces with embassy-net-driver.
|
||||
pub struct TxToken<'a, const MTU: usize> {
|
||||
tx: zerocopy_channel::Sender<'a, NoopRawMutex, PacketBuf<MTU>>,
|
||||
}
|
||||
|
@ -6,7 +6,6 @@ keywords = ["embedded", "tuntap", "embassy-net", "embedded-hal-async", "ethernet
|
||||
categories = ["embedded", "hardware-support", "no-std", "network-programming", "async"]
|
||||
license = "MIT OR Apache-2.0"
|
||||
edition = "2021"
|
||||
repository = "https://github.com/embassy-rs/embassy"
|
||||
|
||||
[dependencies]
|
||||
embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" }
|
||||
@ -17,4 +16,4 @@ libc = "0.2.101"
|
||||
[package.metadata.embassy_docs]
|
||||
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-net-tuntap-v$VERSION/embassy-net-tuntap/src/"
|
||||
src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-net-tuntap/src/"
|
||||
target = "thumbv7em-none-eabi"
|
||||
target = "thumbv7em-none-eabi"
|
@ -1,5 +1,3 @@
|
||||
#![warn(missing_docs)]
|
||||
#![doc = include_str!("../README.md")]
|
||||
use std::io;
|
||||
use std::io::{Read, Write};
|
||||
use std::os::unix::io::{AsRawFd, RawFd};
|
||||
@ -9,19 +7,12 @@ use async_io::Async;
|
||||
use embassy_net_driver::{self, Capabilities, Driver, HardwareAddress, LinkState};
|
||||
use log::*;
|
||||
|
||||
/// Get the MTU of the given interface.
|
||||
pub const SIOCGIFMTU: libc::c_ulong = 0x8921;
|
||||
/// Get the index of the given interface.
|
||||
pub const _SIOCGIFINDEX: libc::c_ulong = 0x8933;
|
||||
/// Capture all packages.
|
||||
pub const _ETH_P_ALL: libc::c_short = 0x0003;
|
||||
/// Set the interface flags.
|
||||
pub const TUNSETIFF: libc::c_ulong = 0x400454CA;
|
||||
/// TUN device.
|
||||
pub const _IFF_TUN: libc::c_int = 0x0001;
|
||||
/// TAP device.
|
||||
pub const IFF_TAP: libc::c_int = 0x0002;
|
||||
/// No packet information.
|
||||
pub const IFF_NO_PI: libc::c_int = 0x1000;
|
||||
|
||||
const ETHERNET_HEADER_LEN: usize = 14;
|
||||
@ -56,7 +47,6 @@ fn ifreq_ioctl(lower: libc::c_int, ifreq: &mut ifreq, cmd: libc::c_ulong) -> io:
|
||||
Ok(ifreq.ifr_data)
|
||||
}
|
||||
|
||||
/// A TUN/TAP device.
|
||||
#[derive(Debug)]
|
||||
pub struct TunTap {
|
||||
fd: libc::c_int,
|
||||
@ -70,7 +60,6 @@ impl AsRawFd for TunTap {
|
||||
}
|
||||
|
||||
impl TunTap {
|
||||
/// Create a new TUN/TAP device.
|
||||
pub fn new(name: &str) -> io::Result<TunTap> {
|
||||
unsafe {
|
||||
let fd = libc::open(
|
||||
@ -137,13 +126,11 @@ impl io::Write for TunTap {
|
||||
}
|
||||
}
|
||||
|
||||
/// A TUN/TAP device, wrapped in an async interface.
|
||||
pub struct TunTapDevice {
|
||||
device: Async<TunTap>,
|
||||
}
|
||||
|
||||
impl TunTapDevice {
|
||||
/// Create a new TUN/TAP device.
|
||||
pub fn new(name: &str) -> io::Result<TunTapDevice> {
|
||||
Ok(Self {
|
||||
device: Async::new(TunTap::new(name)?)?,
|
||||
|
@ -130,7 +130,7 @@ impl RtcTimeProvider {
|
||||
let weekday = day_of_week_from_u8(dr.wdu()).map_err(RtcError::InvalidDateTime)?;
|
||||
let day = bcd2_to_byte((dr.dt(), dr.du()));
|
||||
let month = bcd2_to_byte((dr.mt() as u8, dr.mu()));
|
||||
let year = bcd2_to_byte((dr.yt(), dr.yu())) as u16 + 2000_u16;
|
||||
let year = bcd2_to_byte((dr.yt(), dr.yu())) as u16 + 1970_u16;
|
||||
|
||||
DateTime::from(year, month, day, weekday, hour, minute, second).map_err(RtcError::InvalidDateTime)
|
||||
})
|
||||
@ -261,7 +261,7 @@ impl Rtc {
|
||||
let (dt, du) = byte_to_bcd2(t.day() as u8);
|
||||
let (mt, mu) = byte_to_bcd2(t.month() as u8);
|
||||
let yr = t.year() as u16;
|
||||
let yr_offset = (yr - 2000_u16) as u8;
|
||||
let yr_offset = (yr - 1970_u16) as u8;
|
||||
let (yt, yu) = byte_to_bcd2(yr_offset);
|
||||
|
||||
use crate::pac::rtc::vals::Ampm;
|
||||
|
Reference in New Issue
Block a user