Changeset 7943c43 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 changes.

File:

• uspace/lib/drv/generic/driver.c (modified) (3 diffs)

uspace/lib/drv/generic/driver.c

@@ -198 +198 @@
                 pseudocode = &default_pseudocode;
         
-        int res = register_irq(irq, dev->handle, ctx->id, pseudocode);
+        int res = irq_register(irq, dev->handle, ctx->id, pseudocode);
         if (res != EOK) {
                 remove_interrupt_context(&interrupt_contexts, ctx);
@@ -211 +211 @@
         interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts,
             dev, irq);
-        int res = unregister_irq(irq, dev->handle);
+        int res = irq_unregister(irq, dev->handle);
         
         if (ctx != NULL) {
@@ -1016 +1016 @@
          * incoming connections.
          */
-        rc = devman_driver_register(driver->name, driver_connection);
+        async_set_client_connection(driver_connection);
+        rc = devman_driver_register(driver->name);
         if (rc != EOK) {
                 printf("Error: Failed to register driver with device manager "