WebSVN – HelenOS – Diff – /branches/dd/kernel/generic/include/ddi/irq.h

 /*
  * 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_PIO_READ_8 = 1,
-    CMD_MEM_READ_2,
-    CMD_MEM_READ_4,
+    CMD_PIO_READ_16,
-    CMD_MEM_READ_8,
+    CMD_PIO_READ_32,
-    CMD_MEM_WRITE_1,
-    CMD_MEM_WRITE_2,
+    CMD_PIO_WRITE_8,
-    CMD_MEM_WRITE_4,
+    CMD_PIO_WRITE_16,
-    CMD_MEM_WRITE_8,
+    CMD_PIO_WRITE_32,
-    CMD_PORT_READ_1,
+    CMD_BTEST,
-    CMD_PORT_WRITE_1,
+    CMD_PREDICATE,
-    CMD_IA64_GETCHAR,
+    CMD_ACCEPT,
-    CMD_PPC32_GETCHAR,
+    CMD_DECLINE,
     CMD_LAST
 } irq_cmd_type;
 typedef struct {
     irq_cmd_type cmd;
     void *addr;
     unsigned long long value;
+    unsigned int srcarg;
-    int dstarg;
+    unsigned 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 <adt/hash_table.h>
 #include <synch/spinlock.h>
 #include <proc/task.h>
+#include <ipc/ipc.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, ...);
+typedef void (* irq_handler_t)(struct irq *);
+/** Type for function used to clear the interrupt. */
+typedef void (* cir_t)(void *, inr_t);
 /** 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;
+    /** Arguments that will be sent if the IRQ is claimed. */
+    unative_t scratch[IPC_CALL_LEN];
     /** 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);
+    irq_ownership_t (* claim)(struct irq *);
     /** Handler for this IRQ and device. */
     irq_handler_t handler;
+    /** Instance argument for the handler and the claim function. */
+    void *instance;
-    /** Argument for the handler. */
+    /** Clear interrupt routine. */
+    cir_t cir;
+    /** First argument to the clear interrupt routine. */
-    void *arg;
+    void *cir_arg;
     /** Notification configuration structure. */
     ipc_notif_cfg_t notif_cfg;
 } irq_t;
+SPINLOCK_EXTERN(irq_uspace_hash_table_lock);
+extern hash_table_t irq_uspace_hash_table;
-extern void irq_init(count_t inrs, count_t chains);
+extern void irq_init(count_t, count_t);
-extern void irq_initialize(irq_t *irq);
+extern void irq_initialize(irq_t *);
-extern void irq_register(irq_t *irq);
+extern void irq_register(irq_t *);
-extern irq_t *irq_dispatch_and_lock(inr_t inr);
+extern irq_t *irq_dispatch_and_lock(inr_t);
-extern irq_t *irq_find_and_lock(inr_t inr, devno_t devno);
 #endif
 #endif
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/kernel/generic/include/ddi/irq.h – Rev 3022 → 4055