irq_control_get_trigger: change trigger to bool

Signed-off-by: Alwin Joshy <joshyalwin@gmail.com>
seL4 · Jul 25, 2024 · fa9f0bc · fa9f0bc
1 parent 76034e5
commit fa9f0bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/crates/sel4-capdl-initializer/core/src/lib.rs b/crates/sel4-capdl-initializer/core/src/lib.rs
@@ -336,13 +336,13 @@ impl<'a, N: ObjectName, D: Content, M: GetEmbeddedFrame, B: BorrowMut<[PerObject
                                 if #[sel4_cfg(MAX_NUM_NODES = "1")] {
                                     init_thread::slot::IRQ_CONTROL.cap().irq_control_get_trigger(
                                         *irq,
-                                        obj.extra.trigger,
+                                        obj.extra.trigger != 0,
                                         &cslot_to_relative_cptr(slot),
                                     )?;
                                 } else {
                                     init_thread::slot::IRQ_CONTROL.cap().irq_control_get_trigger_core(
                                         *irq,
-                                        obj.extra.trigger,
+                                        obj.extra.trigger != 0,
                                         obj.extra.target,
                                         &cslot_to_relative_cptr(slot),
                                     )?;

diff --git a/crates/sel4/src/arch/arm/invocations.rs b/crates/sel4/src/arch/arm/invocations.rs
@@ -145,15 +145,15 @@ impl<C: InvocationContext> IrqControl<C> {
     pub fn irq_control_get_trigger_core(
         self,
         irq: Word,
-        trigger: Word,
+        edge_triggered: bool,
         target: Word,
         dst: &AbsoluteCPtr,
     ) -> Result<()> {
         Error::wrap(self.invoke(|cptr, ipc_buffer| {
             ipc_buffer.inner_mut().seL4_IRQControl_GetTriggerCore(
                 cptr.bits(),
                 irq,
-                trigger,
+                edge_triggered.into(),
                 dst.root().bits(),
                 dst.path().bits(),
                 dst.path().depth_for_kernel(),
@@ -166,14 +166,14 @@ impl<C: InvocationContext> IrqControl<C> {
     pub fn irq_control_get_trigger(
         self,
         irq: Word,
-        trigger: Word,
+        edge_triggered: bool,
         dst: &AbsoluteCPtr,
     ) -> Result<()> {
         Error::wrap(self.invoke(|cptr, ipc_buffer| {
             ipc_buffer.inner_mut().seL4_IRQControl_GetTrigger(
                 cptr.bits(),
                 irq,
-                trigger,
+                edge_triggered.into(),
                 dst.root().bits(),
                 dst.path().bits(),
                 dst.path().depth_for_kernel(),