Changeset 24abb85d in mainline for kernel/generic/src/ipc

Timestamp:

2017-08-18T23:27:08Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4d76cfc

Parents:

e9d15d9

Message:

Remove SYS_DEVICE_ASSIGN_DEVNO

Location:

kernel/generic/src/ipc

Files:

• irq.c (modified) (4 diffs)
• sysipc.c (modified) (2 diffs)

kernel/generic/src/ipc/irq.c

@@ -294 +294 @@
  * @param box     Receiving answerbox.
  * @param inr     IRQ number.
- * @param devno   Device number.
  * @param imethod Interface and method to be associated with the
  *                notification.
@@ -303 +302 @@
  *
  */
-int ipc_irq_subscribe(answerbox_t *box, inr_t inr, devno_t devno,
-    sysarg_t imethod, irq_code_t *ucode)
+int ipc_irq_subscribe(answerbox_t *box, inr_t inr, sysarg_t imethod,
+    irq_code_t *ucode)
 {
         sysarg_t key[] = {
-                (sysarg_t) inr,
-                (sysarg_t) devno
+                [IRQ_HT_KEY_INR] = (sysarg_t) inr,
+                [IRQ_HT_KEY_MODE] = (sysarg_t) IRQ_HT_MODE_NO_CLAIM
         };
         
@@ -334 +333 @@
         irq_t *irq = &kobj->irq;
         irq_initialize(irq);
-        irq->devno = devno;
         irq->inr = inr;
         irq->claim = ipc_irq_top_half_claim;
@@ -349 +347 @@
          */
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
-        
-        link_t *hlp = hash_table_find(&irq_uspace_hash_table, key);
-        if (hlp) {
-                irq_t *hirq = hash_table_get_instance(hlp, irq_t, link);
-                
-                /* hirq is locked */
-                irq_spinlock_unlock(&hirq->lock, false);
-                code_free(code);
-                irq_spinlock_unlock(&irq_uspace_hash_table_lock, true);
-                
-                kobject_free(TASK, cap);
-                return EEXIST;
-        }
-        
-        /* Locking is not really necessary, but paranoid */
         irq_spinlock_lock(&irq->lock, false);
         irq_spinlock_lock(&box->irq_lock, false);

kernel/generic/src/ipc/sysipc.c

@@ -801 +801 @@
  *
  * @param inr     IRQ number.
- * @param devno   Device number.
  * @param imethod Interface and method to be associated with the notification.
  * @param ucode   Uspace pointer to the top-half pseudocode.
@@ -810 +809 @@
  *
  */
-sysarg_t sys_ipc_irq_subscribe(inr_t inr, devno_t devno, sysarg_t imethod,
-    irq_code_t *ucode)
+sysarg_t sys_ipc_irq_subscribe(inr_t inr, sysarg_t imethod, irq_code_t *ucode)
 {
         if (!(perm_get(TASK) & PERM_IRQ_REG))
                 return EPERM;
         
-        return ipc_irq_subscribe(&TASK->answerbox, inr, devno, imethod, ucode);
+        return ipc_irq_subscribe(&TASK->answerbox, inr, imethod, ucode);
 }