Changeset 95c675b in mainline for kernel/genarch/include/genarch/drivers/omap/irc.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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.

Message:

Merge mainline

File:

• kernel/genarch/include/genarch/drivers/omap/irc.h (modified) (3 diffs)

kernel/genarch/include/genarch/drivers/omap/irc.h

@@ -39 +39 @@
 #define KERN_OMAP_IRQC_H_
 
+#include <assert.h>
 #include <typedefs.h>
 
@@ -230 +231 @@
 static inline void omap_irc_enable(omap_irc_regs_t *regs, unsigned inum)
 {
-        ASSERT(inum < OMAP_IRC_IRQ_COUNT);
+        assert(inum < OMAP_IRC_IRQ_COUNT);
         const unsigned set = inum / 32;
         const unsigned pos = inum % 32;
@@ -243 +244 @@
 static inline void omap_irc_disable(omap_irc_regs_t *regs, unsigned inum)
 {
-        ASSERT(inum < OMAP_IRC_IRQ_COUNT);
+        assert(inum < OMAP_IRC_IRQ_COUNT);
         const unsigned set = inum / 32;
         const unsigned pos = inum % 32;