Changeset f619ec11 in mainline for kernel/generic

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.

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (2 diffs)
• src/ddi/ddi.c (modified) (4 diffs)
• src/ddi/irq.c (modified) (2 diffs)

kernel/generic/include/mm/as.h

@@ -168 +168 @@
         /** Containing address space. */
         as_t *as;               
-        /** Flags related to the memory represented by the address space area. */
+        /**
+         * Flags related to the memory represented by the address space area.
+         */
         int flags;
         /** Attributes related to the address space area itself. */
@@ -180 +182 @@
 
         /**
-         * If the address space area has been shared, this pointer will reference
-         * the share info structure.
+         * If the address space area has been shared, this pointer will
+         * reference the share info structure.
          */
         share_info_t *sh_info;

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)

kernel/generic/src/ddi/irq.c

@@ -303 +303 @@
         spinlock_lock(&irq->lock);
         if (devno == -1) {
-                /* Invoked by irq_dispatch(). */
+                /* Invoked by irq_dispatch_and_lock(). */
                 rv = ((irq->inr == inr) && (irq->claim() == IRQ_ACCEPT));
         } else {
-                /* Invoked by irq_find(). */
+                /* Invoked by irq_find_and_lock(). */
                 rv = ((irq->inr == inr) && (irq->devno == devno));
         }
@@ -362 +362 @@
         spinlock_lock(&irq->lock);
         if (devno == -1) {
-                /* Invoked by irq_dispatch() */
+                /* Invoked by irq_dispatch_and_lock() */
                 rv = (irq->claim() == IRQ_ACCEPT);
         } else {
-                /* Invoked by irq_find() */
+                /* Invoked by irq_find_and_lock() */
                 rv = (irq->devno == devno);
         }