Changeset 63e27ef in mainline for kernel/generic/src/ddi

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/generic/src/ddi

Files:

• ddi.c (modified) (5 diffs)
• device.c (modified) (2 diffs)

kernel/generic/src/ddi/ddi.c

@@ -40 +40 @@
  */
 
+#include <assert.h>
 #include <ddi/ddi.h>
 #include <proc/task.h>
@@ -106 +107 @@
     unsigned int flags, uintptr_t *virt, uintptr_t bound)
 {
-        ASSERT(TASK);
+        assert(TASK);
         
         if ((phys % FRAME_SIZE) != 0)
@@ -211 +212 @@
 NO_TRACE static int physmem_unmap(uintptr_t virt)
 {
-        ASSERT(TASK);
+        assert(TASK);
 
         return as_area_destroy(TASK->as, virt);
@@ -368 +369 @@
     unsigned int flags, uintptr_t *phys)
 {
-        ASSERT(TASK);
+        assert(TASK);
         
         // TODO: implement locking of non-anonymous mapping
@@ -378 +379 @@
     uintptr_t *virt, uintptr_t bound)
 {
-        ASSERT(TASK);
+        assert(TASK);
         
         size_t frames = SIZE2FRAMES(size);

kernel/generic/src/ddi/device.c

@@ -35 +35 @@
  */
 
+#include <assert.h>
 #include <typedefs.h>
 #include <ddi/device.h>
@@ -49 +50 @@
 {
         devno_t devno = (devno_t) atomic_postinc(&last);
-        ASSERT(devno >= 0);
+        assert(devno >= 0);
         
         return devno;