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

fmt

Browse source
This commit is contained in:
Jonah Dahlquist 2019-08-09 17:26:14 -05:00 • committed by Jonah Dahlquist
commit d2fb6b9996
8 changed files with 104 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/network/mod.rs
View file

@ -1,11 +1,11 @@
mod dhcp;
mod manual;
use crate::{MacAddress,IpAddress};
use crate::bus::ActiveBus;
use crate::register;
pub use self::dhcp::Dhcp;
pub use self::manual::Manual;
use crate::bus::ActiveBus;
use crate::register;
use crate::{IpAddress, MacAddress};
#[derive(Default)]
pub struct NetworkSettings {
@ -17,26 +17,45 @@ pub struct NetworkSettings {
pub trait Network {
/// Gets (if necessary) and sets the network settings on the chip
fn refresh<SpiBus: ActiveBus>(&mut self, bus: &mut SpiBus) -> Result<(), SpiBus:: Error>;
fn refresh<SpiBus: ActiveBus>(&mut self, bus: &mut SpiBus) -> Result<(), SpiBus::Error>;
/// Write changed settings to chip
///
/// Will check all settings and write any new ones to the chip. Will update the settings returned by `current`
/// with any changes.
fn write_settings<SpiBus: ActiveBus>(bus: &mut SpiBus, current: &mut NetworkSettings, settings: &NetworkSettings) -> Result<(), SpiBus::Error> {
fn write_settings<SpiBus: ActiveBus>(
bus: &mut SpiBus,
current: &mut NetworkSettings,
settings: &NetworkSettings,
) -> Result<(), SpiBus::Error> {
if settings.gateway != current.gateway {
let mut address = settings.gateway.address;
block!(bus.transfer_frame(register::COMMON, register::common::GATEWAY, true, &mut address))?;
block!(bus.transfer_frame(
register::COMMON,
register::common::GATEWAY,
true,
&mut address
))?;
current.gateway = settings.gateway;
}
if settings.subnet != current.subnet {
let mut address = settings.subnet.address;
block!(bus.transfer_frame(register::COMMON, register::common::SUBNET_MASK, true, &mut address))?;
block!(bus.transfer_frame(
register::COMMON,
register::common::SUBNET_MASK,
true,
&mut address
))?;
current.subnet = settings.subnet;
}
if settings.mac != current.mac {
let mut address = settings.mac.address;
block!(bus.transfer_frame(register::COMMON, register::common::MAC, true, &mut address))?;
block!(bus.transfer_frame(
register::COMMON,
register::common::MAC,
true,
&mut address
))?;
current.mac = settings.mac;
}
if settings.ip != current.ip {