Changeset 95c675b in mainline for uspace/lib/drv/generic/interrupt.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• uspace/lib/drv/generic/interrupt.c (modified) (1 diff)

uspace/lib/drv/generic/interrupt.c

@@ -44 +44 @@
 
 int register_interrupt_handler(ddf_dev_t *dev, int irq,
-    interrupt_handler_t *handler, const irq_code_t *pseudocode)
+    interrupt_handler_t *handler, const irq_code_t *irq_code)
 {
-        return async_irq_subscribe(irq, dev->handle,
-            (async_notification_handler_t) handler, dev, pseudocode);
+        return async_irq_subscribe(irq, (async_notification_handler_t) handler,
+            dev, irq_code);
 }
 
-int unregister_interrupt_handler(ddf_dev_t *dev, int irq)
+int unregister_interrupt_handler(ddf_dev_t *dev, int cap)
 {
-        return async_irq_unsubscribe(irq, dev->handle);
+        return async_irq_unsubscribe(cap);
 }