diff options
| author | Ulf Lilleengen <[email protected]> | 2023-12-21 08:50:54 +0100 |
|---|---|---|
| committer | Ulf Lilleengen <[email protected]> | 2023-12-21 10:29:57 +0100 |
| commit | 0acf7b09c3bc9176d00479d601356d8df2537a9b (patch) | |
| tree | 7a04543c661b38b6aba8893c9150ef8090199ee5 /examples/stm32wb | |
| parent | d832d45c0ba5f2624a5f5c1e549e2d7fe8bd0e01 (diff) | |
chore: replace make_static! macro usage with non-macro version
Diffstat (limited to 'examples/stm32wb')
| -rw-r--r-- | examples/stm32wb/src/bin/mac_ffd_net.rs | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs index f8c76b5a4..454530c03 100644 --- a/examples/stm32wb/src/bin/mac_ffd_net.rs +++ b/examples/stm32wb/src/bin/mac_ffd_net.rs | |||
| @@ -12,7 +12,7 @@ use embassy_stm32_wpan::mac::typedefs::{MacChannel, PanId, PibId}; | |||
| 12 | use embassy_stm32_wpan::mac::{self, Runner}; | 12 | use embassy_stm32_wpan::mac::{self, Runner}; |
| 13 | use embassy_stm32_wpan::sub::mm; | 13 | use embassy_stm32_wpan::sub::mm; |
| 14 | use embassy_stm32_wpan::TlMbox; | 14 | use embassy_stm32_wpan::TlMbox; |
| 15 | use static_cell::make_static; | 15 | use static_cell::StaticCell; |
| 16 | use {defmt_rtt as _, panic_probe as _}; | 16 | use {defmt_rtt as _, panic_probe as _}; |
| 17 | 17 | ||
| 18 | bind_interrupts!(struct Irqs{ | 18 | bind_interrupts!(struct Irqs{ |
| @@ -154,15 +154,21 @@ async fn main(spawner: Spawner) { | |||
| 154 | .unwrap(); | 154 | .unwrap(); |
| 155 | defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap()); | 155 | defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap()); |
| 156 | 156 | ||
| 157 | static TX1: StaticCell<[u8; 127]> = StaticCell::new(); | ||
| 158 | static TX2: StaticCell<[u8; 127]> = StaticCell::new(); | ||
| 159 | static TX3: StaticCell<[u8; 127]> = StaticCell::new(); | ||
| 160 | static TX4: StaticCell<[u8; 127]> = StaticCell::new(); | ||
| 161 | static TX5: StaticCell<[u8; 127]> = StaticCell::new(); | ||
| 157 | let tx_queue = [ | 162 | let tx_queue = [ |
| 158 | make_static!([0u8; 127]), | 163 | TX1.init([0u8; 127]), |
| 159 | make_static!([0u8; 127]), | 164 | TX2.init([0u8; 127]), |
| 160 | make_static!([0u8; 127]), | 165 | TX3.init([0u8; 127]), |
| 161 | make_static!([0u8; 127]), | 166 | TX4.init([0u8; 127]), |
| 162 | make_static!([0u8; 127]), | 167 | TX5.init([0u8; 127]), |
| 163 | ]; | 168 | ]; |
| 164 | 169 | ||
| 165 | let runner = make_static!(Runner::new(mbox.mac_subsystem, tx_queue)); | 170 | static RUNNER: StaticCell<Runner> = StaticCell::new(); |
| 171 | let runner = RUNNER.init(Runner::new(mbox.mac_subsystem, tx_queue)); | ||
| 166 | 172 | ||
| 167 | spawner.spawn(run_mac(runner)).unwrap(); | 173 | spawner.spawn(run_mac(runner)).unwrap(); |
| 168 | 174 | ||
