Changeset 95c675b in mainline for kernel/genarch/src/drivers/am335x/timer.c

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/src/drivers/am335x/timer.c (modified) (3 diffs)

kernel/genarch/src/drivers/am335x/timer.c

@@ -34 +34 @@
  */
 
+#include <assert.h>
 #include <genarch/drivers/am335x/timer.h>
 #include <mm/km.h>
@@ -90 +91 @@
         size_t size;
 
-        ASSERT(id < TIMERS_MAX);
-        ASSERT(timer != NULL);
+        assert(id < TIMERS_MAX);
+        assert(timer != NULL);
 
         if (id == DMTIMER1_1MS)
@@ -100 +101 @@
 
         timer->regs = (void *) km_map(base_addr, size, PAGE_NOT_CACHEABLE);
-        ASSERT(timer->regs != NULL);
+        assert(timer->regs != NULL);
 
         timer->id = id;