diff options
| author | Martin Liska <[email protected]> | 2024-08-08 10:53:55 +0200 |
|---|---|---|
| committer | Martin Liska <[email protected]> | 2024-08-08 12:03:43 +0200 |
| commit | 961ec387edec33fbaa9d63144f8826e3aff6cd45 (patch) | |
| tree | edc473818861d1d4c836ccc90dafbc12291aa089 | |
| parent | 891c5ee10584cd990dad529e3506fe1328e4e69d (diff) | |
Simplify construction of StackResources::new()
| -rw-r--r-- | tests/nrf/src/bin/ethernet_enc28j60_perf.rs | 7 | ||||
| -rw-r--r-- | tests/nrf/src/bin/wifi_esp_hosted_perf.rs | 2 | ||||
| -rw-r--r-- | tests/rp/src/bin/cyw43-perf.rs | 2 | ||||
| -rw-r--r-- | tests/rp/src/bin/ethernet_w5100s_perf.rs | 2 | ||||
| -rw-r--r-- | tests/stm32/src/bin/eth.rs | 7 |
5 files changed, 5 insertions, 15 deletions
diff --git a/tests/nrf/src/bin/ethernet_enc28j60_perf.rs b/tests/nrf/src/bin/ethernet_enc28j60_perf.rs index 5f4220b1e..304754c0e 100644 --- a/tests/nrf/src/bin/ethernet_enc28j60_perf.rs +++ b/tests/nrf/src/bin/ethernet_enc28j60_perf.rs | |||
| @@ -67,12 +67,7 @@ async fn main(spawner: Spawner) { | |||
| 67 | // Init network stack | 67 | // Init network stack |
| 68 | static STACK: StaticCell<Stack<MyDriver>> = StaticCell::new(); | 68 | static STACK: StaticCell<Stack<MyDriver>> = StaticCell::new(); |
| 69 | static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new(); | 69 | static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new(); |
| 70 | let stack = &*STACK.init(Stack::new( | 70 | let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed)); |
| 71 | device, | ||
| 72 | config, | ||
| 73 | RESOURCES.init(StackResources::<2>::new()), | ||
| 74 | seed, | ||
| 75 | )); | ||
| 76 | 71 | ||
| 77 | unwrap!(spawner.spawn(net_task(stack))); | 72 | unwrap!(spawner.spawn(net_task(stack))); |
| 78 | 73 | ||
diff --git a/tests/nrf/src/bin/wifi_esp_hosted_perf.rs b/tests/nrf/src/bin/wifi_esp_hosted_perf.rs index a6c93c8a6..6632442f1 100644 --- a/tests/nrf/src/bin/wifi_esp_hosted_perf.rs +++ b/tests/nrf/src/bin/wifi_esp_hosted_perf.rs | |||
| @@ -91,7 +91,7 @@ async fn main(spawner: Spawner) { | |||
| 91 | let stack = &*STACK.init(Stack::new( | 91 | let stack = &*STACK.init(Stack::new( |
| 92 | device, | 92 | device, |
| 93 | Config::dhcpv4(Default::default()), | 93 | Config::dhcpv4(Default::default()), |
| 94 | RESOURCES.init(StackResources::<2>::new()), | 94 | RESOURCES.init(StackResources::new()), |
| 95 | seed, | 95 | seed, |
| 96 | )); | 96 | )); |
| 97 | 97 | ||
diff --git a/tests/rp/src/bin/cyw43-perf.rs b/tests/rp/src/bin/cyw43-perf.rs index 53c84e711..38fbde7c1 100644 --- a/tests/rp/src/bin/cyw43-perf.rs +++ b/tests/rp/src/bin/cyw43-perf.rs | |||
| @@ -74,7 +74,7 @@ async fn main(spawner: Spawner) { | |||
| 74 | let stack = &*STACK.init(Stack::new( | 74 | let stack = &*STACK.init(Stack::new( |
| 75 | net_device, | 75 | net_device, |
| 76 | Config::dhcpv4(Default::default()), | 76 | Config::dhcpv4(Default::default()), |
| 77 | RESOURCES.init(StackResources::<2>::new()), | 77 | RESOURCES.init(StackResources::new()), |
| 78 | seed, | 78 | seed, |
| 79 | )); | 79 | )); |
| 80 | 80 | ||
diff --git a/tests/rp/src/bin/ethernet_w5100s_perf.rs b/tests/rp/src/bin/ethernet_w5100s_perf.rs index 4b04571bd..f15f33743 100644 --- a/tests/rp/src/bin/ethernet_w5100s_perf.rs +++ b/tests/rp/src/bin/ethernet_w5100s_perf.rs | |||
| @@ -72,7 +72,7 @@ async fn main(spawner: Spawner) { | |||
| 72 | let stack = &*STACK.init(Stack::new( | 72 | let stack = &*STACK.init(Stack::new( |
| 73 | device, | 73 | device, |
| 74 | embassy_net::Config::dhcpv4(Default::default()), | 74 | embassy_net::Config::dhcpv4(Default::default()), |
| 75 | RESOURCES.init(StackResources::<2>::new()), | 75 | RESOURCES.init(StackResources::new()), |
| 76 | seed, | 76 | seed, |
| 77 | )); | 77 | )); |
| 78 | 78 | ||
diff --git a/tests/stm32/src/bin/eth.rs b/tests/stm32/src/bin/eth.rs index 25a06b986..9da514881 100644 --- a/tests/stm32/src/bin/eth.rs +++ b/tests/stm32/src/bin/eth.rs | |||
| @@ -101,12 +101,7 @@ async fn main(spawner: Spawner) { | |||
| 101 | // Init network stack | 101 | // Init network stack |
| 102 | static STACK: StaticCell<Stack<Device>> = StaticCell::new(); | 102 | static STACK: StaticCell<Stack<Device>> = StaticCell::new(); |
| 103 | static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new(); | 103 | static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new(); |
| 104 | let stack = &*STACK.init(Stack::new( | 104 | let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed)); |
| 105 | device, | ||
| 106 | config, | ||
| 107 | RESOURCES.init(StackResources::<2>::new()), | ||
| 108 | seed, | ||
| 109 | )); | ||
| 110 | 105 | ||
| 111 | // Launch network task | 106 | // Launch network task |
| 112 | unwrap!(spawner.spawn(net_task(&stack))); | 107 | unwrap!(spawner.spawn(net_task(&stack))); |
