Skip to content

Commit

Permalink
Run rustfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@phil-opp
phil-opp committed Feb 1, 2019
1 parent 4f603ec commit 7d24c4d
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 66 deletions.
56 changes: 26 additions & 30 deletions src/bin/async-await.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ use pin_utils::pin_mut;
use rt::{entry, exception, ExceptionFrame};
use sh::hio::{self, HStdout};
use smoltcp::{
socket::{
Socket, TcpSocket, TcpSocketBuffer, UdpPacketMetadata, UdpSocket, UdpSocketBuffer,
},
socket::{Socket, TcpSocket, TcpSocketBuffer, UdpPacketMetadata, UdpSocket, UdpSocketBuffer},
time::Instant,
wire::{EthernetAddress, IpEndpoint},
};
use stm32f7::stm32f7x6::{
CorePeripherals, Interrupt, Peripherals, ETHERNET_DMA, ETHERNET_MAC, RCC, SAI2, SYSCFG,
self as device,
self as device, CorePeripherals, Interrupt, Peripherals, ETHERNET_DMA, ETHERNET_MAC, RCC, SAI2,
SYSCFG,
};
use stm32f7_discovery::{
ethernet,
Expand Down Expand Up @@ -491,9 +489,9 @@ where
}

async fn run(mut self) {
use smoltcp::wire::{Ipv4Address, IpCidr};
use smoltcp::socket::{SocketSet, RawSocketBuffer, RawPacketMetadata};
use smoltcp::dhcp::Dhcpv4Client;
use smoltcp::socket::{RawPacketMetadata, RawSocketBuffer, SocketSet};
use smoltcp::wire::{IpCidr, Ipv4Address};

let mut ethernet_interface = ethernet::EthernetDevice::new(
Default::default(),
Expand All @@ -518,29 +516,25 @@ where

let mut sockets = SocketSet::new(Vec::new());

let dhcp_rx_buffer = RawSocketBuffer::new(
[RawPacketMetadata::EMPTY; 1],
vec![0; 1500]
let dhcp_rx_buffer = RawSocketBuffer::new([RawPacketMetadata::EMPTY; 1], vec![0; 1500]);
let dhcp_tx_buffer = RawSocketBuffer::new([RawPacketMetadata::EMPTY; 1], vec![0; 3000]);
let mut dhcp = Dhcpv4Client::new(
&mut sockets,
dhcp_rx_buffer,
dhcp_tx_buffer,
Instant::from_millis(system_clock::ms() as i64),
);
let dhcp_tx_buffer = RawSocketBuffer::new(
[RawPacketMetadata::EMPTY; 1],
vec![0; 3000]
);
let mut dhcp = Dhcpv4Client::new(&mut sockets, dhcp_rx_buffer, dhcp_tx_buffer, Instant::from_millis(system_clock::ms() as i64));
let mut prev_ip_addr = iface.ipv4_addr().unwrap();

// handle new ethernet packets
loop {
await!(idle_stream.next());
let timestamp = Instant::from_millis(system_clock::ms() as i64);
match iface.poll(
&mut sockets,
timestamp,
) {
match iface.poll(&mut sockets, timestamp) {
Err(::smoltcp::Error::Exhausted) => {
continue;
}
Err(::smoltcp::Error::Unrecognized) => {print!("U")}
Err(::smoltcp::Error::Unrecognized) => print!("U"),
Err(e) => println!("Network error: {:?}", e),
Ok(socket_changed) => {
if socket_changed {
Expand All @@ -556,13 +550,13 @@ where
let ip_addr = iface.ipv4_addr().unwrap();
if ip_addr != prev_ip_addr {
println!("Assigned a new IPv4 address: {}", ip_addr);
iface.routes_mut()
.update(|routes_map| {
routes_map.get(&IpCidr::new(Ipv4Address::UNSPECIFIED.into(), 0))
.map(|default_route| {
println!("Default gateway: {}", default_route.via_router);
});
});
iface.routes_mut().update(|routes_map| {
routes_map
.get(&IpCidr::new(Ipv4Address::UNSPECIFIED.into(), 0))
.map(|default_route| {
println!("Default gateway: {}", default_route.via_router);
});
});
for dns_server in dhcp.dns_servers() {
println!("DNS servers: {}", dns_server);
}
Expand All @@ -589,7 +583,9 @@ where
prev_ip_addr = ip_addr;
}
let mut timeout = dhcp.next_poll(timestamp);
iface.poll_delay(&sockets, timestamp).map(|sockets_timeout| timeout = sockets_timeout);
iface
.poll_delay(&sockets, timestamp)
.map(|sockets_timeout| timeout = sockets_timeout);
// TODO await next interrupt
}
}
Expand All @@ -611,7 +607,7 @@ where
}
socket.send_slice(&reply.0, reply.1)?;
},
_ => unreachable!()
_ => unreachable!(),
},
&mut Socket::Tcp(ref mut socket) => match socket.local_endpoint().port {
15 => {
Expand All @@ -633,7 +629,7 @@ where
assert_eq!(socket.send_slice(&reply)?, reply.len());
}
}
_ => unreachable!()
_ => unreachable!(),
},
_ => {}
}
Expand Down
48 changes: 23 additions & 25 deletions src/bin/polling.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ use cortex_m::{asm, interrupt};
use rt::{entry, exception, ExceptionFrame};
use sh::hio::{self, HStdout};
use smoltcp::{
dhcp::Dhcpv4Client,
socket::{
Socket, SocketSet, TcpSocket, TcpSocketBuffer, UdpPacketMetadata, UdpSocket,
UdpSocketBuffer, RawSocketBuffer, RawPacketMetadata,
RawPacketMetadata, RawSocketBuffer, Socket, SocketSet, TcpSocket, TcpSocketBuffer,
UdpPacketMetadata, UdpSocket, UdpSocketBuffer,
},
time::Instant,
wire::{EthernetAddress, IpEndpoint, Ipv4Address, IpCidr},
dhcp::Dhcpv4Client,
wire::{EthernetAddress, IpCidr, IpEndpoint, Ipv4Address},
};
use stm32f7::stm32f7x6::{CorePeripherals, Interrupt, Peripherals};
use stm32f7_discovery::{
Expand Down Expand Up @@ -156,15 +156,14 @@ fn main() -> ! {
};

let mut sockets = SocketSet::new(Vec::new());
let dhcp_rx_buffer = RawSocketBuffer::new(
[RawPacketMetadata::EMPTY; 1],
vec![0; 1500]
);
let dhcp_tx_buffer = RawSocketBuffer::new(
[RawPacketMetadata::EMPTY; 1],
vec![0; 3000]
let dhcp_rx_buffer = RawSocketBuffer::new([RawPacketMetadata::EMPTY; 1], vec![0; 1500]);
let dhcp_tx_buffer = RawSocketBuffer::new([RawPacketMetadata::EMPTY; 1], vec![0; 3000]);
let mut dhcp = Dhcpv4Client::new(
&mut sockets,
dhcp_rx_buffer,
dhcp_tx_buffer,
Instant::from_millis(system_clock::ms() as i64),
);
let mut dhcp = Dhcpv4Client::new(&mut sockets, dhcp_rx_buffer, dhcp_tx_buffer, Instant::from_millis(system_clock::ms() as i64));

let mut previous_button_state = pins.button.get();
let mut audio_writer = AudioWriter::new();
Expand Down Expand Up @@ -202,14 +201,11 @@ fn main() -> ! {
// handle new ethernet packets
if let Ok((ref mut iface, ref mut prev_ip_addr)) = ethernet_interface {
let timestamp = Instant::from_millis(system_clock::ms() as i64);
match iface.poll(
&mut sockets,
timestamp,
) {
match iface.poll(&mut sockets, timestamp) {
Err(::smoltcp::Error::Exhausted) => {
continue;
}
Err(::smoltcp::Error::Unrecognized) => {print!("U")}
Err(::smoltcp::Error::Unrecognized) => print!("U"),
Err(e) => println!("Network error: {:?}", e),
Ok(socket_changed) => {
if socket_changed {
Expand All @@ -225,13 +221,13 @@ fn main() -> ! {
let ip_addr = iface.ipv4_addr().unwrap();
if ip_addr != *prev_ip_addr {
println!("Assigned a new IPv4 address: {}", ip_addr);
iface.routes_mut()
.update(|routes_map| {
routes_map.get(&IpCidr::new(Ipv4Address::UNSPECIFIED.into(), 0))
.map(|default_route| {
println!("Default gateway: {}", default_route.via_router);
});
});
iface.routes_mut().update(|routes_map| {
routes_map
.get(&IpCidr::new(Ipv4Address::UNSPECIFIED.into(), 0))
.map(|default_route| {
println!("Default gateway: {}", default_route.via_router);
});
});
for dns_server in dhcp.dns_servers() {
println!("DNS servers: {}", dns_server);
}
Expand All @@ -258,7 +254,9 @@ fn main() -> ! {
*prev_ip_addr = ip_addr;
}
let mut timeout = dhcp.next_poll(timestamp);
iface.poll_delay(&sockets, timestamp).map(|sockets_timeout| timeout = sockets_timeout);
iface
.poll_delay(&sockets, timestamp)
.map(|sockets_timeout| timeout = sockets_timeout);
// TODO await next interrupt
}

Expand Down
4 changes: 1 addition & 3 deletions src/ethernet/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ impl<'d> EthernetDevice<'d> {
})
}

pub fn into_interface<'a>(
self
) -> EthernetInterface<'a, 'a, 'a, Self> {
pub fn into_interface<'a>(self) -> EthernetInterface<'a, 'a, 'a, Self> {
use alloc::collections::BTreeMap;
use smoltcp::iface::NeighborCache;

Expand Down
10 changes: 2 additions & 8 deletions src/i2c.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,9 @@ use core::iter::TrustedLen;
use core::marker::PhantomData;
use core::ops::Deref;
use embedded_hal;
use stm32f7::stm32f7x6::{
i2c1,
RCC,
self as device,
};
use stm32f7::stm32f7x6::{self as device, i2c1, RCC};

pub trait I2cTrait: Deref<Target = i2c1::RegisterBlock> {

}
pub trait I2cTrait: Deref<Target = i2c1::RegisterBlock> {}

impl I2cTrait for device::I2C1 {}
impl I2cTrait for device::I2C2 {}
Expand Down

0 comments on commit 7d24c4d

Please sign in to comment.