kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into rs/hal-update

This commit is contained in:
Ryan Summers 2020-11-05 08:09:45 +01:00
parent 2e9fdd9d4d f38c58ab53
commit bab9fbf5ac
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -39,7 +39,10 @@ use hal::{
ethernet::{self, PHY}, ethernet::{self, PHY},
rcc::rec::ResetEnable, rcc::rec::ResetEnable,
}; };
use smoltcp as net; use smoltcp as net;
use smoltcp::iface::Routes;
use smoltcp::wire::Ipv4Address;
use heapless::{consts::*, String}; use heapless::{consts::*, String};
@ -79,6 +82,7 @@ mod build_info {
pub struct NetStorage { pub struct NetStorage {
ip_addrs: [net::wire::IpCidr; 1], ip_addrs: [net::wire::IpCidr; 1],
neighbor_cache: [Option<(net::wire::IpAddress, net::iface::Neighbor)>; 8], neighbor_cache: [Option<(net::wire::IpAddress, net::iface::Neighbor)>; 8],
routes_storage: [Option<(smoltcp::wire::IpCidr, smoltcp::iface::Route)>; 1],
} }
static mut NET_STORE: NetStorage = NetStorage { static mut NET_STORE: NetStorage = NetStorage {
@ -88,6 +92,8 @@ static mut NET_STORE: NetStorage = NetStorage {
)], )],
neighbor_cache: [None; 8], neighbor_cache: [None; 8],
routes_storage: [None; 1],
}; };
const SCALE: f32 = ((1 << 15) - 1) as f32; const SCALE: f32 = ((1 << 15) - 1) as f32;
@ -705,6 +711,10 @@ const APP: () = {
24, 24,
); );
let default_v4_gw = Ipv4Address::new(10, 0, 16, 1);
let mut routes = Routes::new(&mut store.routes_storage[..]);
routes.add_default_ipv4_route(default_v4_gw).unwrap();
let neighbor_cache = let neighbor_cache =
net::iface::NeighborCache::new(&mut store.neighbor_cache[..]); net::iface::NeighborCache::new(&mut store.neighbor_cache[..]);
@ -712,6 +722,7 @@ const APP: () = {
.ethernet_addr(mac_addr) .ethernet_addr(mac_addr)
.neighbor_cache(neighbor_cache) .neighbor_cache(neighbor_cache)
.ip_addrs(&mut store.ip_addrs[..]) .ip_addrs(&mut store.ip_addrs[..])
.routes(routes)
.finalize(); .finalize();
(interface, lan8742a) (interface, lan8742a)