diff --git a/services/com/Cargo.toml b/services/com/Cargo.toml index 1385f2deb..e1f0a329a 100644 --- a/services/com/Cargo.toml +++ b/services/com/Cargo.toml @@ -23,7 +23,7 @@ num-derive = {version = "0.3.3", default-features = false} num-traits = {version = "0.2.14", default-features = false} rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]} -xous-semver = "0.1.1" +xous-semver = "0.1.2" [target.'cfg(not(any(windows,unix)))'.dependencies] utralib = {path = "../../utralib"} diff --git a/services/com/src/lib.rs b/services/com/src/lib.rs index a030bff72..456fe5b35 100644 --- a/services/com/src/lib.rs +++ b/services/com/src/lib.rs @@ -12,6 +12,7 @@ use xous_ipc::{String, Buffer}; use num_traits::{ToPrimitive, FromPrimitive}; pub use com_rs_ref::serdes::Ipv4Conf; +use xous_semver::SemVer; /// mapping of the callback function to the library user /// this exists in the library user's memory space, so we can have up to one @@ -136,17 +137,18 @@ impl Com { } } - /// this is the rev of the firmware, as (maj, min, rev, +commit) - pub fn get_ec_sw_tag(&self) -> Result<(u8, u8, u8, u8), Error> { + /// this is the rev of the firmware + pub fn get_ec_sw_tag(&self) -> Result { let response = send_message(self.conn, Message::new_blocking_scalar(Opcode::EcSwTag.to_usize().unwrap(), 0, 0, 0, 0))?; if let xous::Result::Scalar1(rev) = response { - Ok(( - ((rev >> 24) & 0xff) as u8, - ((rev >> 16) & 0xff) as u8, - ((rev >> 8) & 0xff) as u8, - ((rev >> 0) & 0xff) as u8, - )) + Ok(SemVer { + maj: ((rev >> 24) & 0xff) as u16, + min: ((rev >> 16) & 0xff) as u16, + rev: ((rev >> 8) & 0xff) as u16, + extra: ((rev >> 0) & 0xff) as u16, + commit: None, + }) } else { panic!("unexpected return value: {:#?}", response); } @@ -426,8 +428,8 @@ impl Com { }; let mut buf = Buffer::into_buf(flashop).or(Err(xous::Error::InternalError))?; buf.lend_mut(self.conn, Opcode::FlashOp.to_u32().unwrap()).expect("couldn't send flash program command"); - let ret = buf.to_original::().unwrap(); - match ret { + let ret = buf.to_original::().unwrap(); + match ret.op { FlashOp::Verify(_a, d) => { page.copy_from_slice(&d); Ok(()) @@ -640,6 +642,11 @@ impl Com { rxlen = Some(maybe_rxlen as u16); } } + } else { + // Trip an error if we had an invalid interrupt. This should force the caller + // to re-initialize the interrupt subsystem. + log::warn!("Invalid interrupt set"); + return Err(xous::Error::Timeout); } mask_bit <<= 1; } diff --git a/services/com/src/main.rs b/services/com/src/main.rs index 5e37a7506..aad9f326e 100644 --- a/services/com/src/main.rs +++ b/services/com/src/main.rs @@ -559,11 +559,11 @@ fn main() -> ! { } com.txrx(ComState::FLASH_UNLOCK.verb); }, - api::FlashOp::Verify(&addr, data) => { + api::FlashOp::Verify(addr, data) => { if ec_tag >= u32::from_be_bytes(ComState::FLASH_VERIFY.apilevel) { com.txrx(ComState::FLASH_VERIFY.verb); - com.txrx((addr >> 16) as u16); - com.txrx(addr as u16); + com.txrx((*addr >> 16) as u16); + com.txrx(*addr as u16); for word in data.chunks_mut(2) { let read = com.wait_txrx(ComState::LINK_READ.verb, Some(STD_TIMEOUT)).to_le_bytes(); @@ -585,7 +585,7 @@ fn main() -> ! { } match flash_op.op { api::FlashOp::Verify(_a, data) => { - log::info!("verify returning {:x?}", &data[..32]); + log::debug!("verify returning {:x?}", &data[..32]); buffer.replace(flash_op).expect("couldn't return result on FlashOp"); } _ => {