diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-06-21 19:08:09 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-06-22 21:12:10 +0200 |
| commit | 1ed909ea74bfff75bd91b35739a44c5128271571 (patch) | |
| tree | 09a4e222eef6dd2854065ecbce62205a339caddf /embassy-net-esp-hosted | |
| parent | 764b43e82c7b61c21621c1fd9f5fd2f6a3dc419c (diff) | |
esp-hosted: fix warnings.
Diffstat (limited to 'embassy-net-esp-hosted')
| -rw-r--r-- | embassy-net-esp-hosted/src/control.rs | 14 | ||||
| -rw-r--r-- | embassy-net-esp-hosted/src/ioctl.rs | 4 | ||||
| -rw-r--r-- | embassy-net-esp-hosted/src/lib.rs | 5 |
3 files changed, 7 insertions, 16 deletions
diff --git a/embassy-net-esp-hosted/src/control.rs b/embassy-net-esp-hosted/src/control.rs index a2a65bc31..fce82ade7 100644 --- a/embassy-net-esp-hosted/src/control.rs +++ b/embassy-net-esp-hosted/src/control.rs | |||
| @@ -16,6 +16,7 @@ pub struct Control<'a> { | |||
| 16 | shared: &'a Shared, | 16 | shared: &'a Shared, |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | #[allow(unused)] | ||
| 19 | enum WifiMode { | 20 | enum WifiMode { |
| 20 | None = 0, | 21 | None = 0, |
| 21 | Sta = 1, | 22 | Sta = 1, |
| @@ -34,6 +35,7 @@ impl<'a> Control<'a> { | |||
| 34 | 35 | ||
| 35 | debug!("set wifi mode"); | 36 | debug!("set wifi mode"); |
| 36 | self.set_wifi_mode(WifiMode::Sta as _).await; | 37 | self.set_wifi_mode(WifiMode::Sta as _).await; |
| 38 | |||
| 37 | let mac_addr = self.get_mac_addr().await; | 39 | let mac_addr = self.get_mac_addr().await; |
| 38 | debug!("mac addr: {:02x}", mac_addr); | 40 | debug!("mac addr: {:02x}", mac_addr); |
| 39 | self.state_ch.set_ethernet_address(mac_addr); | 41 | self.state_ch.set_ethernet_address(mac_addr); |
| @@ -91,18 +93,6 @@ impl<'a> Control<'a> { | |||
| 91 | res | 93 | res |
| 92 | } | 94 | } |
| 93 | 95 | ||
| 94 | async fn get_wifi_mode(&mut self) -> u32 { | ||
| 95 | let req = proto::CtrlMsg { | ||
| 96 | msg_id: proto::CtrlMsgId::ReqGetWifiMode as _, | ||
| 97 | msg_type: proto::CtrlMsgType::Req as _, | ||
| 98 | payload: Some(proto::CtrlMsgPayload::ReqGetWifiMode(proto::CtrlMsgReqGetMode {})), | ||
| 99 | }; | ||
| 100 | let resp = self.ioctl(req).await; | ||
| 101 | let proto::CtrlMsgPayload::RespGetWifiMode(resp) = resp.payload.unwrap() else { panic!("unexpected resp") }; | ||
| 102 | assert_eq!(resp.resp, 0); | ||
| 103 | resp.mode | ||
| 104 | } | ||
| 105 | |||
| 106 | async fn set_wifi_mode(&mut self, mode: u32) { | 96 | async fn set_wifi_mode(&mut self, mode: u32) { |
| 107 | let req = proto::CtrlMsg { | 97 | let req = proto::CtrlMsg { |
| 108 | msg_id: proto::CtrlMsgId::ReqSetWifiMode as _, | 98 | msg_id: proto::CtrlMsgId::ReqSetWifiMode as _, |
diff --git a/embassy-net-esp-hosted/src/ioctl.rs b/embassy-net-esp-hosted/src/ioctl.rs index 607b7b627..e2a6815aa 100644 --- a/embassy-net-esp-hosted/src/ioctl.rs +++ b/embassy-net-esp-hosted/src/ioctl.rs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | use core::cell::{Cell, RefCell}; | 1 | use core::cell::RefCell; |
| 2 | use core::future::poll_fn; | 2 | use core::future::poll_fn; |
| 3 | use core::task::{Poll, Waker}; | 3 | use core::task::Poll; |
| 4 | 4 | ||
| 5 | use embassy_sync::waitqueue::WakerRegistration; | 5 | use embassy_sync::waitqueue::WakerRegistration; |
| 6 | 6 | ||
diff --git a/embassy-net-esp-hosted/src/lib.rs b/embassy-net-esp-hosted/src/lib.rs index ff7bed2b7..2a4601ce4 100644 --- a/embassy-net-esp-hosted/src/lib.rs +++ b/embassy-net-esp-hosted/src/lib.rs | |||
| @@ -83,6 +83,7 @@ struct PayloadHeader { | |||
| 83 | } | 83 | } |
| 84 | impl_bytes!(PayloadHeader); | 84 | impl_bytes!(PayloadHeader); |
| 85 | 85 | ||
| 86 | #[allow(unused)] | ||
| 86 | #[repr(u8)] | 87 | #[repr(u8)] |
| 87 | enum InterfaceType { | 88 | enum InterfaceType { |
| 88 | Sta = 0, | 89 | Sta = 0, |
| @@ -276,7 +277,7 @@ where | |||
| 276 | return; | 277 | return; |
| 277 | } | 278 | } |
| 278 | 279 | ||
| 279 | let isEvent = match &payload[..12] { | 280 | let is_event = match &payload[..12] { |
| 280 | b"\x01\x08\x00ctrlResp\x02" => false, | 281 | b"\x01\x08\x00ctrlResp\x02" => false, |
| 281 | b"\x01\x08\x00ctrlEvnt\x02" => true, | 282 | b"\x01\x08\x00ctrlEvnt\x02" => true, |
| 282 | _ => { | 283 | _ => { |
| @@ -292,7 +293,7 @@ where | |||
| 292 | } | 293 | } |
| 293 | let data = &payload[14..][..len]; | 294 | let data = &payload[14..][..len]; |
| 294 | 295 | ||
| 295 | if isEvent { | 296 | if is_event { |
| 296 | self.handle_event(data); | 297 | self.handle_event(data); |
| 297 | } else { | 298 | } else { |
| 298 | self.shared.ioctl_done(data); | 299 | self.shared.ioctl_done(data); |
