NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wpan/mac: misc fixes

Browse source
This commit is contained in:
xoviat 2023-07-21 17:02:36 -05:00
parent 2cdd593290
commit f4d6a23f92
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embassy-stm32-wpan/src/mac/control.rs
View file

@ -34,8 +34,8 @@ impl<'a> Control<'a> {
where where
T: MacCommand, T: MacCommand,
{ {
let _wm = self.runner.write_mutex.lock().await;
let rm = self.runner.read_mutex.lock().await; let rm = self.runner.read_mutex.lock().await;
let _wm = self.runner.write_mutex.lock().await;
let token = EventToken::new(self.runner, rm); let token = EventToken::new(self.runner, rm);
self.runner.mac_subsystem.send_command(cmd).await?; self.runner.mac_subsystem.send_command(cmd).await?;

6
embassy-stm32-wpan/src/mac/responses.rs
View file

@ -87,7 +87,7 @@ impl ParseableMacEvent for GtsConfirm {}
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub struct ResetConfirm { pub struct ResetConfirm {
/// The result of the reset operation /// The result of the reset operation
status: MacStatus, pub status: MacStatus,
/// byte stuffing to keep 32 bit alignment /// byte stuffing to keep 32 bit alignment
a_stuffing: [u8; 3], a_stuffing: [u8; 3],
} }
@ -101,7 +101,7 @@ impl ParseableMacEvent for ResetConfirm {}
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub struct RxEnableConfirm { pub struct RxEnableConfirm {
/// Result of the request to enable or disable the receiver /// Result of the request to enable or disable the receiver
status: MacStatus, pub status: MacStatus,
/// byte stuffing to keep 32 bit alignment /// byte stuffing to keep 32 bit alignment
a_stuffing: [u8; 3], a_stuffing: [u8; 3],
} }
@ -197,7 +197,7 @@ impl ParseableMacEvent for DpsConfirm {}
#[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "defmt", derive(defmt::Format))]
pub struct SoundingConfirm { pub struct SoundingConfirm {
/// Results of the sounding measurement /// Results of the sounding measurement
sounding_list: [u8; MAX_SOUNDING_LIST_SUPPORTED], pub sounding_list: [u8; MAX_SOUNDING_LIST_SUPPORTED],
status: u8, status: u8,
} }

2
embassy-stm32-wpan/src/mac/runner.rs
View file

@ -95,7 +95,7 @@ impl<'a> Runner<'a> {
.await .await
.unwrap(); .unwrap();
msdu_handle += 1; msdu_handle = msdu_handle.wrapping_add(1);
// The tx channel should always be of equal capacity to the tx_buf channel // The tx channel should always be of equal capacity to the tx_buf channel
self.tx_buf_channel.try_send(buf).unwrap(); self.tx_buf_channel.try_send(buf).unwrap();