Changes in kernel/generic/include/ddi/irq.h [d99c1d2:da1bafb] in mainline

File:

• kernel/generic/include/ddi/irq.h (modified) (13 diffs)

kernel/generic/include/ddi/irq.h

@@ -35 +35 @@
 #ifndef KERN_IRQ_H_
 #define KERN_IRQ_H_
+
+#ifdef KERNEL
+
+#include <typedefs.h>
+#include <adt/list.h>
+#include <adt/hash_table.h>
+#include <synch/spinlock.h>
+#include <proc/task.h>
+#include <ipc/ipc.h>
+
+#endif /* KERNEL */
 
 typedef enum {
@@ -49 +60 @@
         /** Write 4 bytes to the I/O space. */
         CMD_PIO_WRITE_32,
+        
         /**
          * Perform a bit test on the source argument and store the result into
@@ -54 +66 @@
          */
         CMD_BTEST,
+        
         /**
          * Predicate the execution of the following N commands by the boolean
@@ -59 +72 @@
          */
         CMD_PREDICATE,
+        
         /** Accept the interrupt. */
         CMD_ACCEPT,
@@ -69 +83 @@
         irq_cmd_type cmd;
         void *addr;
-        unsigned long long value;
-        unsigned int srcarg;
-        unsigned int dstarg;
+        uint32_t value;
+        uintptr_t srcarg;
+        uintptr_t dstarg;
 } irq_cmd_t;
 
 typedef struct {
-        unsigned int cmdcount;
+        size_t cmdcount;
         irq_cmd_t *cmds;
 } irq_code_t;
@@ -81 +95 @@
 #ifdef KERNEL
 
-#include <typedefs.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_DECLINE,  /**< Decline to service. */
+        IRQ_ACCEPT    /**< Accept to service. */
 } irq_ownership_t;
 
@@ -108 +115 @@
  * Primarily, this structure is encapsulated in the irq_t structure.
  * It is protected by irq_t::lock.
+ *
  */
 typedef struct {
@@ -117 +125 @@
         unative_t method;
         /** Arguments that will be sent if the IRQ is claimed. */
-        unative_t scratch[IPC_CALL_LEN];
+        uint32_t scratch[IPC_CALL_LEN];
         /** Top-half pseudocode. */
         irq_code_t *code;
         /** Counter. */
         size_t counter;
+        
         /**
          * Link between IRQs that are notifying the same answerbox. The list is
@@ -133 +142 @@
  * 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
@@ -143 +153 @@
          *  this lock must not be taken first.
          */
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
         
         /** Send EOI before processing the interrupt.
@@ -152 +162 @@
          */
         bool preack;
-
+        
         /** Unique device number. -1 if not yet assigned. */
         devno_t devno;
-
+        
         /** Actual IRQ number. -1 if not yet assigned. */
         inr_t inr;
@@ -166 +176 @@
         /** Instance argument for the handler and the claim function. */
         void *instance;
-
+        
         /** Clear interrupt routine. */
         cir_t cir;
         /** First argument to the clear interrupt routine. */
         void *cir_arg;
-
+        
         /** Notification configuration structure. */
         ipc_notif_cfg_t notif_cfg; 
 } irq_t;
 
-SPINLOCK_EXTERN(irq_uspace_hash_table_lock);
+IRQ_SPINLOCK_EXTERN(irq_uspace_hash_table_lock);
 extern hash_table_t irq_uspace_hash_table;
 
@@ -184 +194 @@
 extern irq_t *irq_dispatch_and_lock(inr_t);
 
+#endif /* KERNEL */
+
 #endif
 
-#endif
-
 /** @}
  */