WebSVN – HelenOS – Path Comparison – / – /branches/rcu/kernel/generic/include/ Rev 2291 and /branches/rcu/kernel/generic/include/ Rev 2292

Ignore whitespace Rev 2291 → Rev 2292

 /branches/rcu/kernel/generic/include/proc/thread.h
 ,10 → 53,7
 /* Thread flags */
-/** Thread cannot be migrated to another CPU.
-* When using this flag, the caller must set cpu in the thread_t
-* structure manually before calling thread_ready (even on uniprocessor)
-*/
+/** Thread cannot be migrated to another CPU. */
 #define THREAD_FLAG_WIRED   (1 << 0)
 /** Thread was migrated to another CPU and has not run yet. */
 #define THREAD_FLAG_STOLEN  (1 << 1)

 /branches/rcu/kernel/generic/include/ddi/irq.h
 ,162 → 1,154
-/*
- * Copyright (c) 2006 Jakub Jermar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/** @addtogroup genericddi
- * @{
- */
-/** @file
- */
-#ifndef KERN_IRQ_H_
-#define KERN_IRQ_H_
-typedef enum {
-    CMD_MEM_READ_1 = 0,
-    CMD_MEM_READ_2,
-    CMD_MEM_READ_4,
-    CMD_MEM_READ_8,
-    CMD_MEM_WRITE_1,
-    CMD_MEM_WRITE_2,
-    CMD_MEM_WRITE_4,
-    CMD_MEM_WRITE_8,
-    CMD_PORT_READ_1,
-    CMD_PORT_WRITE_1,
-    CMD_IA64_GETCHAR,
-    CMD_PPC32_GETCHAR,
-    CMD_LAST
-} irq_cmd_type;
-typedef struct {
-    irq_cmd_type cmd;
-    void *addr;
-    unsigned long long value;
-    int dstarg;
-} irq_cmd_t;
-typedef struct {
-    unsigned int cmdcount;
-    irq_cmd_t *cmds;
-} irq_code_t;
-#ifdef KERNEL
-#include <arch/types.h>
-#include <adt/list.h>
-#include <synch/spinlock.h>
-#include <proc/task.h>
-typedef enum {
-    IRQ_DECLINE,        /**< Decline to service. */
-    IRQ_ACCEPT      /**< Accept to service. */
-} irq_ownership_t;
-typedef enum {
-    IRQ_TRIGGER_LEVEL = 1,
-    IRQ_TRIGGER_EDGE
-} irq_trigger_t;
-struct irq;
-typedef void (* irq_handler_t)(struct irq *irq, void *arg, ...);
-/** IPC notification config structure.
- *
- * Primarily, this structure is encapsulated in the irq_t structure.
- * It is protected by irq_t::lock.
- */
-typedef struct {
-    /** When false, notifications are not sent. */
-    bool notify;
-    /** Answerbox for notifications. */
-    answerbox_t *answerbox;
-    /** Method to be used for the notification. */
-    unative_t method;
-    /** Top-half pseudocode. */
-    irq_code_t *code;
-    /** Counter. */
-    count_t counter;
-    /**
-     * Link between IRQs that are notifying the same answerbox. The list is
-     * protected by the answerbox irq_lock.
-     */
-    link_t link;
-} ipc_notif_cfg_t;
-/** Structure representing one device IRQ.
- *
- * If one device has multiple interrupts, there will be multiple irq_t
- * instantions with the same devno.
- */
-typedef struct irq {
-    /** Hash table link. */
-    link_t link;
-    /** Lock protecting everything in this structure
-     *  except the link member. When both the IRQ
-     *  hash table lock and this lock are to be acquired,
-     *  this lock must not be taken first.
-     */
-    SPINLOCK_DECLARE(lock);
-    /** Send EOI before processing the interrupt.
-     *  This is essential for timer interrupt which
-     *  has to be acknowledged before doing preemption
-     *  to make sure another timer interrupt will
-     *  be eventually generated.
-     */
-    bool preack;
-    /** Unique device number. -1 if not yet assigned. */
-    devno_t devno;
-    /** Actual IRQ number. -1 if not yet assigned. */
-    inr_t inr;
-    /** Trigger level of the IRQ. */
-    irq_trigger_t trigger;
-    /** Claim ownership of the IRQ. */
-    irq_ownership_t (* claim)(void);
-    /** Handler for this IRQ and device. */
-    irq_handler_t handler;
-    /** Argument for the handler. */
-    void *arg;
-    /** Notification configuration structure. */
-    ipc_notif_cfg_t notif_cfg;
-} irq_t;
-extern void irq_init(count_t inrs, count_t chains);
-extern void irq_initialize(irq_t *irq);
-extern void irq_register(irq_t *irq);
-extern irq_t *irq_dispatch_and_lock(inr_t inr);
-extern irq_t *irq_find_and_lock(inr_t inr, devno_t devno);
-#endif
-#endif
-/** @}
- */
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup genericddi
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_IRQ_H_
+#define KERN_IRQ_H_
+typedef enum {
+    CMD_MEM_READ_1 = 0,
+    CMD_MEM_READ_2,
+    CMD_MEM_READ_4,
+    CMD_MEM_READ_8,
+    CMD_MEM_WRITE_1,
+    CMD_MEM_WRITE_2,
+    CMD_MEM_WRITE_4,
+    CMD_MEM_WRITE_8,
+    CMD_PORT_READ_1,
+    CMD_PORT_WRITE_1,
+    CMD_IA64_GETCHAR,
+    CMD_PPC32_GETCHAR,
+    CMD_LAST
+} irq_cmd_type;
+typedef struct {
+    irq_cmd_type cmd;
+    void *addr;
+    unsigned long long value;
+    int dstarg;
+} irq_cmd_t;
+typedef struct {
+    unsigned int cmdcount;
+    irq_cmd_t *cmds;
+} irq_code_t;
+#ifdef KERNEL
+#include <arch/types.h>
+#include <adt/list.h>
+#include <synch/spinlock.h>
+#include <proc/task.h>
+typedef enum {
+    IRQ_DECLINE,        /**< Decline to service. */
+    IRQ_ACCEPT      /**< Accept to service. */
+} irq_ownership_t;
+typedef enum {
+    IRQ_TRIGGER_LEVEL = 1,
+    IRQ_TRIGGER_EDGE
+} irq_trigger_t;
+struct irq;
+typedef void (* irq_handler_t)(struct irq *irq, void *arg, ...);
+/** IPC notification config structure.
+ *
+ * Primarily, this structure is encapsulated in the irq_t structure.
+ * It is protected by irq_t::lock.
+ */
+typedef struct {
+    /** When false, notifications are not sent. */
+    bool notify;
+    /** Answerbox for notifications. */
+    answerbox_t *answerbox;
+    /** Method to be used for the notification. */
+    unative_t method;
+    /** Top-half pseudocode. */
+    irq_code_t *code;
+    /** Counter. */
+    count_t counter;
+    /**
+     * Link between IRQs that are notifying the same answerbox. The list is
+     * protected by the answerbox irq_lock.
+     */
+    link_t link;
+} ipc_notif_cfg_t;
+/** Structure representing one device IRQ.
+ *
+ * If one device has multiple interrupts, there will be multiple irq_t
+ * instantions with the same devno.
+ */
+typedef struct irq {
+    /** Hash table link. */
+    link_t link;
+    /** Lock protecting everything in this structure
+     *  except the link member. When both the IRQ
+     *  hash table lock and this lock are to be acquired,
+     *  this lock must not be taken first.
+     */
+    SPINLOCK_DECLARE(lock);
+    /** Unique device number. -1 if not yet assigned. */
+    devno_t devno;
+    /** Actual IRQ number. -1 if not yet assigned. */
+    inr_t inr;
+    /** Trigger level of the IRQ.*/
+    irq_trigger_t trigger;
+    /** Claim ownership of the IRQ. */
+    irq_ownership_t (* claim)(void);
+    /** Handler for this IRQ and device. */
+    irq_handler_t handler;
+    /** Argument for the handler. */
+    void *arg;
+    /** Notification configuration structure. */
+    ipc_notif_cfg_t notif_cfg;
+} irq_t;
+extern void irq_init(count_t inrs, count_t chains);
+extern void irq_initialize(irq_t *irq);
+extern void irq_register(irq_t *irq);
+extern irq_t *irq_dispatch_and_lock(inr_t inr);
+extern irq_t *irq_find_and_lock(inr_t inr, devno_t devno);
+#endif
+#endif
+/** @}
+ */

 /branches/rcu/kernel/generic/include/mm/as.h
 ,6 → 89,17
     @public
         /** Protected by asidlock. */
         link_t inactive_as_with_asid_link;
