aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cyw43/src/runner.rs20
-rw-r--r--embassy-net-esp-hosted/src/control.rs12
-rw-r--r--embassy-net-esp-hosted/src/lib.rs4
-rw-r--r--embassy-stm32/src/rcc/h5.rs4
4 files changed, 28 insertions, 12 deletions
diff --git a/cyw43/src/runner.rs b/cyw43/src/runner.rs
index 5706696b4..1c187faa5 100644
--- a/cyw43/src/runner.rs
+++ b/cyw43/src/runner.rs
@@ -345,7 +345,9 @@ where
345 } 345 }
346 346
347 fn rx(&mut self, packet: &mut [u8]) { 347 fn rx(&mut self, packet: &mut [u8]) {
348 let Some((sdpcm_header, payload)) = SdpcmHeader::parse(packet) else { return }; 348 let Some((sdpcm_header, payload)) = SdpcmHeader::parse(packet) else {
349 return;
350 };
349 351
350 self.update_credit(&sdpcm_header); 352 self.update_credit(&sdpcm_header);
351 353
@@ -353,7 +355,9 @@ where
353 355
354 match channel { 356 match channel {
355 CHANNEL_TYPE_CONTROL => { 357 CHANNEL_TYPE_CONTROL => {
356 let Some((cdc_header, response)) = CdcHeader::parse(payload) else { return; }; 358 let Some((cdc_header, response)) = CdcHeader::parse(payload) else {
359 return;
360 };
357 trace!(" {:?}", cdc_header); 361 trace!(" {:?}", cdc_header);
358 362
359 if cdc_header.id == self.ioctl_id { 363 if cdc_header.id == self.ioctl_id {
@@ -417,8 +421,12 @@ where
417 let status = event_packet.msg.status; 421 let status = event_packet.msg.status;
418 let event_payload = match evt_type { 422 let event_payload = match evt_type {
419 Event::ESCAN_RESULT if status == EStatus::PARTIAL => { 423 Event::ESCAN_RESULT if status == EStatus::PARTIAL => {
420 let Some((_, bss_info)) = ScanResults::parse(evt_data) else { return }; 424 let Some((_, bss_info)) = ScanResults::parse(evt_data) else {
421 let Some(bss_info) = BssInfo::parse(bss_info) else { return }; 425 return;
426 };
427 let Some(bss_info) = BssInfo::parse(bss_info) else {
428 return;
429 };
422 events::Payload::BssInfo(*bss_info) 430 events::Payload::BssInfo(*bss_info)
423 } 431 }
424 Event::ESCAN_RESULT => events::Payload::None, 432 Event::ESCAN_RESULT => events::Payload::None,
@@ -439,7 +447,9 @@ where
439 } 447 }
440 } 448 }
441 CHANNEL_TYPE_DATA => { 449 CHANNEL_TYPE_DATA => {
442 let Some((_, packet)) = BdcHeader::parse(payload) else { return }; 450 let Some((_, packet)) = BdcHeader::parse(payload) else {
451 return;
452 };
443 trace!("rx pkt {:02x}", Bytes(&packet[..packet.len().min(48)])); 453 trace!("rx pkt {:02x}", Bytes(&packet[..packet.len().min(48)]));
444 454
445 match self.ch.try_rx_buf() { 455 match self.ch.try_rx_buf() {
diff --git a/embassy-net-esp-hosted/src/control.rs b/embassy-net-esp-hosted/src/control.rs
index fce82ade7..79f8cde7b 100644
--- a/embassy-net-esp-hosted/src/control.rs
+++ b/embassy-net-esp-hosted/src/control.rs
@@ -54,7 +54,9 @@ impl<'a> Control<'a> {
54 })), 54 })),
55 }; 55 };
56 let resp = self.ioctl(req).await; 56 let resp = self.ioctl(req).await;
57 let proto::CtrlMsgPayload::RespConnectAp(resp) = resp.payload.unwrap() else { panic!("unexpected resp") }; 57 let proto::CtrlMsgPayload::RespConnectAp(resp) = resp.payload.unwrap() else {
58 panic!("unexpected resp")
59 };
58 debug!("======= {:?}", Debug2Format(&resp)); 60 debug!("======= {:?}", Debug2Format(&resp));
59 assert_eq!(resp.resp, 0); 61 assert_eq!(resp.resp, 0);
60 self.state_ch.set_link_state(LinkState::Up); 62 self.state_ch.set_link_state(LinkState::Up);
@@ -71,7 +73,9 @@ impl<'a> Control<'a> {
71 )), 73 )),
72 }; 74 };
73 let resp = self.ioctl(req).await; 75 let resp = self.ioctl(req).await;
74 let proto::CtrlMsgPayload::RespGetMacAddress(resp) = resp.payload.unwrap() else { panic!("unexpected resp") }; 76 let proto::CtrlMsgPayload::RespGetMacAddress(resp) = resp.payload.unwrap() else {
77 panic!("unexpected resp")
78 };
75 assert_eq!(resp.resp, 0); 79 assert_eq!(resp.resp, 0);
76 80
77 // WHY IS THIS A STRING? WHYYYY 81 // WHY IS THIS A STRING? WHYYYY
@@ -100,7 +104,9 @@ impl<'a> Control<'a> {
100 payload: Some(proto::CtrlMsgPayload::ReqSetWifiMode(proto::CtrlMsgReqSetMode { mode })), 104 payload: Some(proto::CtrlMsgPayload::ReqSetWifiMode(proto::CtrlMsgReqSetMode { mode })),
101 }; 105 };
102 let resp = self.ioctl(req).await; 106 let resp = self.ioctl(req).await;
103 let proto::CtrlMsgPayload::RespSetWifiMode(resp) = resp.payload.unwrap() else { panic!("unexpected resp") }; 107 let proto::CtrlMsgPayload::RespSetWifiMode(resp) = resp.payload.unwrap() else {
108 panic!("unexpected resp")
109 };
104 assert_eq!(resp.resp, 0); 110 assert_eq!(resp.resp, 0);
105 } 111 }
106 112
diff --git a/embassy-net-esp-hosted/src/lib.rs b/embassy-net-esp-hosted/src/lib.rs
index 44dfbe89c..a35adfca0 100644
--- a/embassy-net-esp-hosted/src/lib.rs
+++ b/embassy-net-esp-hosted/src/lib.rs
@@ -311,14 +311,14 @@ where
311 fn handle_event(&self, data: &[u8]) { 311 fn handle_event(&self, data: &[u8]) {
312 let Ok(event) = noproto::read::<CtrlMsg>(data) else { 312 let Ok(event) = noproto::read::<CtrlMsg>(data) else {
313 warn!("failed to parse event"); 313 warn!("failed to parse event");
314 return 314 return;
315 }; 315 };
316 316
317 debug!("event: {:?}", &event); 317 debug!("event: {:?}", &event);
318 318
319 let Some(payload) = &event.payload else { 319 let Some(payload) = &event.payload else {
320 warn!("event without payload?"); 320 warn!("event without payload?");
321 return 321 return;
322 }; 322 };
323 323
324 match payload { 324 match payload {
diff --git a/embassy-stm32/src/rcc/h5.rs b/embassy-stm32/src/rcc/h5.rs
index 4025a4e05..7e2f75ab7 100644
--- a/embassy-stm32/src/rcc/h5.rs
+++ b/embassy-stm32/src/rcc/h5.rs
@@ -473,11 +473,11 @@ fn init_pll(num: usize, config: Option<Pll>, input: &PllInput) -> PllOutput {
473 w.set_divm(0); 473 w.set_divm(0);
474 }); 474 });
475 475
476 return PllOutput{ 476 return PllOutput {
477 p: None, 477 p: None,
478 q: None, 478 q: None,
479 r: None, 479 r: None,
480 } 480 };
481 }; 481 };
482 482
483 assert!(1 <= config.prediv && config.prediv <= 63); 483 assert!(1 <= config.prediv && config.prediv <= 63);