max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: replace make_static! macro usage with non-macro version

Browse Source
This commit is contained in:
Ulf Lilleengen
2023-12-21 08:50:54 +01:00
parent d832d45c0b
commit 0acf7b09c3
37 changed files with 313 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/std/src/bin/net.rs
View File

@ -12,7 +12,7 @@ use embedded_io_async::Write;
use heapless::Vec;
use log::*;
use rand_core::{OsRng, RngCore};
use static_cell::{make_static, StaticCell};
use static_cell::StaticCell;
#[derive(Parser)]
#[clap(version = "1.0")]
@ -54,11 +54,13 @@ async fn main_task(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
let stack = &*make_static!(Stack::new(
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
make_static!(StackResources::<3>::new()),
seed
RESOURCES.init(StackResources::<3>::new()),
seed,
));
// Launch network task

10
examples/std/src/bin/net_dns.rs
View File

@ -10,7 +10,7 @@ use embassy_net_tuntap::TunTapDevice;
use heapless::Vec;
use log::*;
use rand_core::{OsRng, RngCore};
use static_cell::{make_static, StaticCell};
use static_cell::StaticCell;
#[derive(Parser)]
#[clap(version = "1.0")]
@ -53,11 +53,13 @@ async fn main_task(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
let stack: &Stack<_> = &*make_static!(Stack::new(
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack: &Stack<_> = &*STACK.init(Stack::new(
device,
config,
make_static!(StackResources::<3>::new()),
seed
RESOURCES.init(StackResources::<3>::new()),
seed,
));
// Launch network task

13
examples/std/src/bin/net_ppp.rs
View File

@ -25,7 +25,7 @@ use heapless::Vec;
use log::*;
use nix::sys::termios;
use rand_core::{OsRng, RngCore};
use static_cell::{make_static, StaticCell};
use static_cell::StaticCell;
use crate::serial_port::SerialPort;
@ -88,7 +88,8 @@ async fn main_task(spawner: Spawner) {
let port = SerialPort::new(opts.device.as_str(), baudrate).unwrap();
// Init network device
let state = make_static!(embassy_net_ppp::State::<4, 4>::new());
static STATE: StaticCell<embassy_net_ppp::State<4, 4>> = StaticCell::new();
let state = STATE.init(embassy_net_ppp::State::<4, 4>::new());
let (device, runner) = embassy_net_ppp::new(state);
// Generate random seed
@ -97,11 +98,13 @@ async fn main_task(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
let stack = &*make_static!(Stack::new(
static STACK: StaticCell<Stack<embassy_net_ppp::Device<'static>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
Config::default(), // don't configure IP yet
make_static!(StackResources::<3>::new()),
seed
RESOURCES.init(StackResources::<3>::new()),
seed,
));
// Launch network task

10
examples/std/src/bin/net_udp.rs
View File

@ -8,7 +8,7 @@ use embassy_net_tuntap::TunTapDevice;
use heapless::Vec;
use log::*;
use rand_core::{OsRng, RngCore};
use static_cell::{make_static, StaticCell};
use static_cell::StaticCell;
#[derive(Parser)]
#[clap(version = "1.0")]
@ -50,11 +50,13 @@ async fn main_task(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
let stack = &*make_static!(Stack::new(
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
make_static!(StackResources::<3>::new()),
seed
RESOURCES.init(StackResources::<3>::new()),
seed,
));
// Launch network task

10
examples/std/src/bin/tcp_accept.rs
View File

@ -13,7 +13,7 @@ use embedded_io_async::Write as _;
use heapless::Vec;
use log::*;
use rand_core::{OsRng, RngCore};
use static_cell::{make_static, StaticCell};
use static_cell::StaticCell;
#[derive(Parser)]
#[clap(version = "1.0")]
@ -65,11 +65,13 @@ async fn main_task(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
let stack = &*make_static!(Stack::new(
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
make_static!(StackResources::<3>::new()),
seed
RESOURCES.init(StackResources::<3>::new()),
seed,
));
// Launch network task