+        /**
+         * Number of processors on wich is this address space active.
+         * Protected by asidlock.
+         */
+        count_t cpu_refcount;
+        /**
+         * Address space identifier.
+         * Constant on architectures that do not support ASIDs.
+         * Protected by asidlock.
+         */
+        asid_t asid;
         mutex_t lock;
 ,18 → 106,9
         /** Number of references (i.e tasks that reference this as). */
         count_t refcount;
-        /** Number of processors on wich is this address space active. */
-        count_t cpu_refcount;
         /** B+tree of address space areas. */
         btree_t as_area_btree;
-        /**
-         *  Address space identifier.
-         *  Constant on architectures that do not support ASIDs.
-         */
-        asid_t asid;
         /** Non-generic content. */
         as_genarch_t genarch;
 ,6 → 135,17
 typedef struct as {
     /** Protected by asidlock. */
     link_t inactive_as_with_asid_link;
+    /**
+     * Number of processors on wich is this address space active.
+     * Protected by asidlock.
+     */
+    count_t cpu_refcount;
+    /**
+     * Address space identifier.
+     * Constant on architectures that do not support ASIDs.
+     * Protected by asidlock.
+     */
+    asid_t asid;
     mutex_t lock;
 ,18 → 152,9
     /** Number of references (i.e tasks that reference this as). */
     count_t refcount;
-    /** Number of processors on wich is this address space active. */
-    count_t cpu_refcount;
     /** B+tree of address space areas. */
     btree_t as_area_btree;
-    /**
-     *  Address space identifier.
-     *  Constant on architectures that do not support ASIDs.
-     */
-    asid_t asid;
     /** Non-generic content. */
     as_genarch_t genarch;
 ,7 → 209,6
 /** Address space area structure.
  *
  * Each as_area_t structure describes one contiguous area of virtual memory.
- * In the future, it should not be difficult to support shared areas.
  */
 typedef struct {
     mutex_t lock;
 ,7 → 253,6
 extern as_operations_t *as_operations;
 #endif
-SPINLOCK_EXTERN(inactive_as_with_asid_lock);
 extern link_t inactive_as_with_asid_head;
 extern void as_init(void);

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2291 → Rev 2292