From 0b63af33135784c1410dc8667cfefbaa538a1f04 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Sat, 15 Jul 2023 19:02:04 -0500
Subject: wpan: prepare net impl.

---
 examples/stm32wb/Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/stm32wb/Cargo.toml b/examples/stm32wb/Cargo.toml
index becf2d3fb..8585b99f9 100644
--- a/examples/stm32wb/Cargo.toml
+++ b/examples/stm32wb/Cargo.toml
@@ -10,6 +10,7 @@ embassy-executor = { version = "0.2.0", path = "../../embassy-executor", feature
 embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
 embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wb55rg", "time-driver-any", "memory-x", "exti"]  }
 embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", features = ["defmt", "stm32wb55rg"] }
+embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "udp", "medium-ieee802154", "nightly"], optional=true }
 
 defmt = "0.3"
 defmt-rtt = "0.4"
@@ -24,7 +25,7 @@ heapless = { version = "0.7.5", default-features = false }
 
 [features]
 default = ["ble", "mac"]
-mac = ["embassy-stm32-wpan/mac"]
+mac = ["embassy-stm32-wpan/mac", "dep:embassy-net"]
 ble = ["embassy-stm32-wpan/ble"]
 
 [[bin]] 
-- 
cgit 


From d040871f7a078db94846305463c30a461f821d7f Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Mon, 17 Jul 2023 20:14:06 -0500
Subject: wpan: fix comp errors and impl. some of runner

---
 examples/stm32wb/src/bin/mac_ffd_net.rs | 180 ++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 examples/stm32wb/src/bin/mac_ffd_net.rs

(limited to 'examples')

diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs
new file mode 100644
index 000000000..b1cf051bf
--- /dev/null
+++ b/examples/stm32wb/src/bin/mac_ffd_net.rs
@@ -0,0 +1,180 @@
+#![no_std]
+#![no_main]
+#![feature(type_alias_impl_trait)]
+
+use defmt::*;
+use embassy_executor::Spawner;
+use embassy_stm32::bind_interrupts;
+use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler};
+use embassy_stm32_wpan::mac::commands::{AssociateResponse, ResetRequest, SetRequest, StartRequest};
+use embassy_stm32_wpan::mac::typedefs::{MacChannel, MacStatus, PanId, PibId, SecurityLevel};
+use embassy_stm32_wpan::mac::{self, Runner};
+use embassy_stm32_wpan::sub::mm;
+use embassy_stm32_wpan::TlMbox;
+use static_cell::make_static;
+use {defmt_rtt as _, panic_probe as _};
+
+bind_interrupts!(struct Irqs{
+    IPCC_C1_RX => ReceiveInterruptHandler;
+    IPCC_C1_TX => TransmitInterruptHandler;
+});
+
+#[embassy_executor::task]
+async fn run_mm_queue(memory_manager: mm::MemoryManager) {
+    memory_manager.run_queue().await;
+}
+
+#[embassy_executor::task]
+async fn run_mac(runner: &'static Runner) {
+    runner.run().await;
+}
+
+#[embassy_executor::main]
+async fn main(spawner: Spawner) {
+    /*
+        How to make this work:
+
+        - Obtain a NUCLEO-STM32WB55 from your preferred supplier.
+        - Download and Install STM32CubeProgrammer.
+        - Download stm32wb5x_FUS_fw.bin, stm32wb5x_BLE_Stack_full_fw.bin, and Release_Notes.html from
+          gh:STMicroelectronics/STM32CubeWB@2234d97/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x
+        - Open STM32CubeProgrammer
+        - On the right-hand pane, click "firmware upgrade" to upgrade the st-link firmware.
+        - Once complete, click connect to connect to the device.
+        - On the left hand pane, click the RSS signal icon to open "Firmware Upgrade Services".
+        - In the Release_Notes.html, find the memory address that corresponds to your device for the stm32wb5x_FUS_fw.bin file
+        - Select that file, the memory address, "verify download", and then "Firmware Upgrade".
+        - Once complete, in the Release_Notes.html, find the memory address that corresponds to your device for the
+          stm32wb5x_BLE_Stack_full_fw.bin file. It should not be the same memory address.
+        - Select that file, the memory address, "verify download", and then "Firmware Upgrade".
+        - Select "Start Wireless Stack".
+        - Disconnect from the device.
+        - In the examples folder for stm32wb, modify the memory.x file to match your target device.
+        - Run this example.
+
+        Note: extended stack versions are not supported at this time. Do not attempt to install a stack with "extended" in the name.
+    */
+
+    let p = embassy_stm32::init(Default::default());
+    info!("Hello World!");
+
+    let config = Config::default();
+    let mbox = TlMbox::init(p.IPCC, Irqs, config);
+
+    spawner.spawn(run_mm_queue(mbox.mm_subsystem)).unwrap();
+
+    let sys_event = mbox.sys_subsystem.read().await;
+    info!("sys event: {}", sys_event.payload());
+
+    core::mem::drop(sys_event);
+
+    let result = mbox.sys_subsystem.shci_c2_mac_802_15_4_init().await;
+    info!("initialized mac: {}", result);
+
+    info!("resetting");
+    mbox.mac_subsystem
+        .send_command(&ResetRequest {
+            set_default_pib: true,
+            ..Default::default()
+        })
+        .await
+        .unwrap();
+    {
+        let evt = mbox.mac_subsystem.read().await;
+        defmt::info!("{:#x}", evt.mac_event());
+    }
+
+    info!("setting extended address");
+    let extended_address: u64 = 0xACDE480000000001;
+    mbox.mac_subsystem
+        .send_command(&SetRequest {
+            pib_attribute_ptr: &extended_address as *const _ as *const u8,
+            pib_attribute: PibId::ExtendedAddress,
+        })
+        .await
+        .unwrap();
+    {
+        let evt = mbox.mac_subsystem.read().await;
+        defmt::info!("{:#x}", evt.mac_event());
+    }
+
+    info!("setting short address");
+    let short_address: u16 = 0x1122;
+    mbox.mac_subsystem
+        .send_command(&SetRequest {
+            pib_attribute_ptr: &short_address as *const _ as *const u8,
+            pib_attribute: PibId::ShortAddress,
+        })
+        .await
+        .unwrap();
+    {
+        let evt = mbox.mac_subsystem.read().await;
+        defmt::info!("{:#x}", evt.mac_event());
+    }
+
+    info!("setting association permit");
+    let association_permit: bool = true;
+    mbox.mac_subsystem
+        .send_command(&SetRequest {
+            pib_attribute_ptr: &association_permit as *const _ as *const u8,
+            pib_attribute: PibId::AssociationPermit,
+        })
+        .await
+        .unwrap();
+    {
+        let evt = mbox.mac_subsystem.read().await;
+        defmt::info!("{:#x}", evt.mac_event());
+    }
+
+    info!("setting TX power");
+    let transmit_power: i8 = 2;
+    mbox.mac_subsystem
+        .send_command(&SetRequest {
+            pib_attribute_ptr: &transmit_power as *const _ as *const u8,
+            pib_attribute: PibId::TransmitPower,
+        })
+        .await
+        .unwrap();
+    {
+        let evt = mbox.mac_subsystem.read().await;
+        defmt::info!("{:#x}", evt.mac_event());
+    }
+
+    info!("starting FFD device");
+    mbox.mac_subsystem
+        .send_command(&StartRequest {
+            pan_id: PanId([0x1A, 0xAA]),
+            channel_number: MacChannel::Channel16,
+            beacon_order: 0x0F,
+            superframe_order: 0x0F,
+            pan_coordinator: true,
+            battery_life_extension: false,
+            ..Default::default()
+        })
+        .await
+        .unwrap();
+    {
+        let evt = mbox.mac_subsystem.read().await;
+        defmt::info!("{:#x}", evt.mac_event());
+    }
+
+    info!("setting RX on when idle");
+    let rx_on_while_idle: bool = true;
+    mbox.mac_subsystem
+        .send_command(&SetRequest {
+            pib_attribute_ptr: &rx_on_while_idle as *const _ as *const u8,
+            pib_attribute: PibId::RxOnWhenIdle,
+        })
+        .await
+        .unwrap();
+    {
+        let evt = mbox.mac_subsystem.read().await;
+        defmt::info!("{:#x}", evt.mac_event());
+    }
+
+    let runner = make_static!(Runner::new(mbox.mac_subsystem));
+
+    spawner.spawn(run_mac(runner)).unwrap();
+
+    let (driver, control) = mac::new(runner).await;
+}
-- 
cgit 


From 890d113b855dc11be75a9716401c7703f4ce48e1 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Tue, 18 Jul 2023 18:28:12 -0500
Subject: wpan: fully implement initial draft concept

---
 examples/stm32wb/src/bin/mac_ffd_net.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs
index b1cf051bf..6072f418c 100644
--- a/examples/stm32wb/src/bin/mac_ffd_net.rs
+++ b/examples/stm32wb/src/bin/mac_ffd_net.rs
@@ -25,7 +25,7 @@ async fn run_mm_queue(memory_manager: mm::MemoryManager) {
 }
 
 #[embassy_executor::task]
