Changeset 7943c43 in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2012-01-16T22:45:38Z (14 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/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (2 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -154 +154 @@
         }
 
-        rc = loc_server_register(NAME, cuda_connection);
+        async_set_client_connection(cuda_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register server.\n");
@@ -275 +276 @@
         cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr;
         async_set_interrupt_received(cuda_irq_handler);
-        register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
+        irq_register(10, device_assign_devno(), 0, &cuda_irq_code);
 
         /* Enable SR interrupt. */