tuxmain/w5100-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ran cargo fmt

Browse source
This commit is contained in:
Jonah Dahlquist 2020-11-19 20:13:17 -08:00
commit 79b1f52102
6 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/interface.rs
View file

@ -2,13 +2,13 @@ use embedded_hal::digital::v2::OutputPin;
use embedded_hal::spi::FullDuplex;
use embedded_nal::Ipv4Addr;
use crate::{MacAddress,Mode};
use crate::{MacAddress, Mode};
use bus::{ActiveBus,FourWire,ActiveFourWire};
use device::Device;
use network::{Network,Manual};
use bus::{ActiveBus, ActiveFourWire, FourWire};
use core::cell::RefCell;
use uninitialized_device::{UninitializedDevice,InitializeError};
use device::Device;
use network::{Manual, Network};
use uninitialized_device::{InitializeError, UninitializedDevice};
pub struct Interface<SpiBus: ActiveBus, NetworkImpl: Network> {
pub device: RefCell<Device<SpiBus, NetworkImpl>>,
@ -16,7 +16,9 @@ pub struct Interface<SpiBus: ActiveBus, NetworkImpl: Network> {
impl<SpiBus: ActiveBus, NetworkImpl: Network> Interface<SpiBus, NetworkImpl> {
fn new(device: Device<SpiBus, NetworkImpl>) -> Self {
Self { device: RefCell::new(device) }
Self {
device: RefCell::new(device),
}
}
pub fn release(self) -> Device<SpiBus, NetworkImpl> {
@ -24,16 +26,25 @@ impl<SpiBus: ActiveBus, NetworkImpl: Network> Interface<SpiBus, NetworkImpl> {
}
}
impl<Spi: FullDuplex<u8>, ChipSelect: OutputPin> Interface<ActiveFourWire<Spi, ChipSelect>, Manual> {
pub fn setup(spi: Spi, cs: ChipSelect, mac: MacAddress, ip: Ipv4Addr) -> Result<Self, InitializeError<<ActiveFourWire<Spi, ChipSelect> as ActiveBus>::Error>> {
Ok(UninitializedDevice::new(FourWire::new(cs).activate(spi)).initialize_manual(mac, ip, Mode::default())?.into_interface())
impl<Spi: FullDuplex<u8>, ChipSelect: OutputPin>
Interface<ActiveFourWire<Spi, ChipSelect>, Manual>
{
pub fn setup(
spi: Spi,
cs: ChipSelect,
mac: MacAddress,
ip: Ipv4Addr,
) -> Result<Self, InitializeError<<ActiveFourWire<Spi, ChipSelect> as ActiveBus>::Error>> {
Ok(UninitializedDevice::new(FourWire::new(cs).activate(spi))
.initialize_manual(mac, ip, Mode::default())?
.into_interface())
}
}
impl<SpiBus: ActiveBus, NetworkImpl: Network> From<Device<SpiBus, NetworkImpl>> for Interface<SpiBus, NetworkImpl> {
impl<SpiBus: ActiveBus, NetworkImpl: Network> From<Device<SpiBus, NetworkImpl>>
for Interface<SpiBus, NetworkImpl>
{
fn from(device: Device<SpiBus, NetworkImpl>) -> Interface<SpiBus, NetworkImpl> {
Interface::<SpiBus, NetworkImpl>::new(device)
}
}