-async fn run_mac(runner: &'static Runner) {
+async fn run_mac(runner: &'static Runner<'static>) {
     runner.run().await;
 }
 
-- 
cgit 


From ca1d4179a792d4a33b4f2b97b33002759fd28a21 Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Tue, 18 Jul 2023 20:52:03 -0500
Subject: wpan: implement initial event loop

---
 examples/stm32wb/Cargo.toml             |  6 +++++-
 examples/stm32wb/src/bin/mac_ffd_net.rs | 10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32wb/Cargo.toml b/examples/stm32wb/Cargo.toml
index 8585b99f9..7c0b83e65 100644
--- a/examples/stm32wb/Cargo.toml
+++ b/examples/stm32wb/Cargo.toml
@@ -21,7 +21,7 @@ embedded-hal = "0.2.6"
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 heapless = { version = "0.7.5", default-features = false }
-
+static_cell = { version = "1.1", features = ["nightly"]}
 
 [features]
 default = ["ble", "mac"]
@@ -40,6 +40,10 @@ required-features = ["mac"]
 name = "mac_ffd"
 required-features = ["mac"]
 
+[[bin]] 
+name = "mac_ffd_net"
+required-features = ["mac"]
+
 [[bin]] 
 name = "eddystone_beacon"
 required-features = ["ble"]
diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs
index 6072f418c..7b8c4b9dc 100644
--- a/examples/stm32wb/src/bin/mac_ffd_net.rs
+++ b/examples/stm32wb/src/bin/mac_ffd_net.rs
@@ -172,7 +172,15 @@ async fn main(spawner: Spawner) {
         defmt::info!("{:#x}", evt.mac_event());
     }
 
-    let runner = make_static!(Runner::new(mbox.mac_subsystem));
+    let tx_queue = [
+        make_static!([0u8; 127]),
+        make_static!([0u8; 127]),
+        make_static!([0u8; 127]),
+        make_static!([0u8; 127]),
+        make_static!([0u8; 127]),
+    ];
+
+    let runner = make_static!(Runner::new(mbox.mac_subsystem, tx_queue));
 
     spawner.spawn(run_mac(runner)).unwrap();
 
-- 
cgit 


From 28254842db645bc961d19fa2287610b7b1d3447c Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Wed, 19 Jul 2023 17:49:08 -0500
Subject: - optimize event to parse opcode only once - optimze channels -
 return mut ref for smoltcp rx

---
 examples/stm32wb/src/bin/mac_ffd.rs     | 34 ++++++++++++++++-----------------
 examples/stm32wb/src/bin/mac_ffd_net.rs | 28 +++++++++++++--------------
 examples/stm32wb/src/bin/mac_rfd.rs     | 34 +++++++++++++++++----------------
 3 files changed, 49 insertions(+), 47 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32wb/src/bin/mac_ffd.rs b/examples/stm32wb/src/bin/mac_ffd.rs
index bc71e29aa..7de30778f 100644
--- a/examples/stm32wb/src/bin/mac_ffd.rs
+++ b/examples/stm32wb/src/bin/mac_ffd.rs
@@ -74,8 +74,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting extended address");
@@ -88,8 +88,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting short address");
@@ -102,8 +102,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting association permit");
@@ -116,8 +116,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting TX power");
@@ -130,8 +130,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("starting FFD device");
@@ -148,8 +148,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting RX on when idle");
@@ -162,17 +162,17 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     loop {
         let evt = mbox.mac_subsystem.read().await;
-        if let Ok(evt) = evt.mac_event() {
+        if let Ok(evt) = evt {
             defmt::info!("parsed mac event");
-            defmt::info!("{:#x}", evt);
+            defmt::info!("{:#x}", *evt);
 
-            match evt {
+            match *evt {
                 MacEvent::MlmeAssociateInd(association) => mbox
                     .mac_subsystem
                     .send_command(&AssociateResponse {
diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs
index 7b8c4b9dc..16c33e146 100644
--- a/examples/stm32wb/src/bin/mac_ffd_net.rs
+++ b/examples/stm32wb/src/bin/mac_ffd_net.rs
@@ -80,8 +80,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting extended address");
@@ -94,8 +94,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting short address");
@@ -108,8 +108,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting association permit");
@@ -122,8 +122,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting TX power");
@@ -136,8 +136,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("starting FFD device");
@@ -154,8 +154,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting RX on when idle");
@@ -168,8 +168,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     let tx_queue = [
diff --git a/examples/stm32wb/src/bin/mac_rfd.rs b/examples/stm32wb/src/bin/mac_rfd.rs
index 7cb401d89..d1307a844 100644
--- a/examples/stm32wb/src/bin/mac_rfd.rs
+++ b/examples/stm32wb/src/bin/mac_rfd.rs
@@ -76,8 +76,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("setting extended address");
@@ -90,8 +90,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        defmt::info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        defmt::info!("{:#x}", *evt);
     }
 
     info!("getting extended address");
@@ -104,10 +104,10 @@ async fn main(spawner: Spawner) {
         .unwrap();
 
     {
-        let evt = mbox.mac_subsystem.read().await;
-        info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        info!("{:#x}", *evt);
 
-        if let Ok(MacEvent::MlmeGetCnf(evt)) = evt.mac_event() {
+        if let MacEvent::MlmeGetCnf(evt) = *evt {
             if evt.pib_attribute_value_len == 8 {
                 let value = unsafe { core::ptr::read_unaligned(evt.pib_attribute_value_ptr as *const u64) };
 
@@ -132,10 +132,10 @@ async fn main(spawner: Spawner) {
     info!("{}", a);
     mbox.mac_subsystem.send_command(&a).await.unwrap();
     let short_addr = {
-        let evt = mbox.mac_subsystem.read().await;
-        info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        info!("{:#x}", *evt);
 
-        if let Ok(MacEvent::MlmeAssociateCnf(conf)) = evt.mac_event() {
+        if let MacEvent::MlmeAssociateCnf(conf) = *evt {
             conf.assoc_short_address
         } else {
             defmt::panic!()
@@ -151,8 +151,8 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        info!("{:#x}", *evt);
     }
 
     info!("sending data");
@@ -175,12 +175,14 @@ async fn main(spawner: Spawner) {
         .await
         .unwrap();
     {
-        let evt = mbox.mac_subsystem.read().await;
-        info!("{:#x}", evt.mac_event());
+        let evt = mbox.mac_subsystem.read().await.unwrap();
+        info!("{:#x}", *evt);
     }
 
     loop {
-        let evt = mbox.mac_subsystem.read().await;
-        info!("{:#x}", evt.mac_event());
+        match mbox.mac_subsystem.read().await {
+            Ok(evt) => info!("{:#x}", *evt),
+            _ => continue,
+        };
     }
 }
-- 
cgit 


From 02d57afd51451fe9e7d224a0ea665a665ba2b72f Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Wed, 19 Jul 2023 17:52:07 -0500
Subject: rustfmt

---
 examples/stm32wb/src/bin/mac_ffd_net.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs
index 16c33e146..a55b1fc77 100644
--- a/examples/stm32wb/src/bin/mac_ffd_net.rs
+++ b/examples/stm32wb/src/bin/mac_ffd_net.rs
@@ -6,8 +6,8 @@ use defmt::*;
 use embassy_executor::Spawner;
 use embassy_stm32::bind_interrupts;
 use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler};
-use embassy_stm32_wpan::mac::commands::{AssociateResponse, ResetRequest, SetRequest, StartRequest};
-use embassy_stm32_wpan::mac::typedefs::{MacChannel, MacStatus, PanId, PibId, SecurityLevel};
+use embassy_stm32_wpan::mac::commands::{ResetRequest, SetRequest, StartRequest};
+use embassy_stm32_wpan::mac::typedefs::{MacChannel, PanId, PibId};
 use embassy_stm32_wpan::mac::{self, Runner};
 use embassy_stm32_wpan::sub::mm;
 use embassy_stm32_wpan::TlMbox;
@@ -185,4 +185,7 @@ async fn main(spawner: Spawner) {
     spawner.spawn(run_mac(runner)).unwrap();
 
     let (driver, control) = mac::new(runner).await;
+
+    let _ = driver;
+    let _ = control;
 }
-- 
cgit 


From 809d3476aac88ddba01cd16f0df3565e35beddea Mon Sep 17 00:00:00 2001
From: xoviat <xoviat@users.noreply.github.com>
Date: Thu, 20 Jul 2023 16:45:04 -0500
Subject: wpan: further optimize mac event

---
 examples/stm32wb/src/bin/mac_ffd.rs     | 39 ++++++++-------------------------
 examples/stm32wb/src/bin/mac_ffd_net.rs | 35 ++++++-----------------------
 examples/stm32wb/src/bin/mac_rfd.rs     | 24 ++++++++------------
 3 files changed, 25 insertions(+), 73 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32wb/src/bin/mac_ffd.rs b/examples/stm32wb/src/bin/mac_ffd.rs
index 7de30778f..1379ac6ba 100644
--- a/examples/stm32wb/src/bin/mac_ffd.rs
+++ b/examples/stm32wb/src/bin/mac_ffd.rs
@@ -73,10 +73,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting extended address");
     let extended_address: u64 = 0xACDE480000000001;
@@ -87,10 +84,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting short address");
     let short_address: u16 = 0x1122;
@@ -101,10 +95,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting association permit");
     let association_permit: bool = true;
@@ -115,10 +106,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting TX power");
     let transmit_power: i8 = 2;
@@ -129,10 +117,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("starting FFD device");
     mbox.mac_subsystem
@@ -147,10 +132,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting RX on when idle");
     let rx_on_while_idle: bool = true;
@@ -161,18 +143,15 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     loop {
         let evt = mbox.mac_subsystem.read().await;
         if let Ok(evt) = evt {
             defmt::info!("parsed mac event");
-            defmt::info!("{:#x}", *evt);
+            defmt::info!("{:#x}", evt);
 
-            match *evt {
+            match evt {
                 MacEvent::MlmeAssociateInd(association) => mbox
                     .mac_subsystem
                     .send_command(&AssociateResponse {
diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs
index a55b1fc77..bbcd0a70f 100644
--- a/examples/stm32wb/src/bin/mac_ffd_net.rs
+++ b/examples/stm32wb/src/bin/mac_ffd_net.rs
@@ -79,10 +79,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting extended address");
     let extended_address: u64 = 0xACDE480000000001;
@@ -93,10 +90,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting short address");
     let short_address: u16 = 0x1122;
@@ -107,10 +101,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting association permit");
     let association_permit: bool = true;
@@ -121,10 +112,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting TX power");
     let transmit_power: i8 = 2;
@@ -135,10 +123,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("starting FFD device");
     mbox.mac_subsystem
@@ -153,10 +138,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting RX on when idle");
     let rx_on_while_idle: bool = true;
@@ -167,10 +149,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     let tx_queue = [
         make_static!([0u8; 127]),
diff --git a/examples/stm32wb/src/bin/mac_rfd.rs b/examples/stm32wb/src/bin/mac_rfd.rs
index d1307a844..4d8b6601a 100644
--- a/examples/stm32wb/src/bin/mac_rfd.rs
+++ b/examples/stm32wb/src/bin/mac_rfd.rs
@@ -75,10 +75,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("setting extended address");
     let extended_address: u64 = 0xACDE480000000002;
@@ -89,10 +86,7 @@ async fn main(spawner: Spawner) {
         })
         .await
         .unwrap();
-    {
-        let evt = mbox.mac_subsystem.read().await.unwrap();
-        defmt::info!("{:#x}", *evt);
-    }
+    defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
 
     info!("getting extended address");
     mbox.mac_subsystem
@@ -105,9 +99,9 @@ async fn main(spawner: Spawner) {
 
     {
         let evt = mbox.mac_subsystem.read().await.unwrap();
-        info!("{:#x}", *evt);
+        info!("{:#x}", evt);
 
-        if let MacEvent::MlmeGetCnf(evt) = *evt {
+        if let MacEvent::MlmeGetCnf(evt) = evt {
             if evt.pib_attribute_value_len == 8 {
                 let value = unsafe { core::ptr::read_unaligned(evt.pib_attribute_value_ptr as *const u64) };
 
@@ -133,9 +127,9 @@ async fn main(spawner: Spawner) {
     mbox.mac_subsystem.send_command(&a).await.unwrap();
     let short_addr = {
         let evt = mbox.mac_subsystem.read().await.unwrap();
-        info!("{:#x}", *evt);
+        info!("{:#x}", evt);
 
-        if let MacEvent::MlmeAssociateCnf(conf) = *evt {
+        if let MacEvent::MlmeAssociateCnf(conf) = evt {
             conf.assoc_short_address
         } else {
             defmt::panic!()
@@ -152,7 +146,7 @@ async fn main(spawner: Spawner) {
         .unwrap();
     {
         let evt = mbox.mac_subsystem.read().await.unwrap();
-        info!("{:#x}", *evt);
+        info!("{:#x}", evt);
     }
 
     info!("sending data");
@@ -176,12 +170,12 @@ async fn main(spawner: Spawner) {
         .unwrap();
     {
         let evt = mbox.mac_subsystem.read().await.unwrap();
-        info!("{:#x}", *evt);
+        info!("{:#x}", evt);
     }
 
     loop {
         match mbox.mac_subsystem.read().await {
-            Ok(evt) => info!("{:#x}", *evt),
+            Ok(evt) => info!("{:#x}", evt),
             _ => continue,
         };
     }
-- 
cgit