Merge pull request #573 from intel/lukevalenty/fix_shared_sub_irq_ena…

…bles fix shared_sub_irq issue where top level enable is not set
intel · Jul 12, 2024 · 49e43f9 · 49e43f9
2 parents 90ba326 + a718e12
commit 49e43f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/include/interrupt/impl.hpp b/include/interrupt/impl.hpp
@@ -86,7 +86,12 @@ struct shared_sub_irq_impl : Config {
     using Config::status_field;
 
     [[nodiscard]] static auto get_interrupt_enables() {
-        return stdx::tuple_cat(Subs::get_interrupt_enables()...);
+        if constexpr (active) {
+            return stdx::tuple_cat(stdx::make_tuple(enable_field),
+                                   Subs::get_interrupt_enables()...);
+        } else {
+            return stdx::tuple{};
+        }
     }
 
     static auto run() -> void {

diff --git a/test/interrupt/shared_sub_irq_impl.cpp b/test/interrupt/shared_sub_irq_impl.cpp
@@ -98,6 +98,10 @@ TEST_CASE(
     using impl_t =
         interrupt::shared_sub_irq_impl<flow_config_t<std::true_type>,
                                        active_sub_impl_t, inactive_sub_impl_t>;
-    CHECK(impl_t::get_interrupt_enables() ==
-          stdx::tuple{enable_field_t<17>{}, enable_field_t<0>{}});
+
+    auto expected = stdx::tuple{enable_field_t<0>{}, enable_field_t<17>{}};
+    auto actual = impl_t::get_interrupt_enables();
+
+    CHECK(std::size(expected) == std::size(actual));
+    CHECK(expected == actual);
 }