Changeset 5773e82 in mainline for kernel/arch/arm64/src/interrupt.c

Timestamp:

2019-05-04T12:33:41Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ebbc03c7

Parents:

db8568a (diff), 6de65f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Petr Pavlu <31453820+setupji@…> (2019-05-04 12:33:41)

git-committer:

GitHub <noreply@…> (2019-05-04 12:33:41)

Message:

Merge pull request #166 from setupji/aarch64-cleanup

AArch64 post-merge clean up

File:

• kernel/arch/arm64/src/interrupt.c (modified) (4 diffs)

kernel/arch/arm64/src/interrupt.c

@@ -53 +53 @@
         DAIF_write(daif | DAIF_IRQ_FLAG);
 
-        return (daif >> DAIF_IRQ_SHIFT) & 1;
+        return daif & DAIF_IRQ_FLAG;
 }
 
@@ -66 +66 @@
         DAIF_write(daif & ~DAIF_IRQ_FLAG);
 
-        return (daif >> DAIF_IRQ_SHIFT) & 1;
+        return daif & DAIF_IRQ_FLAG;
 }
 
@@ -77 +77 @@
         uint64_t daif = DAIF_read();
 
-        DAIF_write((daif & ~DAIF_IRQ_FLAG) |
-            ((ipl & 1) << DAIF_IRQ_SHIFT));
+        DAIF_write((daif & ~DAIF_IRQ_FLAG) | (ipl & DAIF_IRQ_FLAG));
 }
 
@@ -87 +86 @@
 ipl_t interrupts_read(void)
 {
-        return (DAIF_read() >> DAIF_IRQ_SHIFT) & 1;
+        return DAIF_read() & DAIF_IRQ_FLAG;
 }