Changeset c822026 in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2009-04-13T21:35:28Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4ee4046

Parents:

37c312a

Message:

fix compilation in non-SMP configurations

File:

• kernel/generic/src/ipc/irq.c (modified) (7 diffs)

kernel/generic/src/ipc/irq.c

@@ -129 +129 @@
 /** Register an answerbox as a receiving end for IRQ notifications.
  *
- * @param box           Receiving answerbox.
- * @param inr           IRQ number.
- * @param devno         Device number.
- * @param method        Method to be associated with the notification.
- * @param ucode         Uspace pointer to top-half pseudocode.
- *
- * @return              EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
+ * @param box    Receiving answerbox.
+ * @param inr    IRQ number.
+ * @param devno  Device number.
+ * @param method Method to be associated with the notification.
+ * @param ucode  Uspace pointer to top-half pseudocode.
+ *
+ * @return EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
+ *
  */
 int ipc_irq_register(answerbox_t *box, inr_t inr, devno_t devno,
@@ -148 +149 @@
                 (unative_t) devno
         };
-
+        
         if (ucode) {
                 code = code_from_uspace(ucode);
@@ -156 +157 @@
                 code = NULL;
         }
-
+        
         /*
          * Allocate and populate the IRQ structure.
@@ -171 +172 @@
         irq->notif_cfg.code = code;
         irq->notif_cfg.counter = 0;
-
+        
         /*
          * Enlist the IRQ structure in the uspace IRQ hash table and the
@@ -180 +181 @@
         hlp = hash_table_find(&irq_uspace_hash_table, key);
         if (hlp) {
-                irq_t *hirq = hash_table_get_instance(hlp, irq_t, link);
+                irq_t *hirq __attribute__((unused))
+                    = hash_table_get_instance(hlp, irq_t, link);
+                
                 /* hirq is locked */
                 spinlock_unlock(&hirq->lock);
@@ -189 +192 @@
                 return EEXISTS;
         }
-        spinlock_lock(&irq->lock);      /* not really necessary, but paranoid */
+        
+        spinlock_lock(&irq->lock);  /* Not really necessary, but paranoid */
         spinlock_lock(&box->irq_lock);
         hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
@@ -196 +200 @@
         spinlock_unlock(&irq->lock);
         spinlock_unlock(&irq_uspace_hash_table_lock);
-
+        
         interrupts_restore(ipl);
         return EOK;