From 3ee086b2575feb55eb051b2fe96b59fef69cc80c Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 11 Jul 2022 04:39:10 +0800 Subject: [PATCH] fix interrupts (broke them trying to do some exceptional error handling) --- services/com/src/api.rs | 3 +++ services/com/src/lib.rs | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/com/src/api.rs b/services/com/src/api.rs index 16d0467e2..59ba5a309 100644 --- a/services/com/src/api.rs +++ b/services/com/src/api.rs @@ -319,6 +319,7 @@ pub enum ComIntSources { Disconnect, Connect, WfxErr, + IntErr, Invalid, } impl From for ComIntSources { @@ -334,6 +335,7 @@ impl From for ComIntSources { com_rs_ref::INT_WLAN_DISCONNECT => ComIntSources::Disconnect, com_rs_ref::INT_WLAN_CONNECT_EVENT => ComIntSources::Connect, com_rs_ref::INT_WLAN_WFX_ERR => ComIntSources::WfxErr, + com_rs_ref::INT_INVALID => ComIntSources::IntErr, _ => ComIntSources::Invalid, } } @@ -351,6 +353,7 @@ impl From for u16 { ComIntSources::Connect => com_rs_ref::INT_WLAN_CONNECT_EVENT, ComIntSources::Disconnect => com_rs_ref::INT_WLAN_DISCONNECT, ComIntSources::WfxErr => com_rs_ref::INT_WLAN_WFX_ERR, + ComIntSources::IntErr => com_rs_ref::INT_INVALID, ComIntSources::Invalid => 0, } } diff --git a/services/com/src/lib.rs b/services/com/src/lib.rs index 456fe5b35..e5451328f 100644 --- a/services/com/src/lib.rs +++ b/services/com/src/lib.rs @@ -642,11 +642,6 @@ 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; }