Changeset 63e27ef in mainline for kernel/genarch/include

Timestamp:

2017-06-19T21:47:42Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

Location:

kernel/genarch/include/genarch/drivers

Files:

• amdm37x/gpt.h (modified) (4 diffs)
• bcm2835/irc.h (modified) (3 diffs)
• bcm2835/timer.h (modified) (3 diffs)
• omap/irc.h (modified) (3 diffs)
• pl050/pl050.h (modified) (1 diff)

kernel/genarch/include/genarch/drivers/amdm37x/gpt.h

@@ -37 +37 @@
 #define KERN_AMDM37x_GPT_H_
 
+#include <assert.h>
 #include <typedefs.h>
 #include <mm/km.h>
@@ -211 +212 @@
         km_unmap((uintptr_t)clksel, 4);
 
-        ASSERT(timer);
+        assert(timer);
         /* Map control register */
         timer->regs = (void*) km_map(ioregs, iosize, PAGE_NOT_CACHEABLE);
@@ -247 +248 @@
 static inline void amdm37x_gpt_timer_ticks_start(amdm37x_gpt_t* timer)
 {
-        ASSERT(timer);
-        ASSERT(timer->regs);
+        assert(timer);
+        assert(timer->regs);
         /* Enable overflow interrupt */
         timer->regs->tier |= AMDM37x_GPT_TIER_OVF_IRQ_FLAG;
@@ -257 +258 @@
 static inline bool amdm37x_gpt_irq_ack(amdm37x_gpt_t* timer)
 {
-        ASSERT(timer);
-        ASSERT(timer->regs);
+        assert(timer);
+        assert(timer->regs);
         /* Clear all pending interrupts */
         const uint32_t tisr = timer->regs->tisr;

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

@@ -38 +38 @@
 #define KERN_BCM2835_IRQC_H_
 
+#include <assert.h>
 #include <typedefs.h>
 
@@ -158 +159 @@
 static inline void bcm2835_irc_enable(bcm2835_irc_t *regs, unsigned inum)
 {
-        ASSERT(inum < BCM2835_IRQ_COUNT);
+        assert(inum < BCM2835_IRQ_COUNT);
         regs->irq_enable[IRQ_TO_BANK(inum)] |= (1 << IRQ_TO_NUM(inum));
 }
@@ -164 +165 @@
 static inline void bcm2835_irc_disable(bcm2835_irc_t *regs, unsigned inum)
 {
-        ASSERT(inum < BCM2835_IRQ_COUNT);
+        assert(inum < BCM2835_IRQ_COUNT);
         regs->irq_disable[IRQ_TO_BANK(inum)] |= (1 << IRQ_TO_NUM(inum));
 }

kernel/genarch/include/genarch/drivers/bcm2835/timer.h

@@ -36 +36 @@
 #ifndef KERN_BCM2835_TIMER_H_
 
+#include <assert.h>
 #include <typedefs.h>
 #include <mm/km.h>
@@ -66 +67 @@
 static inline void bcm2835_timer_start(bcm2835_timer_t* timer)
 {
-        ASSERT(timer);
+        assert(timer);
         /* Clear pending interrupt on channel 1 */
         timer->cs |= BCM2835_TIMER_CS_M1;
@@ -75 +76 @@
 static inline void bcm2835_timer_irq_ack(bcm2835_timer_t* timer)
 {
-        ASSERT(timer);
+        assert(timer);
         /* Clear pending interrupt on channel 1 */
         timer->cs |= BCM2835_TIMER_CS_M1;

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;

kernel/genarch/include/genarch/drivers/pl050/pl050.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch         
+/** @addtogroup genarch
  * @{
  */