Changeset f619ec11 in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2007-02-03T21:26:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cf5ddf6

Parents:

80bcaed

Message:

When clock() is called by an external interrupt dispatched by the IRQ dispatcher,
no spinlock can be held or the kernel will not be preemptive. This fixes Ticket #24.

Formating and indentation fixes.

File:

• kernel/generic/src/ddi/ddi.c (modified) (4 diffs)

kernel/generic/src/ddi/ddi.c

@@ -131 +131 @@
         parea = btree_search(&parea_btree, (btree_key_t) pf, &nodep);
         if (!parea || parea->frames < pages || ((flags & AS_AREA_CACHEABLE) &&
-                !parea->cacheable) || (!(flags & AS_AREA_CACHEABLE) &&
-                parea->cacheable)) {
+            !parea->cacheable) || (!(flags & AS_AREA_CACHEABLE) &&
+            parea->cacheable)) {
                 /*
                  * This physical memory area cannot be mapped.
@@ -235 +235 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base, unative_t
-        pages, unative_t flags)
+unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base,
+    unative_t pages, unative_t flags)
 {
         return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
-                FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
-                (count_t) pages, (int) flags);
+            FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
+            (count_t) pages, (int) flags);
 }
 
@@ -259 +259 @@
                 
         return (unative_t) ddi_iospace_enable((task_id_t) arg.task_id,
-                (uintptr_t) arg.ioaddr, (size_t) arg.size);
+            (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
 
@@ -272 +272 @@
 unative_t sys_preempt_control(int enable)
 {
-        if (! cap_get(TASK) & CAP_PREEMPT_CONTROL)
+        if (!cap_get(TASK) & CAP_PREEMPT_CONTROL)
                 return EPERM;
         if (enable)