Changeset 12573db in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2011-01-31T20:32:33Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37cf3792

Parents:

4fe94c66 (diff), 197ef43 (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) (4 diffs)

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

@@ -209 +209 @@
 
         if (dev_addr < 0) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -222 +222 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -245 +245 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -276 +276 @@
         cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr;
         async_set_interrupt_received(cuda_irq_handler);
-        ipc_register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
+        register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
 
         /* Enable SR interrupt. */