Changeset e9d15d9 in mainline for uspace/lib/c

Timestamp:

2017-08-18T21:15:26Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

24abb85d

Parents:

1c85bae

Message:

Turn IRQ structures into kernel objects

ipc_irq_subscribe() now returns a capability for the underlying IRQ kernel
object. ipc_irq_unsubscribe() can now be done only with a valid IRQ capability.

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (2 diffs)
• generic/irq.c (modified) (2 diffs)
• include/async.h (modified) (1 diff)
• include/ipc/irq.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -1027 +1027 @@
  * @param ucode   Top-half pseudocode handler.
  *
- * @return Zero on success or a negative error code.
+ * @return IRQ capability on success.
+ * @return Negative error code.
  *
  */
@@ -1056 +1057 @@
 /** Unsubscribe from IRQ notification.
  *
- * @param inr     IRQ number.
- * @param devno   Device number of the device generating inr.
+ * @param cap     IRQ capability. 
  *
  * @return Zero on success or a negative error code.
  *
  */
-int async_irq_unsubscribe(int inr, int devno)
+int async_irq_unsubscribe(int cap)
 {
         // TODO: Remove entry from hash table
         //       to avoid memory leak
         
-        return ipc_irq_unsubscribe(inr, devno);
+        return ipc_irq_unsubscribe(cap);
 }
 

uspace/lib/c/generic/irq.c

@@ -59 +59 @@
  * @param ucode  Top-half pseudocode handler.
  *
- * @return Value returned by the kernel.
+ * @return IRQ capability returned by the kernel.
+ * @return Error code returned by the kernel.
  *
  */
@@ -74 +75 @@
 /** Unsubscribe from IRQ notification.
  *
- * @param inr   IRQ number.
- * @param devno Device number of the device generating inr.
+ * @param cap   IRQ capability.
  *
  * @return Value returned by the kernel.
  *
  */
-int ipc_irq_unsubscribe(int inr, int devno)
+int ipc_irq_unsubscribe(int cap)
 {
-        return __SYSCALL2(SYS_IPC_IRQ_UNSUBSCRIBE, inr, devno);
+        return __SYSCALL1(SYS_IPC_IRQ_UNSUBSCRIBE, cap);
 }
 

uspace/lib/c/include/async.h

@@ -168 +168 @@
 extern int async_irq_subscribe(int, int, async_notification_handler_t, void *,
     const irq_code_t *);
-extern int async_irq_unsubscribe(int, int);
+extern int async_irq_unsubscribe(int);
 
 extern int async_event_subscribe(event_type_t, async_notification_handler_t,

uspace/lib/c/include/ipc/irq.h

@@ -40 +40 @@
 
 extern int ipc_irq_subscribe(int, int, sysarg_t, const irq_code_t *);
-extern int ipc_irq_unsubscribe(int, int);
+extern int ipc_irq_unsubscribe(int);
 
 #endif