Changeset 8b5690f in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2011-02-03T05:11:01Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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) (6 diffs)

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

@@ -162 +162 @@
         rc = devmap_device_register("adb/kbd", &devmap_handle);
         if (rc != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device %s.\n", "adb/kdb");
                 return rc;
@@ -172 +171 @@
         rc = devmap_device_register("adb/mouse", &devmap_handle);
         if (rc != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device %s.\n", "adb/mouse");
                 return rc;
@@ -211 +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) {
@@ -224 +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:
@@ -247 +245 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -278 +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. */