mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add APIs to pause the connection manager, and pause the CM while doing EC updates
It's not a good time to bug the EC to do network stuff when it's updating itself. ...might even want to send the network into a disconnected state, but, let's start with just turning off the connection manager for now.
This commit is contained in:
parent
002e098538
commit
562a930ce0
4 changed files with 36 additions and 1 deletions
|
|
@ -66,6 +66,7 @@ pub(crate) enum Opcode {
|
||||||
SubscribeWifiStats,
|
SubscribeWifiStats,
|
||||||
UnsubWifiStats,
|
UnsubWifiStats,
|
||||||
FetchSsidList,
|
FetchSsidList,
|
||||||
|
ConnMgrStartStop,
|
||||||
|
|
||||||
/// [Internal] com llio interrupt callback
|
/// [Internal] com llio interrupt callback
|
||||||
ComInterrupt,
|
ComInterrupt,
|
||||||
|
|
|
||||||
|
|
@ -160,6 +160,16 @@ impl NetManager {
|
||||||
}
|
}
|
||||||
Ok(ret)
|
Ok(ret)
|
||||||
}
|
}
|
||||||
|
pub fn connection_manager_stop(&self) -> Result<(), xous::Error> {
|
||||||
|
send_message(self.netconn.conn(),
|
||||||
|
Message::new_scalar(Opcode::ConnMgrStartStop.to_usize().unwrap(), 0, 0,0, 0)
|
||||||
|
).map(|_| ())
|
||||||
|
}
|
||||||
|
pub fn connection_manager_run(&self) -> Result<(), xous::Error> {
|
||||||
|
send_message(self.netconn.conn(),
|
||||||
|
Message::new_scalar(Opcode::ConnMgrStartStop.to_usize().unwrap(), 1, 0,0, 0)
|
||||||
|
).map(|_| ())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
impl Drop for NetManager {
|
impl Drop for NetManager {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ use com::api::{ComIntSources, Ipv4Conf, NET_MTU};
|
||||||
mod device;
|
mod device;
|
||||||
mod connection_manager;
|
mod connection_manager;
|
||||||
|
|
||||||
use xous::{Message, CID, SID, msg_scalar_unpack, msg_blocking_scalar_unpack};
|
use xous::{Message, CID, SID, msg_scalar_unpack, msg_blocking_scalar_unpack, send_message};
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
@ -1437,6 +1437,23 @@ fn xmain() -> ! {
|
||||||
let ret_list = buf.to_original::<SsidList, _>().expect("couldn't restore original");
|
let ret_list = buf.to_original::<SsidList, _>().expect("couldn't restore original");
|
||||||
buffer.replace(ret_list).expect("couldn't return config");
|
buffer.replace(ret_list).expect("couldn't return config");
|
||||||
},
|
},
|
||||||
|
Some(Opcode::ConnMgrStartStop) => msg_scalar_unpack!(msg, code, _, _, _, {
|
||||||
|
if code == 0 { // 0 is stop, 1 is start
|
||||||
|
send_message(cm_cid,
|
||||||
|
Message::new_scalar(
|
||||||
|
connection_manager::ConnectionManagerOpcode::Stop.to_usize().unwrap(),
|
||||||
|
0, 0, 0, 0)
|
||||||
|
).expect("couldn't send stop message");
|
||||||
|
} else if code == 1 {
|
||||||
|
send_message(cm_cid,
|
||||||
|
Message::new_scalar(
|
||||||
|
connection_manager::ConnectionManagerOpcode::Run.to_usize().unwrap(),
|
||||||
|
0, 0, 0, 0)
|
||||||
|
).expect("couldn't send stop message");
|
||||||
|
} else {
|
||||||
|
log::error!("Got incorrect start/stop code: {}", code);
|
||||||
|
}
|
||||||
|
}),
|
||||||
Some(Opcode::Reset) => {
|
Some(Opcode::Reset) => {
|
||||||
net_config = None;
|
net_config = None;
|
||||||
let neighbor_cache = NeighborCache::new(BTreeMap::new());
|
let neighbor_cache = NeighborCache::new(BTreeMap::new());
|
||||||
|
|
|
||||||
|
|
@ -443,6 +443,7 @@ impl<'a> ShellCmdApi<'a> for EcUpdate {
|
||||||
if let Some(sub_cmd) = tokens.next() {
|
if let Some(sub_cmd) = tokens.next() {
|
||||||
match sub_cmd {
|
match sub_cmd {
|
||||||
"fw" => {
|
"fw" => {
|
||||||
|
env.netmgr.connection_manager_stop().unwrap();
|
||||||
self.in_progress = true;
|
self.in_progress = true;
|
||||||
let start = env.ticktimer.elapsed_ms();
|
let start = env.ticktimer.elapsed_ms();
|
||||||
self.start_time = Some(start);
|
self.start_time = Some(start);
|
||||||
|
|
@ -452,6 +453,7 @@ impl<'a> ShellCmdApi<'a> for EcUpdate {
|
||||||
write!(ret, "Starting EC firmware update").unwrap();
|
write!(ret, "Starting EC firmware update").unwrap();
|
||||||
}
|
}
|
||||||
"gw" => {
|
"gw" => {
|
||||||
|
env.netmgr.connection_manager_stop().unwrap();
|
||||||
self.in_progress = true;
|
self.in_progress = true;
|
||||||
let start = env.ticktimer.elapsed_ms();
|
let start = env.ticktimer.elapsed_ms();
|
||||||
self.start_time = Some(start);
|
self.start_time = Some(start);
|
||||||
|
|
@ -468,6 +470,7 @@ impl<'a> ShellCmdApi<'a> for EcUpdate {
|
||||||
write!(ret, "EC has been reset, and new firmware loaded.").unwrap();
|
write!(ret, "EC has been reset, and new firmware loaded.").unwrap();
|
||||||
}
|
}
|
||||||
"wf200" => {
|
"wf200" => {
|
||||||
|
env.netmgr.connection_manager_stop().unwrap();
|
||||||
self.in_progress = true;
|
self.in_progress = true;
|
||||||
let start = env.ticktimer.elapsed_ms();
|
let start = env.ticktimer.elapsed_ms();
|
||||||
self.start_time = Some(start);
|
self.start_time = Some(start);
|
||||||
|
|
@ -483,6 +486,7 @@ impl<'a> ShellCmdApi<'a> for EcUpdate {
|
||||||
return Ok(Some(ret));
|
return Ok(Some(ret));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
env.netmgr.connection_manager_stop().unwrap();
|
||||||
self.in_progress = true;
|
self.in_progress = true;
|
||||||
let start = env.ticktimer.elapsed_ms();
|
let start = env.ticktimer.elapsed_ms();
|
||||||
self.start_time = Some(start);
|
self.start_time = Some(start);
|
||||||
|
|
@ -523,14 +527,17 @@ impl<'a> ShellCmdApi<'a> for EcUpdate {
|
||||||
},
|
},
|
||||||
Some(UpdateResult::ProgramDone) => {
|
Some(UpdateResult::ProgramDone) => {
|
||||||
write!(ret, "Programming of {} bytes done in {:.1}s. Please restart EC with `ecup reset`.", progress, elapsed / 1000.0).unwrap();
|
write!(ret, "Programming of {} bytes done in {:.1}s. Please restart EC with `ecup reset`.", progress, elapsed / 1000.0).unwrap();
|
||||||
|
env.netmgr.connection_manager_run().unwrap();
|
||||||
self.in_progress = false;
|
self.in_progress = false;
|
||||||
},
|
},
|
||||||
Some(UpdateResult::AutoDone) => {
|
Some(UpdateResult::AutoDone) => {
|
||||||
write!(ret, "Autoupdate of EC finished. Shutting down now...").unwrap();
|
write!(ret, "Autoupdate of EC finished. Shutting down now...").unwrap();
|
||||||
|
env.netmgr.connection_manager_run().unwrap();
|
||||||
self.in_progress = false;
|
self.in_progress = false;
|
||||||
},
|
},
|
||||||
Some(UpdateResult::Abort) => {
|
Some(UpdateResult::Abort) => {
|
||||||
write!(ret, "Programming aborted in {:.1}s. Did you stage all the firmware objects?", elapsed / 1000.0).unwrap();
|
write!(ret, "Programming aborted in {:.1}s. Did you stage all the firmware objects?", elapsed / 1000.0).unwrap();
|
||||||
|
env.netmgr.connection_manager_run().unwrap();
|
||||||
self.in_progress = false;
|
self.in_progress = false;
|
||||||
}
|
}
|
||||||
_ => write!(ret, "Got unknown update callback: {:?}", result_code).unwrap()
|
_ => write!(ret, "Got unknown update callback: {:?}", result_code).unwrap()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue